aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Johnston <jjohnstn@redhat.com>2003-01-07 21:10:54 +0000
committerJeff Johnston <jjohnstn@redhat.com>2003-01-07 21:10:54 +0000
commit0978efa06693a85ec2eb5a21e4fe634688c38006 (patch)
tree6d5ebf3aae4e0fbe9e793722be9c20400763ea57
parent68dea338192334c0b61dec2e910e1584ef08522f (diff)
downloadnewlib-0978efa06693a85ec2eb5a21e4fe634688c38006.zip
newlib-0978efa06693a85ec2eb5a21e4fe634688c38006.tar.gz
newlib-0978efa06693a85ec2eb5a21e4fe634688c38006.tar.bz2
2002-01-07 Chris Demetriou <cgd@broadcom.com>
* crt0.S: Check for definition of __mips64 rather than checking (__mips < 3). * pmon.S: Likewise. * cygmon.c (sysCall): Avoid multi-line string literals.
-rw-r--r--libgloss/ChangeLog7
-rw-r--r--libgloss/mips/crt0.S2
-rw-r--r--libgloss/mips/cygmon.c14
-rw-r--r--libgloss/mips/pmon.S2
4 files changed, 16 insertions, 9 deletions
diff --git a/libgloss/ChangeLog b/libgloss/ChangeLog
index 4f90893..255cb08 100644
--- a/libgloss/ChangeLog
+++ b/libgloss/ChangeLog
@@ -1,3 +1,10 @@
+2002-01-07 Chris Demetriou <cgd@broadcom.com>
+
+ * crt0.S: Check for definition of __mips64 rather than
+ checking (__mips < 3).
+ * pmon.S: Likewise.
+ * cygmon.c (sysCall): Avoid multi-line string literals.
+
2002-11-12 Jeff Johnston <jjohnstn@redhat.com>
* mips/Makefile.in: Add cygmon support.
diff --git a/libgloss/mips/crt0.S b/libgloss/mips/crt0.S
index 0a8847f..d8d78ed 100644
--- a/libgloss/mips/crt0.S
+++ b/libgloss/mips/crt0.S
@@ -66,7 +66,7 @@ _start:
nop
move s0,$31
#endif
-#if (__mips < 3) || (__mips_fpr==32)
+#if !defined(__mips64) || (__mips_fpr==32)
#define STATUS_MASK (SR_CU1|SR_PE)
#else
# For mips3 or mips4, turn on 64-bit addressing and additional float regs
diff --git a/libgloss/mips/cygmon.c b/libgloss/mips/cygmon.c
index a5b0049..506e853 100644
--- a/libgloss/mips/cygmon.c
+++ b/libgloss/mips/cygmon.c
@@ -60,13 +60,13 @@ struct s_mem
int sysCall(unsigned long func, unsigned long p1, unsigned long p2, unsigned long p3)
{
int ret = 0;
- asm volatile ( "
- move $4, %1
- move $5, %2
- move $6, %3
- move $7, %4
- syscall
- nop
+ asm volatile ( " \n\
+ move $4, %1 \n\
+ move $5, %2 \n\
+ move $6, %3 \n\
+ move $7, %4 \n\
+ syscall \n\
+ nop \n\
move %0, $2" : "=r"(ret) : "r"(func), "r"(p1), "r"(p2), "r"(p3));
return ret;
}
diff --git a/libgloss/mips/pmon.S b/libgloss/mips/pmon.S
index 901a7a8..5485979 100644
--- a/libgloss/mips/pmon.S
+++ b/libgloss/mips/pmon.S
@@ -19,7 +19,7 @@
.set nomips16
#endif
-#if __mips < 3
+#if !defined(__mips64)
/* This machine does not support 64-bit operations. */
#define ADDU addu
#define SUBU subu