aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorIain Sandoe <iains@gcc.gnu.org>2010-12-18 09:16:09 +0000
committerIain Sandoe <iains@gcc.gnu.org>2010-12-18 09:16:09 +0000
commita6e4343fc4368e356348e47afbf432bf7f1b339d (patch)
treec64080713f97088e96e50c925dc52a46b371a863 /gcc
parent927b679cfb9d57a6b2e555ce0b2e348cb5c649b2 (diff)
downloadgcc-a6e4343fc4368e356348e47afbf432bf7f1b339d.zip
gcc-a6e4343fc4368e356348e47afbf432bf7f1b339d.tar.gz
gcc-a6e4343fc4368e356348e47afbf432bf7f1b339d.tar.bz2
darwin.h (SUBTARGET_C_COMMON_OVERRIDE_OPTIONS): Only set sjlj exceptions for NeXT/m32.
gcc: * config/darwin.h (SUBTARGET_C_COMMON_OVERRIDE_OPTIONS): Only set sjlj exceptions for NeXT/m32. From-SVN: r168018
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/config/darwin.h5
2 files changed, 10 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9637406..90fe876 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
2010-12-18 Iain Sandoe <iains@gcc.gnu.org>
+ * config/darwin.h (SUBTARGET_C_COMMON_OVERRIDE_OPTIONS):
+ Only set sjlj exceptions for NeXT/m32.
+
+2010-12-18 Iain Sandoe <iains@gcc.gnu.org>
+
* config/darwin.h (GCC_DRIVER_HOST_INITIALIZATION):
Only expose when not building for target.
diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h
index a2694b8..fe266c0 100644
--- a/gcc/config/darwin.h
+++ b/gcc/config/darwin.h
@@ -140,6 +140,11 @@ extern GTY(()) int darwin_ms_struct;
} while (0)
#define SUBTARGET_C_COMMON_OVERRIDE_OPTIONS do { \
+ /* Sort out ObjC exceptions: If the runtime is NeXT we default to \
+ sjlj for m32 only. */ \
+ if (!global_options_set.x_flag_objc_sjlj_exceptions) \
+ global_options.x_flag_objc_sjlj_exceptions = \
+ flag_next_runtime && !TARGET_64BIT; \
if (flag_mkernel || flag_apple_kext) \
{ \
if (flag_use_cxa_atexit == 2) \