aboutsummaryrefslogtreecommitdiff
path: root/nptl
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2009-05-16 08:57:49 -0700
committerUlrich Drepper <drepper@redhat.com>2009-05-16 08:57:49 -0700
commita5b8b56df7ae93e156ad523e1c867f41fc1e007d (patch)
treea423dada1bee6c91dd6508326d9d89004f8f1fb6 /nptl
parentedeabc047e56680a293c39992d227b4c430cc0a7 (diff)
downloadglibc-a5b8b56df7ae93e156ad523e1c867f41fc1e007d.tar
glibc-a5b8b56df7ae93e156ad523e1c867f41fc1e007d.tar.gz
glibc-a5b8b56df7ae93e156ad523e1c867f41fc1e007d.tar.bz2
glibc-a5b8b56df7ae93e156ad523e1c867f41fc1e007d.zip
Rename nptl/init.c to nptl/nptl-init.c.
Needed to allow overwriting architectures init.c in csu and nptl individually. Fixes BZ #9924.
Diffstat (limited to 'nptl')
-rw-r--r--nptl/ChangeLog6
-rw-r--r--nptl/Makefile6
-rw-r--r--nptl/nptl-init.c (renamed from nptl/init.c)0
3 files changed, 9 insertions, 3 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index f3bd32f577..b83128e5af 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,9 @@
+2009-05-16 Ulrich Drepper <drepper@redhat.com>
+
+ [BZ #9924]
+ * nptl-init.c: Renamed from init.c.
+ * Makefile: Change all occurences of init.c to nptl-init.c.
+
2009-05-15 Ulrich Drepper <drepper@redhat.com>
* cancellation.c (__pthread_disable_asynccancel): Correct the bits
diff --git a/nptl/Makefile b/nptl/Makefile
index 71bf5ef913..07c098d23e 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -31,7 +31,7 @@ install-lib-ldscripts := libpthread.so
routines = alloca_cutoff forward libc-lowlevellock libc-cancellation
shared-only-routines = forward
-libpthread-routines = init vars events version \
+libpthread-routines = nptl-init vars events version \
pthread_create pthread_exit pthread_detach \
pthread_join pthread_tryjoin pthread_timedjoin \
pthread_self pthread_equal pthread_yield \
@@ -139,8 +139,8 @@ CFLAGS-pthread_atfork.c = -DNOT_IN_libc
# we have to compile some files with exception handling enabled, some
# even with asynchronous unwind tables.
-# init.c contains sigcancel_handler().
-CFLAGS-init.c = -fexceptions -fasynchronous-unwind-tables
+# nptl-init.c contains sigcancel_handler().
+CFLAGS-nptl-init.c = -fexceptions -fasynchronous-unwind-tables
# The unwind code itself,
CFLAGS-unwind.c = -fexceptions
CFLAGS-unwind-forcedunwind.c = -fexceptions -fasynchronous-unwind-tables
diff --git a/nptl/init.c b/nptl/nptl-init.c
index 5e9c250ff7..5e9c250ff7 100644
--- a/nptl/init.c
+++ b/nptl/nptl-init.c