This is the mail archive of the
libc-ports@sources.redhat.com
mailing list for the libc-ports project.
Condition sysdeps/arm/include/bits/setjmp.h contents on _ISOMAC
- From: "Joseph S. Myers" <joseph at codesourcery dot com>
- To: <libc-ports at sourceware dot org>
- Date: Wed, 3 Jul 2013 22:02:48 +0000
- Subject: Condition sysdeps/arm/include/bits/setjmp.h contents on _ISOMAC
Testing for ARM in preparation for the 2.18 release showed up
stdlib/isomac failing because of the JMP_BUF_REGLIST macro in the internal
bits/setjmp.h wrapper. Of course in principle these internal headers
shouldn't be used for most testing, but the established practice for now
in glibc is that they disable problematic internal definitions if _ISOMAC
is defined to avoid these header namespace tests failing; I've applied
this patch to do so in this header.
diff --git a/ports/ChangeLog.arm b/ports/ChangeLog.arm
index 73f3213..1e7a35c 100644
--- a/ports/ChangeLog.arm
+++ b/ports/ChangeLog.arm
@@ -1,3 +1,9 @@
+2013-07-03 Joseph Myers <joseph@codesourcery.com>
+
+ * sysdeps/arm/include/bits/setjmp.h [_ISOMAC] (JMP_BUF_REGLIST):
+ Do not define.
+ [_ISOMAC] (__JMP_BUF_SP): Likewise.
+
2013-07-02 Joseph Myers <joseph@codesourcery.com>
* sysdeps/arm/libm-test-ulps: Regenerated.
diff --git a/ports/sysdeps/arm/include/bits/setjmp.h b/ports/sysdeps/arm/include/bits/setjmp.h
index 23d8f75..1559d7b 100644
--- a/ports/sysdeps/arm/include/bits/setjmp.h
+++ b/ports/sysdeps/arm/include/bits/setjmp.h
@@ -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 */
--
Joseph S. Myers
joseph@codesourcery.com