diff options
| author | Chris Johns <chrisj@rtems.org> | 2013-03-08 18:44:32 +1100 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2013-03-08 18:44:32 +1100 |
| commit | df78032098a95d954e84a94fbf0ded2989f1da45 (patch) | |
| tree | 1955e598638c935eaacf640b239813c6f0b8188e /tools/4.11 | |
| parent | 6d5bfb0abe74a5eea993efbaef43a0f6f043b62c (diff) | |
MIPS memcpy fixes.
http://sourceware.org/ml/newlib-cvs/2013-q1/msg00022.html
http://sourceware.org/cgi-bin/cvsweb.cgi/src/newlib/libc/machine/mips/memcpy.S.diff?r1=1.2&r2=1.3&cvsroot=src
http://sourceware.org/cgi-bin/cvsweb.cgi/src/newlib/libc/machine/mips/memcpy.S.diff?r1=1.1&r2=1.2&cvsroot=src
Diffstat (limited to 'tools/4.11')
| -rw-r--r-- | tools/4.11/newlib/mips/newlib-2.0.0-mips-memcpy-20130107.diff | 25 | ||||
| -rw-r--r-- | tools/4.11/newlib/mips/newlib-2.0.0-mips-memcpy-20130219.diff | 21 |
2 files changed, 46 insertions, 0 deletions
diff --git a/tools/4.11/newlib/mips/newlib-2.0.0-mips-memcpy-20130107.diff b/tools/4.11/newlib/mips/newlib-2.0.0-mips-memcpy-20130107.diff new file mode 100644 index 0000000..5d48fa2 --- /dev/null +++ b/tools/4.11/newlib/mips/newlib-2.0.0-mips-memcpy-20130107.diff @@ -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 diff --git a/tools/4.11/newlib/mips/newlib-2.0.0-mips-memcpy-20130219.diff b/tools/4.11/newlib/mips/newlib-2.0.0-mips-memcpy-20130219.diff new file mode 100644 index 0000000..d5f1684 --- /dev/null +++ b/tools/4.11/newlib/mips/newlib-2.0.0-mips-memcpy-20130219.diff @@ -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 |