diff options
| author | Iain Sandoe <iain@codesourcery.com> | 2012-07-09 19:16:37 +0000 |
|---|---|---|
| committer | Iain Sandoe <iains@gcc.gnu.org> | 2012-07-09 19:16:37 +0000 |
| commit | f29234dfb10d3172e56e788b1de59a4d8cdf9241 (patch) | |
| tree | c5e120c16497e2db6e4bb851419c41aa2a89102f | |
| parent | 238065a73bd2bab6c3eb69e6d43cd8115a5b4245 (diff) | |
| download | gcc-f29234dfb10d3172e56e788b1de59a4d8cdf9241.zip gcc-f29234dfb10d3172e56e788b1de59a4d8cdf9241.tar.gz gcc-f29234dfb10d3172e56e788b1de59a4d8cdf9241.tar.bz2 | |
darwin.h (SUBTARGET_C_COMMON_OVERRIDE_OPTIONS): Move NeXT runtime exceptions model setting from here ...
* config/darwin.h (SUBTARGET_C_COMMON_OVERRIDE_OPTIONS): Move NeXT
runtime exceptions model setting from here ...
* config/darwin.c (darwin_override_options): ... to here.
From-SVN: r189390
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/config/darwin.c | 12 | ||||
| -rw-r--r-- | gcc/config/darwin.h | 3 |
3 files changed, 18 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d8edad0..ed6c439 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2012-07-09 Iain Sandoe <iain@codesourcery.com> + + * config/darwin.h (SUBTARGET_C_COMMON_OVERRIDE_OPTIONS): Move NeXT + runtime exceptions model setting from here ... + * config/darwin.c (darwin_override_options): ... to here. + 2012-07-09 Steven Bosscher <steven@gcc.gnu.org> PR tree-optimization/53887 diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c index 6805cf1..33a831f 100644 --- a/gcc/config/darwin.c +++ b/gcc/config/darwin.c @@ -3007,6 +3007,18 @@ darwin_override_options (void) flag_reorder_blocks = 1; } + /* FIXME: flag_objc_sjlj_exceptions is no longer needed since there is only + one valid choice of exception scheme for each runtime. */ + if (!global_options_set.x_flag_objc_sjlj_exceptions) + global_options.x_flag_objc_sjlj_exceptions = + flag_next_runtime && !TARGET_64BIT; + + /* FIXME: and this could be eliminated then too. */ + if (!global_options_set.x_flag_exceptions + && flag_objc_exceptions + && TARGET_64BIT) + flag_exceptions = 1; + if (flag_mkernel || flag_apple_kext) { /* -mkernel implies -fapple-kext for C++ */ diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h index d2f47f8..ca3e0eb 100644 --- a/gcc/config/darwin.h +++ b/gcc/config/darwin.h @@ -140,9 +140,6 @@ extern GTY(()) int darwin_ms_struct; } while (0) #define SUBTARGET_C_COMMON_OVERRIDE_OPTIONS do { \ - 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) \ |