From 98b0f5cd3fb624ecf150d1b555713eabeb966b2b Mon Sep 17 00:00:00 2001 From: Ralph Versteegen Date: Mon, 22 Jan 2024 11:27:29 +1300 Subject: [PATCH] fbc: reword a couple error messages mentioning GCC to GCC/clang --- src/compiler/error.bas | 4 ++-- src/compiler/error.bi | 2 +- src/compiler/parser-quirk-vafirst.bas | 2 +- src/compiler/pp-define.bas | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/compiler/error.bas b/src/compiler/error.bas index 41a32382e..053327c5c 100644 --- a/src/compiler/error.bas +++ b/src/compiler/error.bas @@ -93,7 +93,7 @@ declare function hMakeParamDesc _ ( /'FB_WARNINGMSG_EXPECTEDDIGIT '/ 1, @"Expected digit" ), _ ( /'FB_WARNINGMSG_UPCASTDISCARDSINITIALIZER '/ 1, @"Up-casting discards initializer(s)" ), _ ( /'FB_WARNINGMSG_BYREFTEMPVAR '/ 2, @"Suspicious address expression passed to BYREF parameter" ), _ - ( /'FB_WARNINGMSG_MISSINGANDROIDSYSROOT '/ 1, @"GCC didn't provide a proper sysroot. You probably have to pass fbc an argument of the form '-sysroot $NDK/platforms/android-$API/arch-$ARCH'" ), _ + ( /'FB_WARNINGMSG_MISSINGANDROIDSYSROOT '/ 1, @"GCC/Clang didn't provide a proper sysroot. You probably have to pass fbc an argument of the form '-sysroot $NDK/platforms/android-$API/arch-$ARCH'" ), _ ( /'FB_WARNINGMSGS '/ 0, @"FB_WARNINGMSGS" ) _ } @@ -384,7 +384,7 @@ declare function hMakeParamDesc _ /'FB_ERRMSG_FORNEXTVARIABLEMISMATCH '/ @"FOR/NEXT variable name mismatch", _ /'FB_ERRMSG_OPTIONREQUIRESSSE '/ @"Selected option requires an SSE FPU mode", _ /'FB_ERRMSG_EXPECTEDRELOP '/ @"Expected relational operator ( =, >, <, <>, <=, >= )", _ - /'FB_ERRMSG_STMTUNSUPPORTEDINGCC '/ @"Unsupported statement in -gen gcc mode", _ + /'FB_ERRMSG_STMTUNSUPPORTEDINC '/ @"Unsupported statement in -gen gcc/clang mode", _ /'FB_ERRMSG_TOOMANYLABELS '/ @"Too many labels", _ /'FB_ERRMSG_UNSUPPORTEDFUNCTION '/ @"Unsupported function", _ /'FB_ERRMSG_EXPECTEDSUB '/ @"Expected sub", _ diff --git a/src/compiler/error.bi b/src/compiler/error.bi index 9c7f1f8a8..7b7ea2922 100644 --- a/src/compiler/error.bi +++ b/src/compiler/error.bi @@ -289,7 +289,7 @@ enum FB_ERRMSG FB_ERRMSG_FORNEXTVARIABLEMISMATCH FB_ERRMSG_OPTIONREQUIRESSSE FB_ERRMSG_EXPECTEDRELOP - FB_ERRMSG_STMTUNSUPPORTEDINGCC + FB_ERRMSG_STMTUNSUPPORTEDINC FB_ERRMSG_TOOMANYLABELS FB_ERRMSG_UNSUPPORTEDFUNCTION FB_ERRMSG_EXPECTEDSUB diff --git a/src/compiler/parser-quirk-vafirst.bas b/src/compiler/parser-quirk-vafirst.bas index a7ad76245..c6c66643a 100644 --- a/src/compiler/parser-quirk-vafirst.bas +++ b/src/compiler/parser-quirk-vafirst.bas @@ -218,7 +218,7 @@ function cVAFunct() as ASTNODE ptr '' C backend? va_* not supported select case env.clopt.backend case FB_BACKEND_GCC, FB_BACKEND_CLANG - errReport( FB_ERRMSG_STMTUNSUPPORTEDINGCC, TRUE ) + errReport( FB_ERRMSG_STMTUNSUPPORTEDINC, TRUE ) '' error recovery: fake an expr function = astNewCONSTi( 0 ) diff --git a/src/compiler/pp-define.bas b/src/compiler/pp-define.bas index d81aab430..c16ec3104 100644 --- a/src/compiler/pp-define.bas +++ b/src/compiler/pp-define.bas @@ -42,7 +42,7 @@ private function isMacroAllowed(byval s as FBSYMBOL ptr) as integer if (s->def.flags and FB_DEFINE_FLAGS_NOGCC) then select case env.clopt.backend case FB_BACKEND_GCC, FB_BACKEND_CLANG - errReport(FB_ERRMSG_STMTUNSUPPORTEDINGCC) + errReport(FB_ERRMSG_STMTUNSUPPORTEDINC) return FALSE end select end if