[Commits] r19164 - in /branches/eglibc-2_15: ./ ports/ChangeLog.mips ports/sysdeps/unix/sysv/linux/mips/mips32/sysdep.h

[joseph@xxxxxxxxxx]

Author: joseph
Date: Mon Jun 18 13:46:26 2012
New Revision: 19164

Log:
Merge changes between r18908 and r19163 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/mips32/sysdep.h

Propchange: branches/eglibc-2_15/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 18 13:46:26 2012
@@ -1,2 +1,2 @@
-/fsf/glibc-2_15-branch:16509-18908
+/fsf/glibc-2_15-branch:16509-19163
 /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 Mon Jun 18 13:46:26 2012
@@ -1,3 +1,9 @@
+2012-06-14  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/mips/mips32/sysdep.h
+	(FORCE_FRAME_POINTER): Assign result of alloca to a volatile
+	variable.
+
 2012-06-01  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/mips/Makefile

Modified: branches/eglibc-2_15/ports/sysdeps/unix/sysv/linux/mips/mips32/sysdep.h
==============================================================================
--- branches/eglibc-2_15/ports/sysdeps/unix/sysv/linux/mips/mips32/sysdep.h (original)
+++ branches/eglibc-2_15/ports/sysdeps/unix/sysv/linux/mips/mips32/sysdep.h Mon Jun 18 13:46:26 2012
@@ -191,8 +191,9 @@
 /* We need to use a frame pointer for the functions in which we
    adjust $sp around the syscall, or debug information and unwind
    information will be $sp relative and thus wrong during the syscall.  As
-   of GCC 3.4.3, this is sufficient.  */
-#define FORCE_FRAME_POINTER alloca (4)
+   of GCC 4.7, this is sufficient.  */
+#define FORCE_FRAME_POINTER						\
+  void *volatile __fp_force __attribute__ ((unused)) = alloca (4)
 
 #define internal_syscall5(ncs_init, cs_init, input, err, arg1, arg2, arg3, arg4, arg5)\
 ({									\

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