From a6e4343fc4368e356348e47afbf432bf7f1b339d Mon Sep 17 00:00:00 2001 From: Iain Sandoe Date: Sat, 18 Dec 2010 09:16:09 +0000 Subject: [PATCH] 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 --- gcc/ChangeLog | 5 +++++ gcc/config/darwin.h | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 96374062fdc8..90fe8764414d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2010-12-18 Iain Sandoe + + * config/darwin.h (SUBTARGET_C_COMMON_OVERRIDE_OPTIONS): + Only set sjlj exceptions for NeXT/m32. + 2010-12-18 Iain Sandoe * config/darwin.h (GCC_DRIVER_HOST_INITIALIZATION): diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h index a2694b873ae2..fe266c037f42 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) \