From: "Joseph S. Myers" <joseph@codesourcery.com>
To: libc-ports@sourceware.org
Subject: Remove SJLJ exceptions conditionals for ARM
Date: Wed, 30 May 2012 10:09:00 -0000 [thread overview]
Message-ID: <Pine.LNX.4.64.1205301007280.25659@digraph.polyomino.org.uk> (raw)
When updating pthread_once for libc changes I noticed a conditional on
__USING_SJLJ_EXCEPTIONS__. This is irrelevant for ARM EABI and so I've
applied this patch to remove such stray SJLJ exceptions conditionals.
diff --git a/ChangeLog.arm b/ChangeLog.arm
index 1d684d2..1737284 100644
--- a/ChangeLog.arm
+++ b/ChangeLog.arm
@@ -1,5 +1,10 @@
2012-05-30 Joseph Myers <joseph@codesourcery.com>
+ * sysdeps/arm/start.S [!__USING_SJLJ_EXCEPTIONS__]: Make code
+ unconditional.
+ * sysdeps/unix/sysv/linux/arm/nptl/pthread_once.c
+ [__USING_SJLJ_EXCEPTIONS__ && !__PIC__]: Remove conditional code.
+
* sysdeps/unix/sysv/linux/arm/nptl/pthread_once.c: Replace
_internal alias by hidden_def.
diff --git a/sysdeps/arm/start.S b/sysdeps/arm/start.S
index 7f3de8c..245d7aa 100644
--- a/sysdeps/arm/start.S
+++ b/sysdeps/arm/start.S
@@ -73,10 +73,8 @@
.globl _start
.type _start,#function
_start:
-#if !defined(__USING_SJLJ_EXCEPTIONS__)
/* Protect against unhandled exceptions. */
.fnstart
-#endif
/* Clear the frame pointer and link register since this is the outermost frame. */
mov fp, #0
mov lr, #0
@@ -138,11 +136,8 @@ _start:
.word main(GOT)
#endif
-
-#if !defined(__USING_SJLJ_EXCEPTIONS__)
.cantunwind
.fnend
-#endif
/* Define a symbol for the first piece of initialized data. */
.data
diff --git a/sysdeps/unix/sysv/linux/arm/nptl/pthread_once.c b/sysdeps/unix/sysv/linux/arm/nptl/pthread_once.c
index eea1287..0c03f1c 100644
--- a/sysdeps/unix/sysv/linux/arm/nptl/pthread_once.c
+++ b/sysdeps/unix/sysv/linux/arm/nptl/pthread_once.c
@@ -87,12 +87,3 @@ __pthread_once (pthread_once_t *once_control, void (*init_routine) (void))
}
weak_alias (__pthread_once, pthread_once)
hidden_def (__pthread_once)
-
-#if defined(__USING_SJLJ_EXCEPTIONS__) && !defined(__PIC__)
-/* When statically linked, if pthread_create is used, this file
- will be brought in. The exception handling code in GCC assumes
- that if pthread_create is available, so are these. */
-const void *include_pthread_getspecific attribute_hidden = pthread_getspecific;
-const void *include_pthread_setspecific attribute_hidden = pthread_setspecific;
-const void *include_pthread_key_create attribute_hidden = pthread_key_create;
-#endif
--
Joseph S. Myers
joseph@codesourcery.com
reply other threads:[~2012-05-30 10:09 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.1205301007280.25659@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).