This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
Community source repository for glibc add-on ports branch, master, updated. glibc-2.15-273-g17cb6fe
- From: jsm28 at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 30 May 2012 10:07:28 -0000
- Subject: Community source repository for glibc add-on ports branch, master, updated. glibc-2.15-273-g17cb6fe
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Community source repository for glibc add-on ports".
The branch, master has been updated
via 17cb6fe2a41f91e518c6feaac766252afa2d5467 (commit)
from cc824a2e80511684f8637aacba784e7c57ac3b8b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc-ports.git;a=commitdiff;h=17cb6fe2a41f91e518c6feaac766252afa2d5467
commit 17cb6fe2a41f91e518c6feaac766252afa2d5467
Author: Joseph Myers <joseph@codesourcery.com>
Date: Wed May 30 10:07:11 2012 +0000
Remove SJLJ exceptions conditionals for ARM.
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
-----------------------------------------------------------------------
Summary of changes:
ChangeLog.arm | 5 +++++
sysdeps/arm/start.S | 5 -----
sysdeps/unix/sysv/linux/arm/nptl/pthread_once.c | 9 ---------
3 files changed, 5 insertions(+), 14 deletions(-)
hooks/post-receive
--
Community source repository for glibc add-on ports