This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, master, updated. glibc-2.11-330-gf571a99
- From: roland at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 6 Apr 2010 03:13:56 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.11-330-gf571a99
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 "GNU C Library master sources".
The branch, master has been updated
via f571a994cec6be2f6edff2f0cd43cbdadcd94f5f (commit)
from 4dd019e3a1c68e2988ac35a97c95a59cd307eb05 (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.git;a=commitdiff;h=f571a994cec6be2f6edff2f0cd43cbdadcd94f5f
commit f571a994cec6be2f6edff2f0cd43cbdadcd94f5f
Author: Roland McGrath <roland@redhat.com>
Date: Mon Apr 5 20:07:39 2010 -0700
Move unwind-resume code from NPTL to sysdeps/gnu.
diff --git a/ChangeLog b/ChangeLog
index 7485ec5..71c3f01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-04-05 Thomas Schwinge <thomas@schwinge.name>
+
+ * sysdeps/gnu/unwind-resume.c: New, moved from nptl/sysdeps/pthread/.
+ * sysdeps/gnu/rt-unwind-resume.c: Likewise.
+ * sysdeps/gnu/Makefile: Add sections for csu and rt subdirs to
+ build unwind-resume code, previously in nptl/sysdeps/pthread/Makefile.
+
2010-04-05 Roland McGrath <roland@redhat.com>
* elf/rtld.c (dl_main) [HAVE_AUX_VECTOR]: Add a cast.
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index bab38c7..5b8b0e5 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,10 @@
+2010-04-05 Thomas Schwinge <thomas@schwinge.name>
+
+ * sysdeps/pthread/unwind-resume.c: Moved to main tree sysdeps/gnu/.
+ * sysdeps/pthread/rt-unwind-resume.c: Likewise.
+ * sysdeps/pthread/Makefile: Remove csu section and rt section's
+ unwind-resume bits, now in main tree sysdeps/gnu/Makefile instead.
+
2010-03-23 Luis Machado <luisgpm@br.ibm.com>
* pthread_cond_timedwait.c: Add check for
diff --git a/nptl/sysdeps/pthread/Makefile b/nptl/sysdeps/pthread/Makefile
index 72550d7..f4d9390 100644
--- a/nptl/sysdeps/pthread/Makefile
+++ b/nptl/sysdeps/pthread/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 2002,2003,2004,2006 Free Software Foundation, Inc.
+# Copyright (C) 2002,2003,2004,2006,2010 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -17,21 +17,13 @@
# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
# 02111-1307 USA.
-ifeq ($(subdir),csu)
-routines += unwind-resume
-shared-only-routines += unwind-resume
-CFLAGS-unwind-resume.c += -fexceptions -fasynchronous-unwind-tables
-endif
-
ifeq ($(subdir),nptl)
libpthread-sysdep_routines += errno-loc
endif
ifeq ($(subdir),rt)
-librt-sysdep_routines += timer_routines librt-cancellation rt-unwind-resume
-librt-shared-only-routines += rt-unwind-resume
+librt-sysdep_routines += timer_routines librt-cancellation
CFLAGS-librt-cancellation.c += -fexceptions -fasynchronous-unwind-tables
-CFLAGS-rt-unwind-resume.c += -fexceptions -fasynchronous-unwind-tables
ifeq (yes,$(build-shared))
$(objpfx)tst-timer: $(objpfx)librt.so $(shared-thread-library)
diff --git a/sysdeps/gnu/Makefile b/sysdeps/gnu/Makefile
index 5b9a0a5..b33d100 100644
--- a/sysdeps/gnu/Makefile
+++ b/sysdeps/gnu/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1996,1997,1998,1999,2001,2002,2003,2004,2005,2006
+# Copyright (C) 1996,1997,1998,1999,2001,2002,2003,2004,2005,2006,2010
# Free Software Foundation, Inc.
# This file is part of the GNU C Library.
@@ -77,3 +77,16 @@ endif
ifeq ($(subdir),misc)
sysdep_headers += sys/mtio.h
endif
+
+
+ifeq ($(subdir),csu)
+routines += unwind-resume
+shared-only-routines += unwind-resume
+CFLAGS-unwind-resume.c += -fexceptions -fasynchronous-unwind-tables
+endif
+
+ifeq ($(subdir),rt)
+librt-sysdep_routines += rt-unwind-resume
+librt-shared-only-routines += rt-unwind-resume
+CFLAGS-rt-unwind-resume.c += -fexceptions -fasynchronous-unwind-tables
+endif
diff --git a/nptl/sysdeps/pthread/rt-unwind-resume.c b/sysdeps/gnu/rt-unwind-resume.c
similarity index 100%
rename from nptl/sysdeps/pthread/rt-unwind-resume.c
rename to sysdeps/gnu/rt-unwind-resume.c
diff --git a/nptl/sysdeps/pthread/unwind-resume.c b/sysdeps/gnu/unwind-resume.c
similarity index 100%
rename from nptl/sysdeps/pthread/unwind-resume.c
rename to sysdeps/gnu/unwind-resume.c
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 7 +++++++
nptl/ChangeLog | 7 +++++++
nptl/sysdeps/pthread/Makefile | 12 ++----------
sysdeps/gnu/Makefile | 15 ++++++++++++++-
.../pthread => sysdeps/gnu}/rt-unwind-resume.c | 0
.../pthread => sysdeps/gnu}/unwind-resume.c | 0
6 files changed, 30 insertions(+), 11 deletions(-)
rename {nptl/sysdeps/pthread => sysdeps/gnu}/rt-unwind-resume.c (100%)
rename {nptl/sysdeps/pthread => sysdeps/gnu}/unwind-resume.c (100%)
hooks/post-receive
--
GNU C Library master sources