From: "Joseph S. Myers" <joseph@codesourcery.com>
To: <libc-ports@sourceware.org>
Subject: Condition sysdeps/arm/include/bits/setjmp.h contents on _ISOMAC
Date: Wed, 03 Jul 2013 22:02:00 -0000 [thread overview]
Message-ID: <Pine.LNX.4.64.1307032200170.25943@digraph.polyomino.org.uk> (raw)
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
reply other threads:[~2013-07-03 22:02 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Pine.LNX.4.64.1307032200170.25943@digraph.polyomino.org.uk \
--to=joseph@codesourcery.com \
--cc=libc-ports@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).