From: iains Date: Wed, 9 Oct 2019 18:48:38 +0000 (+0000) Subject: [Darwin] Improve Objective-C NeXT ABI version check. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c61efa71688cf01a73302de336bb92fc2f20c1af;p=thirdparty%2Fgcc.git [Darwin] Improve Objective-C NeXT ABI version check. We were missing a check for the case that user's ABI was > 2 and the codegen was for 64 bit. gcc/ChangeLog: 2019-10-09 Iain Sandoe * config/darwin.c (darwin_override_options): Make the check for Objective-C ABI version more specific for 64bit code. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@276768 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e66d06583913..ecbe8253fa91 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2019-10-09 Iain Sandoe + + * config/darwin.c (darwin_override_options): Make the check for + Objective-C ABI version more specific for 64bit code. + 2019-10-09 Iain Sandoe * config/darwin.c (machopic_indirect_data_reference): Set flag to diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c index 35d0444b5cd5..f490f622fc32 100644 --- a/gcc/config/darwin.c +++ b/gcc/config/darwin.c @@ -3114,18 +3114,19 @@ darwin_override_options (void) : (generating_for_darwin_version >= 9) ? 1 : 0); - /* Objective-C family ABI 2 is only valid for next/m64 at present. */ if (global_options_set.x_flag_objc_abi && flag_next_runtime) { - if (TARGET_64BIT && global_options.x_flag_objc_abi < 2) - error_at (UNKNOWN_LOCATION, "%<-fobjc-abi-version%> must be greater" - " than or equal to 2 for %<-m64%> targets" - " with %<-fnext-runtime%>"); - if (!TARGET_64BIT && global_options.x_flag_objc_abi >= 2) - error_at (UNKNOWN_LOCATION, "%<-fobjc-abi-version%> %d is not" - " supported on %<-m32%> targets with" - " %<-fnext-runtime%>", - global_options.x_flag_objc_abi); + if (TARGET_64BIT && global_options.x_flag_objc_abi != 2) + /* The Objective-C family ABI 2 is the only valid version NeXT/m64. */ + error_at (UNKNOWN_LOCATION, + "%<-fobjc-abi-version%> 2 must be used for 64 bit targets" + " with %<-fnext-runtime%>"); + else if (!TARGET_64BIT && global_options.x_flag_objc_abi >= 2) + /* ABI versions 0 and 1 are the only valid versions NeXT/m32. */ + error_at (UNKNOWN_LOCATION, + "%<-fobjc-abi-version%> %d is not supported for 32 bit" + " targets with %<-fnext-runtime%>", + global_options.x_flag_objc_abi); } /* Don't emit DWARF3/4 unless specifically selected. This is a