Author: Tom Stellard Date: 2022-03-22T23:17:42-07:00 New Revision: 98fd3b359866f474ab1c097c22fb5c3be356b996
URL: https://github.com/llvm/llvm-project/commit/98fd3b359866f474ab1c097c22fb5c3be356b996 DIFF: https://github.com/llvm/llvm-project/commit/98fd3b359866f474ab1c097c22fb5c3be356b996.diff LOG: Driver: Don't warn on -mbranch-protection when linking The -mbranch-protection definition in Options.td was not given a Group, so this was causing clang to emit a -Wunused-command-line-argument warning when this flag was passed to the linker driver. This was a problem, because some build systems, like cmake, automatically pass the C flags to the linker. Therefore, any program that was compiled with -Werror and -mbranch-protection would fail to link with the error: argument unused during compilation: '-mbranch-protection=standard' [-Werror,-Wunused-command-line-argument] Reviewed By: vhscampos Differential Revision: https://reviews.llvm.org/D121983 Added: clang/test/Driver/Inputs/main.c Modified: clang/include/clang/Driver/Options.td clang/test/Driver/aarch64-security-options.c Removed: ################################################################################ diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td index 2a23695c149fa..e35b36af91c33 100644 --- a/clang/include/clang/Driver/Options.td +++ b/clang/include/clang/Driver/Options.td @@ -3442,6 +3442,7 @@ def msign_return_address_EQ : Joined<["-"], "msign-return-address=">, Flags<[CC1Option]>, Group<m_Group>, Values<"none,all,non-leaf">, HelpText<"Select return address signing scope">; def mbranch_protection_EQ : Joined<["-"], "mbranch-protection=">, + Group<m_Group>, HelpText<"Enforce targets of indirect branches and function returns">; def mharden_sls_EQ : Joined<["-"], "mharden-sls=">, diff --git a/clang/test/Driver/Inputs/main.c b/clang/test/Driver/Inputs/main.c new file mode 100644 index 0000000000000..5c2fa9bb6a78e --- /dev/null +++ b/clang/test/Driver/Inputs/main.c @@ -0,0 +1,3 @@ +int main(int argc, char **argv) { + return 0; +} diff --git a/clang/test/Driver/aarch64-security-options.c b/clang/test/Driver/aarch64-security-options.c index 6ea4b8ae58385..e9db540d53ede 100644 --- a/clang/test/Driver/aarch64-security-options.c +++ b/clang/test/Driver/aarch64-security-options.c @@ -27,6 +27,10 @@ // RUN: %clang -target aarch64--none-eabi -c %s -### -mbranch-protection=bar 2>&1 | \ // RUN: FileCheck %s --check-prefix=BAD-BP-PROTECTION --check-prefix=WARN +// RUN: %clang -target aarch64--none-eabi -o %t-main.o -mbranch-protection=standard -c %S/Inputs/main.c +// RUN: %clang -target aarch64--none-eabi -o %t-main -mbranch-protection=standard %t-main.o 2>&1 | \ +// RUN: FileCheck --allow-empty %s --check-prefix=LINKER-DRIVER + // WARN-NOT: warning: ignoring '-mbranch-protection=' option because the 'aarch64' architecture does not support it [-Wbranch-protection] // RA-OFF: "-msign-return-address=none" @@ -46,3 +50,7 @@ // BAD-B-KEY-COMBINATION: invalid branch protection option 'b-key' in '-mbranch-protection={{.*}}' // BAD-LEAF-COMBINATION: invalid branch protection option 'leaf' in '-mbranch-protection={{.*}}' + +// Check that the linker driver doesn't warn about -mbranch-protection=standard +// as an unused option. +// LINKER-DRIVER-NOT: warning: _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
