aboutsummaryrefslogtreecommitdiff
path: root/nptl
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2014-12-16 14:31:24 -0800
committerRoland McGrath <roland@hack.frob.com>2014-12-16 14:31:24 -0800
commitc324fcfe75c3976ae0b16943df00710e1d0d74f7 (patch)
tree5c1165c36c9697c408c4a4b3cac6a0bf7f2a0a39 /nptl
parent380292ba8b97c82a8ede3ed35f6a3c42b7b47466 (diff)
downloadglibc-c324fcfe75c3976ae0b16943df00710e1d0d74f7.zip
glibc-c324fcfe75c3976ae0b16943df00710e1d0d74f7.tar.gz
glibc-c324fcfe75c3976ae0b16943df00710e1d0d74f7.tar.bz2
Use pragmas rather than makefiles for necessary options for unwind code.
Diffstat (limited to 'nptl')
-rw-r--r--nptl/Makefile3
-rw-r--r--nptl/unwind.c2
2 files changed, 2 insertions, 3 deletions
diff --git a/nptl/Makefile b/nptl/Makefile
index 3d61ec1..2b804b2 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -146,9 +146,6 @@ 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 f109019..e50900e 100644
--- a/nptl/unwind.c
+++ b/nptl/unwind.c
@@ -25,6 +25,8 @@
#include "pthreadP.h"
#include <jmpbuf-unwind.h>
+#pragma GCC optimize "-fexceptions"
+
#ifdef HAVE_FORCED_UNWIND
#ifdef _STACK_GROWS_DOWN