Chris Johns 2013-03-08 18:44:32 +11:00
parent 6d5bfb0abe
commit df78032098
2 changed files with 46 additions and 0 deletions

View File

@ -0,0 +1,25 @@
===================================================================
RCS file: /cvs/src/src/newlib/libc/machine/mips/memcpy.S,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- src/newlib/libc/machine/mips/memcpy.S 2012/12/11 21:37:59 1.1
+++ src/newlib/libc/machine/mips/memcpy.S 2013/01/07 21:29:39 1.2
@@ -56,7 +56,7 @@
#endif
#endif
-#if (_MIPS_SIM == _ABI64) || (_MIPS_SIM == _ABIN32)
+#if defined(_MIPS_SIM) && ((_MIPS_SIM == _ABI64) || (_MIPS_SIM == _ABIN32))
#ifndef DISABLE_DOUBLE
#define USE_DOUBLE
#endif
@@ -203,6 +203,6 @@
#define REG1 t1
#define REG2 t2
#define REG3 t3
-#if _MIPS_SIM == _ABIO32
+#if defined(_MIPS_SIM) && (_MIPS_SIM == _ABIO32 || _MIPS_SIM == _ABIO64)
# define REG4 t4
# define REG5 t5
# define REG6 t6

View File

@ -0,0 +1,21 @@
===================================================================
RCS file: /cvs/src/src/newlib/libc/machine/mips/memcpy.S,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- src/newlib/libc/machine/mips/memcpy.S 2013/01/07 21:29:39 1.2
+++ src/newlib/libc/machine/mips/memcpy.S 2013/02/19 07:31:04 1.3
@@ -49,7 +49,10 @@
#include <sys/asm.h>
#endif
-#if (_MIPS_ISA == _MIPS_ISA_MIPS4) || (_MIPS_ISA == _MIPS_ISA_MIPS5) || \
- (_MIPS_ISA == _MIPS_ISA_MIPS32) || (_MIPS_ISA == _MIPS_ISA_MIPS64)
+/* Check to see if the MIPS architecture we are compiling for supports
+ * prefetching.
+ */
+
+#if (__mips == 4) || (__mips == 5) || (__mips == 32) || (__mips == 64)
#ifndef DISABLE_PREFETCH
#define USE_PREFETCH
#endif