[Commits] r18909 - in /branches/eglibc-2_15: ./ ports/ChangeLog.mips ports/sysdeps/unix/sysv/linux/mips/Makefile

[joseph@xxxxxxxxxx]

Author: joseph
Date: Fri Jun  1 21:34:05 2012
New Revision: 18909

Log:
Merge changes between r18833 and r18908 from /fsf/glibc-2_15-branch.

Modified:
    branches/eglibc-2_15/   (props changed)
    branches/eglibc-2_15/ports/ChangeLog.mips
    branches/eglibc-2_15/ports/sysdeps/unix/sysv/linux/mips/Makefile

Propchange: branches/eglibc-2_15/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun  1 21:34:05 2012
@@ -1,2 +1,2 @@
-/fsf/glibc-2_15-branch:16509-18833
+/fsf/glibc-2_15-branch:16509-18908
 /fsf/trunk:15224-16494

Modified: branches/eglibc-2_15/ports/ChangeLog.mips
==============================================================================
--- branches/eglibc-2_15/ports/ChangeLog.mips (original)
+++ branches/eglibc-2_15/ports/ChangeLog.mips Fri Jun  1 21:34:05 2012
@@ -1,3 +1,15 @@
+2012-06-01  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/mips/Makefile
+	(syscall-list-n32-condition): Fix typo.
+
+2012-05-23  Steve Ellcey  <sellcey@xxxxxxxx>
+
+	* 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-01-04  Tom de Vries  <tom@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/mips/Makefile: Compile initfini.c, pt-initfini.c with

Modified: branches/eglibc-2_15/ports/sysdeps/unix/sysv/linux/mips/Makefile
==============================================================================
--- branches/eglibc-2_15/ports/sysdeps/unix/sysv/linux/mips/Makefile (original)
+++ branches/eglibc-2_15/ports/sysdeps/unix/sysv/linux/mips/Makefile Fri Jun  1 21:34:05 2012
@@ -7,13 +7,14 @@
 
 sysdep_headers += sys/cachectl.h sys/sysmips.h sys/tas.h
 
+# _MIPS_SIM_ABI32 == 1, _MIPS_SIM_NABI32 == 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-condition := _MIPS_SIM == _MIPS_SIM_ABIN32
-syscall-list-n64-options := -mabi=64
+syscall-list-n32-options := -D_MIPS_SIM=2
+syscall-list-n32-condition := _MIPS_SIM == _MIPS_SIM_NABI32
+syscall-list-n64-options := -D_MIPS_SIM=3
 syscall-list-n64-condition := _MIPS_SIM == _MIPS_SIM_ABI64
 endif
 

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits