Use -D options in building MIPS syscall.h.

diff --git a/ChangeLog.mips b/ChangeLog.mips
index 493514bb99bd763e94ab4a36d7ffc466ac24d12b..c341c74b4e0beb72f249616124ad512eeeddb3a9 100644 (file)
--- a/ChangeLog.mips
+++ b/ChangeLog.mips
@@ -1,3 +1,10 @@
+2012-05-23  Steve Ellcey  <sellcey@mips.com>
+
+       * sysdeps/unix/sysv/linux/mips/Makefile
+       (syscall-list-o32-options): Use -D_MIPS_SIM=1.
+       (syscall-list-n32-options): Use -D_MIPS_SIM=2.
+       (syscall-list-n64-options): Use -D_MIPS_SIM=3.
+
 2012-05-23  Joseph Myers  <joseph@codesourcery.com>
 
        * sysdeps/unix/sysv/linux/mips/bits/mman.h (MADV_DONTDUMP):

diff --git a/sysdeps/unix/sysv/linux/mips/Makefile b/sysdeps/unix/sysv/linux/mips/Makefile
index 41e92581a732dafed91c441604b4691f2eea44ce..2aaf63c3e347dd8b2e8d317ade4d92c44d025ec9 100644 (file)
--- a/sysdeps/unix/sysv/linux/mips/Makefile
+++ b/sysdeps/unix/sysv/linux/mips/Makefile
@@ -7,13 +7,14 @@ sysdep_routines += cachectl cacheflush sysmips _test_and_set
 
 sysdep_headers += sys/cachectl.h sys/sysmips.h sys/tas.h
 
+# _MIPS_SIM_ABI32 == 1, _MIPS_SIM_ABIN32 == 2, _MIPS_SIM_ABI64 == 3
 syscall-list-variants := o32 n32 n64
 syscall-list-includes := sgidefs.h
-syscall-list-o32-options := -mabi=32
+syscall-list-o32-options := -D_MIPS_SIM=1
 syscall-list-o32-condition := _MIPS_SIM == _MIPS_SIM_ABI32
-syscall-list-n32-options := -mabi=n32
+syscall-list-n32-options := -D_MIPS_SIM=2
 syscall-list-n32-condition := _MIPS_SIM == _MIPS_SIM_ABIN32
-syscall-list-n64-options := -mabi=64
+syscall-list-n64-options := -D_MIPS_SIM=3
 syscall-list-n64-condition := _MIPS_SIM == _MIPS_SIM_ABI64
 endif