diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2010-08-24 13:41:45 +0000 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2010-08-24 13:41:45 +0000 |
| commit | 3478bc5d6dc0a081c3aeb4f501c8b4cb4f53a78d (patch) | |
| tree | e685975d5410c5336f6bfcb514e08de345a89e25 | |
| parent | 1aeb79dc3a21c9adea2878f0fff676f67bd55d97 (diff) | |
| download | rockbox-3478bc5d6dc0a081c3aeb4f501c8b4cb4f53a78d.zip rockbox-3478bc5d6dc0a081c3aeb4f501c8b4cb4f53a78d.tar.gz rockbox-3478bc5d6dc0a081c3aeb4f501c8b4cb4f53a78d.tar.bz2 rockbox-3478bc5d6dc0a081c3aeb4f501c8b4cb4f53a78d.tar.xz | |
mips is predefined by gcc, but we want it for paths. Don't let others fall into this trap again. Use __mips instead
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27872 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | firmware/SOURCES | 1 | ||||
| -rw-r--r-- | firmware/target/mips/ingenic_jz47xx/app.lds | 1 | ||||
| -rw-r--r-- | firmware/target/mips/ingenic_jz47xx/boot.lds | 1 | ||||
| -rw-r--r-- | lib/libsetjmp/SOURCES | 2 | ||||
| -rwxr-xr-x | tools/configure | 3 |
5 files changed, 2 insertions, 6 deletions
diff --git a/firmware/SOURCES b/firmware/SOURCES index 19e51ac..e6157fa 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES @@ -538,7 +538,6 @@ target/arm/crt0.S #endif /* SIMULATOR */ #elif defined(CPU_MIPS) -#undef mips common/memset16.c target/mips/ffs-mips.S target/mips/memcpy-mips.S diff --git a/firmware/target/mips/ingenic_jz47xx/app.lds b/firmware/target/mips/ingenic_jz47xx/app.lds index bd924e4..9b45704 100644 --- a/firmware/target/mips/ingenic_jz47xx/app.lds +++ b/firmware/target/mips/ingenic_jz47xx/app.lds @@ -1,5 +1,4 @@ #include "config.h" -#undef mips OUTPUT_FORMAT("elf32-littlemips") OUTPUT_ARCH(MIPS) diff --git a/firmware/target/mips/ingenic_jz47xx/boot.lds b/firmware/target/mips/ingenic_jz47xx/boot.lds index 15d3e3d..a236a3f 100644 --- a/firmware/target/mips/ingenic_jz47xx/boot.lds +++ b/firmware/target/mips/ingenic_jz47xx/boot.lds @@ -1,5 +1,4 @@ #include "config.h" -#undef mips OUTPUT_FORMAT("elf32-littlemips") OUTPUT_ARCH(MIPS) diff --git a/lib/libsetjmp/SOURCES b/lib/libsetjmp/SOURCES index b2f4227..aa0ac46 100644 --- a/lib/libsetjmp/SOURCES +++ b/lib/libsetjmp/SOURCES @@ -13,8 +13,6 @@ sh/setjmp.S #endif #ifdef CPU_MIPS -/* Strangely something seems to do '#define mips 1' */ -#undef mips mips/setjmp.S #endif diff --git a/tools/configure b/tools/configure index 7c61b09..e554c3d 100755 --- a/tools/configure +++ b/tools/configure @@ -442,7 +442,8 @@ arm1176jzscc () { mipselcc () { prefixtools mipsel-elf- - GCCOPTS="$CCOPTS -march=mips32 -mtune=r4600 -mno-mips16 -mno-long-calls" + # mips is predefined, but we want it for paths. use __mips instead + GCCOPTS="$CCOPTS -march=mips32 -mtune=r4600 -mno-mips16 -mno-long-calls -Umips" GCCOPTS="$GCCOPTS -ffunction-sections -msoft-float -G 0 -Wno-parentheses" GCCOPTIMIZE="-fomit-frame-pointer" endian="little" |