public inbox for
 help / color / mirror / Atom feed
* Condition sysdeps/arm/include/bits/setjmp.h contents on _ISOMAC
@ 2013-07-03 22:02 Joseph S. Myers
  0 siblings, 0 replies; only message in thread
From: Joseph S. Myers @ 2013-07-03 22:02 UTC (permalink / raw)
  To: libc-ports

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  <>
+	* sysdeps/arm/include/bits/setjmp.h [_ISOMAC] (JMP_BUF_REGLIST):
+	Do not define.
+	[_ISOMAC] (__JMP_BUF_SP): Likewise.
 2013-07-02  Joseph Myers  <>
 	* 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>
+#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  /* include/bits/setjmp.h */

Joseph S. Myers

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2013-07-03 22:02 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-07-03 22:02 Condition sysdeps/arm/include/bits/setjmp.h contents on _ISOMAC Joseph S. Myers

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).