From c324fcfe75c3976ae0b16943df00710e1d0d74f7 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Tue, 16 Dec 2014 14:31:24 -0800 Subject: Use pragmas rather than makefiles for necessary options for unwind code. --- nptl/Makefile | 3 --- nptl/unwind.c | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'nptl') diff --git a/nptl/Makefile b/nptl/Makefile index 3d61ec1a34..2b804b2ce4 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 f109019b2e..e50900e001 100644 --- a/nptl/unwind.c +++ b/nptl/unwind.c @@ -25,6 +25,8 @@ #include "pthreadP.h" #include +#pragma GCC optimize "-fexceptions" + #ifdef HAVE_FORCED_UNWIND #ifdef _STACK_GROWS_DOWN -- cgit v1.2.3