diff options
| author | Roland McGrath <roland@hack.frob.com> | 2014-12-16 15:46:00 -0800 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2014-12-16 15:46:00 -0800 |
| commit | f0481d971e9941004814009c1b0877a43aa10bdb (patch) | |
| tree | 8fb260047cae35d5301e848906d1c145d5a736ad /nptl | |
| parent | c324fcfe75c3976ae0b16943df00710e1d0d74f7 (diff) | |
| download | glibc-f0481d971e9941004814009c1b0877a43aa10bdb.tar glibc-f0481d971e9941004814009c1b0877a43aa10bdb.tar.gz glibc-f0481d971e9941004814009c1b0877a43aa10bdb.tar.bz2 glibc-f0481d971e9941004814009c1b0877a43aa10bdb.zip | |
Revert "Use pragmas rather than makefiles for necessary options for unwind code."
This reverts commit c324fcfe75c3976ae0b16943df00710e1d0d74f7.
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/Makefile | 3 | ||||
| -rw-r--r-- | nptl/unwind.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index 2b804b2ce4..3d61ec1a34 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -146,6 +146,9 @@ libpthread-static-only-routines = pthread_atfork # 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 # The following three functions must be async-cancel safe. CFLAGS-pthread_cancel.c = -fexceptions -fasynchronous-unwind-tables diff --git a/nptl/unwind.c b/nptl/unwind.c index e50900e001..f109019b2e 100644 --- a/nptl/unwind.c +++ b/nptl/unwind.c @@ -25,8 +25,6 @@ #include "pthreadP.h" #include <jmpbuf-unwind.h> -#pragma GCC optimize "-fexceptions" - #ifdef HAVE_FORCED_UNWIND #ifdef _STACK_GROWS_DOWN |