Move unwind-resume code from NPTL to sysdeps/gnu.

6 files changed, 30 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 7485ec5429..71c3f01284 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 bab38c7a8f..5b8b0e5555 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 72550d74a7..f4d9390d83 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 5b9a0a56ed..b33d1004a5 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
index 743e675d4d..743e675d4d 100644
--- a/nptl/sysdeps/pthread/rt-unwind-resume.c
+++ b/sysdeps/gnu/rt-unwind-resume.c
diff --git a/nptl/sysdeps/pthread/unwind-resume.c b/sysdeps/gnu/unwind-resume.c
index 69f3e04c43..69f3e04c43 100644
--- a/nptl/sysdeps/pthread/unwind-resume.c
+++ b/sysdeps/gnu/unwind-resume.c