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

5 files changed, 2 insertions, 6 deletions

diff --git a/firmware/SOURCES b/firmware/SOURCES
index 19e51ac948..e6157fa7d0 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 bd924e44f4..9b457041b6 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 15d3e3dd47..a236a3f40a 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 b2f4227930..aa0ac46a23 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 7c61b09ee7..e554c3d76b 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"