OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Objective-C: Default flag_objc_sjlj_exceptions off for NeXT ABI >= 2.

Browse Source 
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.
This commit is contained in:
Matt Jacobson 2021-07-29 09:57:23 +01:00 committed by Iain Sandoe
parent 60b94d8bd2
commit 798666392b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/c-family/c-opts.c
View File

@ -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;

4
gcc/objc/objc-next-runtime-abi-02.c
View File

@ -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. */