[Commits] r23441 - in /fsf/trunk/libc/ports: ChangeLog.arm sysdeps/arm/include/bits/setjmp.h

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Thu Jul  4 00:01:59 2013
New Revision: 23441

Log:
Import glibc-mainline for 2013-07-04

Modified:
    fsf/trunk/libc/ports/ChangeLog.arm
    fsf/trunk/libc/ports/sysdeps/arm/include/bits/setjmp.h

Modified: fsf/trunk/libc/ports/ChangeLog.arm
==============================================================================
--- fsf/trunk/libc/ports/ChangeLog.arm (original)
+++ fsf/trunk/libc/ports/ChangeLog.arm Thu Jul  4 00:01:59 2013
@@ -1,3 +1,9 @@
+2013-07-03  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/arm/include/bits/setjmp.h [_ISOMAC] (JMP_BUF_REGLIST):
+	Do not define.
+	[_ISOMAC] (__JMP_BUF_SP): Likewise.
+
 2013-07-02  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/arm/libm-test-ulps: Regenerated.

Modified: fsf/trunk/libc/ports/sysdeps/arm/include/bits/setjmp.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/arm/include/bits/setjmp.h (original)
+++ fsf/trunk/libc/ports/sysdeps/arm/include/bits/setjmp.h Thu Jul  4 00:01:59 2013
@@ -24,11 +24,13 @@
 # include <sysdeps/arm/bits/setjmp.h>
 #endif
 
+#ifndef _ISOMAC
 /* Register list for a ldm/stm instruction to load/store
    the general registers from a __jmp_buf.  */
-#define JMP_BUF_REGLIST		{v1-v6, sl, fp, sp, lr}
+# define JMP_BUF_REGLIST	{v1-v6, sl, fp, sp, lr}
 
 /* Index of __jmp_buf where the sp register resides.  */
-#define __JMP_BUF_SP		8
+# define __JMP_BUF_SP		8
+#endif
 
 #endif  /* include/bits/setjmp.h */

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