@@ -852,9 +852,9 @@ c_common_post_options (const char **pfilename)
else if (!flag_gnu89_inline && !flag_isoc99)
error ("%<-fno-gnu89-inline%> is only supported in GNU99 or C99 mode");
- /* Default to ObjC sjlj exception handling if NeXT runtime. */
+ /* Default to ObjC sjlj exception handling if NeXT runtime < v2. */
if (flag_objc_sjlj_exceptions < 0)
- flag_objc_sjlj_exceptions = flag_next_runtime;
+ flag_objc_sjlj_exceptions = (flag_next_runtime && flag_objc_abi < 2);
if (flag_objc_exceptions && !flag_objc_sjlj_exceptions)
flag_exceptions = 1;
@@ -245,7 +245,7 @@ objc_next_runtime_abi_02_init (objc_runtime_hooks *rthooks)
{
extern_names = ggc_cleared_vec_alloc<hash> (SIZEHASHTABLE);
- if (flag_objc_exceptions && flag_objc_sjlj_exceptions)
+ if (flag_objc_sjlj_exceptions)
{
inform (UNKNOWN_LOCATION,
"%<-fobjc-sjlj-exceptions%> is ignored for "
@@ -507,7 +507,7 @@ static void next_runtime_02_initialize (void)
objc_getPropertyStruct_decl = NULL_TREE;
objc_setPropertyStruct_decl = NULL_TREE;
- gcc_assert (!flag_objc_sjlj_exceptions);
+ gcc_checking_assert (!flag_objc_sjlj_exceptions);
/* Although we warn that fobjc-exceptions is required for exceptions
code, we carry on and create it anyway. */
Hi, This patch from Matt, adjusts the default exception model for all targets that might use NeXT ABI 2 (currently, Darwin had handled this locally). tested on x86_64-darwin, i686-darwin, x86_64-linux, pushed to master, thanks, Iain ===== Signed-off-by: Matt Jacobson <mhjacobson@me.com> gcc/c-family/ChangeLog: * c-opts.c (c_common_post_options): Default to flag_objc_sjlj_exceptions = 1 only when flag_objc_abi < 2. gcc/objc/ChangeLog: * objc-next-runtime-abi-02.c (objc_next_runtime_abi_02_init): Warn about and reset flag_objc_sjlj_exceptions regardless of flag_objc_exceptions. (next_runtime_02_initialize): Use a checking assert that flag_objc_sjlj_exceptions is off. --- gcc/c-family/c-opts.c | 4 ++-- gcc/objc/objc-next-runtime-abi-02.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)