Skip to content

Commit

Permalink
Move unwind-resume code from NPTL to sysdeps/gnu.
Browse files Browse the repository at this point in the history
  • Loading branch information
Roland McGrath committed Apr 6, 2010
1 parent 4dd019e commit f571a99
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 11 deletions.
7 changes: 7 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
7 changes: 7 additions & 0 deletions nptl/ChangeLog
Original file line number Diff line number Diff line change
@@ -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
Expand Down
12 changes: 2 additions & 10 deletions nptl/sysdeps/pthread/Makefile
Original file line number Diff line number Diff line change
@@ -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.

Expand All @@ -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)
Expand Down
15 changes: 14 additions & 1 deletion sysdeps/gnu/Makefile
Original file line number Diff line number Diff line change
@@ -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.

Expand Down Expand Up @@ -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
File renamed without changes.
File renamed without changes.

0 comments on commit f571a99

Please sign in to comment.