From b1ca639a8692ac245753b10cb528e0db0f56dd57 Mon Sep 17 00:00:00 2001 From: Iain Sandoe Date: Sun, 6 Oct 2019 08:02:03 +0000 Subject: [PATCH] [Darwin] Fix some format-related build warnings. This fixes two error messages to avoid punctuation and contracted negations. gcc/ChangeLog: 2019-10-06 Iain Sandoe * config/darwin.c (darwin_override_options): Adjust objective-c ABI version error messages to avoid punctuation and contracted negations. From-SVN: r276635 --- gcc/ChangeLog | 6 ++++++ gcc/config/darwin.c | 11 ++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d4e180d..a2740d2 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2019-10-06 Iain Sandoe + + * config/darwin.c (darwin_override_options): Adjust objective-c + ABI version error messages to avoid punctuation and contracted + negations. + 2019-10-05 Jan Hubicka * ipa-inline.c: Fix type; compute size rather than self_size diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c index 2fb9c56..5673982 100644 --- a/gcc/config/darwin.c +++ b/gcc/config/darwin.c @@ -3152,13 +3152,14 @@ darwin_override_options (void) 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%> >= 2 must be" - " used for %<-m64%> targets with" - " %<-fnext-runtime%>"); + 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%> >= 2 is not" + error_at (UNKNOWN_LOCATION, "%<-fobjc-abi-version%> %d is not" " supported on %<-m32%> targets with" - " %<-fnext-runtime%>"); + " %<-fnext-runtime%>", + global_options.x_flag_objc_abi); } /* Don't emit DWARF3/4 unless specifically selected. This is a -- 2.7.4