diff options
author | Caroline Tice <cmtice@google.com> | 2019-10-28 09:48:18 -0700 |
---|---|---|
committer | Caroline Tice <cmtice@chromium.org> | 2019-10-29 22:22:32 +0000 |
commit | 8ac33e078ef1dd94b350fd4f81684ed6e3f272ec (patch) | |
tree | e38659e656012063539584711648abca1c2ca0c6 /compiler_wrapper/testdata | |
parent | c0861360b744850a6dd48d0d7bfc7dd2c26dfb65 (diff) | |
download | toolchain-utils-8ac33e078ef1dd94b350fd4f81684ed6e3f272ec.tar.gz |
toolchain_utils: Add post-user flags to compiler_wrapper.
This adds the ability to add flags to the compiler command that
cannot be overridden by the user (e.g. when we MUST turn off a warning).
It adds '-Wno-implicit-int-float-conversion as such a flag for
llvm-next.
BUG=chromium:1018778
TEST='go test' passes
Change-Id: Ic57747be9719be83d3c5f7d7b4f4263f69f4de61
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/1881725
Reviewed-by: Tobias Bosch <tbosch@google.com>
Reviewed-by: George Burgess <gbiv@chromium.org>
Commit-Queue: Caroline Tice <cmtice@chromium.org>
Tested-by: Caroline Tice <cmtice@chromium.org>
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
Diffstat (limited to 'compiler_wrapper/testdata')
5 files changed, 32 insertions, 32 deletions
diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json index 56b7b3ed..c1daaa88 100644 --- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json +++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json @@ -37,7 +37,6 @@ "-fuse-ld=lld", "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", - "-Wno-implicit-int-float-conversion", "-Wno-return-stack-address", "-Werror=poison-system-directories", "-fstack-protector-strong", @@ -46,6 +45,7 @@ "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "main.cc", + "-Wno-implicit-int-float-conversion", "-B../../bin", "-target", "x86_64-cros-linux-gnu" @@ -99,7 +99,6 @@ "-fuse-ld=lld", "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", - "-Wno-implicit-int-float-conversion", "-Wno-return-stack-address", "-Werror=poison-system-directories", "-fstack-protector-strong", @@ -108,6 +107,7 @@ "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "main.cc", + "-Wno-implicit-int-float-conversion", "-B../../bin", "-target", "x86_64-cros-linux-gnu" @@ -164,7 +164,6 @@ "-fuse-ld=lld", "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", - "-Wno-implicit-int-float-conversion", "-Wno-return-stack-address", "-Werror=poison-system-directories", "-fstack-protector-strong", @@ -173,6 +172,7 @@ "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "main.cc", + "-Wno-implicit-int-float-conversion", "-B../../bin", "-target", "x86_64-cros-linux-gnu" diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json index 09f39ebd..6932398b 100644 --- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json +++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json @@ -27,7 +27,6 @@ "-fuse-ld=lld", "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", - "-Wno-implicit-int-float-conversion", "-Wno-return-stack-address", "-Werror=poison-system-directories", "-fstack-protector-strong", @@ -36,6 +35,7 @@ "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "main.cc", + "-Wno-implicit-int-float-conversion", "-B../../bin", "-target", "x86_64-cros-linux-gnu" @@ -81,7 +81,6 @@ "-fuse-ld=lld", "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", - "-Wno-implicit-int-float-conversion", "-Wno-return-stack-address", "-Werror=poison-system-directories", "-fstack-protector-strong", @@ -90,6 +89,7 @@ "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "main.cc", + "-Wno-implicit-int-float-conversion", "-B../../bin", "-target", "x86_64-cros-linux-gnu" @@ -135,7 +135,6 @@ "-fuse-ld=lld", "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", - "-Wno-implicit-int-float-conversion", "-Wno-return-stack-address", "-Werror=poison-system-directories", "-fstack-protector-strong", @@ -144,6 +143,7 @@ "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "main.cc", + "-Wno-implicit-int-float-conversion", "-B../../bin", "-target", "x86_64-cros-linux-gnu" @@ -189,7 +189,6 @@ "-fuse-ld=lld", "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", - "-Wno-implicit-int-float-conversion", "-Wno-return-stack-address", "-Werror=poison-system-directories", "-fstack-protector-strong", @@ -198,6 +197,7 @@ "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "main.cc", + "-Wno-implicit-int-float-conversion", "-B../../bin", "-target", "x86_64-cros-linux-gnu" @@ -250,7 +250,6 @@ "-fuse-ld=lld", "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", - "-Wno-implicit-int-float-conversion", "-Wno-return-stack-address", "-Werror=poison-system-directories", "-fstack-protector-strong", @@ -261,6 +260,7 @@ "-resource-dir=someResourceDir", "--gcc-toolchain=/usr", "main.cc", + "-Wno-implicit-int-float-conversion", "-B../../bin", "-target", "x86_64-cros-linux-gnu" @@ -316,7 +316,6 @@ "-fuse-ld=lld", "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", - "-Wno-implicit-int-float-conversion", "-Wno-return-stack-address", "-Werror=poison-system-directories", "-fstack-protector-strong", @@ -327,6 +326,7 @@ "-resource-dir=someResourceDir", "--gcc-toolchain=/usr", "main.cc", + "-Wno-implicit-int-float-conversion", "-B../../bin", "-target", "x86_64-cros-linux-gnu" @@ -376,7 +376,6 @@ "-fuse-ld=lld", "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", - "-Wno-implicit-int-float-conversion", "-Wno-return-stack-address", "-Werror=poison-system-directories", "-fstack-protector-strong", @@ -387,6 +386,7 @@ "-resource-dir=someResourceDir", "--gcc-toolchain=/usr", "main.cc", + "-Wno-implicit-int-float-conversion", "-B../../bin", "-target", "x86_64-cros-linux-gnu" @@ -432,7 +432,6 @@ "-fuse-ld=lld", "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", - "-Wno-implicit-int-float-conversion", "-Wno-return-stack-address", "-Werror=poison-system-directories", "-fstack-protector-strong", @@ -441,6 +440,7 @@ "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "main.cc", + "-Wno-implicit-int-float-conversion", "-B../../bin", "-target", "x86_64-cros-linux-gnu" @@ -483,7 +483,6 @@ "-fuse-ld=lld", "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", - "-Wno-implicit-int-float-conversion", "-Wno-return-stack-address", "-Werror=poison-system-directories", "-fstack-protector-strong", @@ -492,6 +491,7 @@ "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "main.cc", + "-Wno-implicit-int-float-conversion", "-Ba/b/bin", "-target", "x86_64-cros-linux-gnu" @@ -534,7 +534,6 @@ "-fuse-ld=lld", "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", - "-Wno-implicit-int-float-conversion", "-Wno-return-stack-address", "-Werror=poison-system-directories", "-fstack-protector-strong", @@ -543,6 +542,7 @@ "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "main.cc", + "-Wno-implicit-int-float-conversion", "-Ba/b/bin", "-target", "x86_64-cros-linux-gnu" @@ -585,7 +585,6 @@ "-fuse-ld=lld", "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", - "-Wno-implicit-int-float-conversion", "-Wno-return-stack-address", "-Werror=poison-system-directories", "-fstack-protector-strong", @@ -594,6 +593,7 @@ "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "main.cc", + "-Wno-implicit-int-float-conversion", "-B../../bin", "-target", "x86_64-cros-linux-gnu" @@ -639,7 +639,6 @@ "-fuse-ld=lld", "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", - "-Wno-implicit-int-float-conversion", "-Wno-return-stack-address", "-Werror=poison-system-directories", "-fstack-protector-strong", @@ -648,6 +647,7 @@ "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "main.cc", + "-Wno-implicit-int-float-conversion", "-B../../bin", "-target", "x86_64-cros-linux-gnu" diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json index d4b1e970..d75eb527 100644 --- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json +++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json @@ -42,7 +42,6 @@ "-fuse-ld=lld", "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", - "-Wno-implicit-int-float-conversion", "-Wno-return-stack-address", "-Werror=poison-system-directories", "-fstack-protector-strong", @@ -51,6 +50,7 @@ "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "main.cc", + "-Wno-implicit-int-float-conversion", "-B../../bin", "-target", "x86_64-cros-linux-gnu" @@ -73,7 +73,6 @@ "-fuse-ld=lld", "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", - "-Wno-implicit-int-float-conversion", "-Wno-return-stack-address", "-Werror=poison-system-directories", "-fstack-protector-strong", @@ -82,6 +81,7 @@ "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "main.cc", + "-Wno-implicit-int-float-conversion", "-B../../bin", "-target", "x86_64-cros-linux-gnu" @@ -134,7 +134,6 @@ "-fuse-ld=lld", "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", - "-Wno-implicit-int-float-conversion", "-Wno-return-stack-address", "-Werror=poison-system-directories", "-fstack-protector-strong", @@ -143,6 +142,7 @@ "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "main.cc", + "-Wno-implicit-int-float-conversion", "-B../../bin", "-target", "x86_64-cros-linux-gnu" @@ -166,7 +166,6 @@ "-fuse-ld=lld", "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", - "-Wno-implicit-int-float-conversion", "-Wno-return-stack-address", "-Werror=poison-system-directories", "-fstack-protector-strong", @@ -175,6 +174,7 @@ "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "main.cc", + "-Wno-implicit-int-float-conversion", "-B../../bin", "-target", "x86_64-cros-linux-gnu" @@ -229,7 +229,6 @@ "-fuse-ld=lld", "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", - "-Wno-implicit-int-float-conversion", "-Wno-return-stack-address", "-Werror=poison-system-directories", "-fstack-protector-strong", @@ -238,6 +237,7 @@ "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "main.cc", + "-Wno-implicit-int-float-conversion", "-B../../bin", "-target", "x86_64-cros-linux-gnu" @@ -264,7 +264,6 @@ "-fuse-ld=lld", "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", - "-Wno-implicit-int-float-conversion", "-Wno-return-stack-address", "-Werror=poison-system-directories", "-fstack-protector-strong", @@ -273,6 +272,7 @@ "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "main.cc", + "-Wno-implicit-int-float-conversion", "-B../../bin", "-target", "x86_64-cros-linux-gnu" @@ -328,7 +328,6 @@ "-fuse-ld=lld", "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", - "-Wno-implicit-int-float-conversion", "-Wno-return-stack-address", "-Werror=poison-system-directories", "-fstack-protector-strong", @@ -337,6 +336,7 @@ "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "main.cc", + "-Wno-implicit-int-float-conversion", "-B../../bin", "-target", "x86_64-cros-linux-gnu" @@ -360,7 +360,6 @@ "-fuse-ld=lld", "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", - "-Wno-implicit-int-float-conversion", "-Wno-return-stack-address", "-Werror=poison-system-directories", "-fstack-protector-strong", @@ -369,6 +368,7 @@ "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "main.cc", + "-Wno-implicit-int-float-conversion", "-B../../bin", "-target", "x86_64-cros-linux-gnu" diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/force_disable_werror.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/force_disable_werror.json index e197de4c..f975f452 100644 --- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/force_disable_werror.json +++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/force_disable_werror.json @@ -30,7 +30,6 @@ "-fuse-ld=lld", "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", - "-Wno-implicit-int-float-conversion", "-Wno-return-stack-address", "-Werror=poison-system-directories", "-fstack-protector-strong", @@ -39,6 +38,7 @@ "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "main.cc", + "-Wno-implicit-int-float-conversion", "-B../../bin", "-target", "x86_64-cros-linux-gnu" @@ -84,7 +84,6 @@ "-fuse-ld=lld", "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", - "-Wno-implicit-int-float-conversion", "-Wno-return-stack-address", "-Werror=poison-system-directories", "-fstack-protector-strong", @@ -93,6 +92,7 @@ "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "main.cc", + "-Wno-implicit-int-float-conversion", "-B../../bin", "-target", "x86_64-cros-linux-gnu" @@ -124,7 +124,6 @@ "-fuse-ld=lld", "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", - "-Wno-implicit-int-float-conversion", "-Wno-return-stack-address", "-Werror=poison-system-directories", "-fstack-protector-strong", @@ -133,6 +132,7 @@ "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "main.cc", + "-Wno-implicit-int-float-conversion", "-B../../bin", "-target", "x86_64-cros-linux-gnu", @@ -181,7 +181,6 @@ "-fuse-ld=lld", "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", - "-Wno-implicit-int-float-conversion", "-Wno-return-stack-address", "-Werror=poison-system-directories", "-fstack-protector-strong", @@ -190,6 +189,7 @@ "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "main.cc", + "-Wno-implicit-int-float-conversion", "-B../../bin", "-target", "x86_64-cros-linux-gnu" @@ -221,7 +221,6 @@ "-fuse-ld=lld", "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", - "-Wno-implicit-int-float-conversion", "-Wno-return-stack-address", "-Werror=poison-system-directories", "-fstack-protector-strong", @@ -230,6 +229,7 @@ "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "main.cc", + "-Wno-implicit-int-float-conversion", "-B../../bin", "-target", "x86_64-cros-linux-gnu", diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_clang_syntax.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_clang_syntax.json index a4305412..b9582f6d 100644 --- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_clang_syntax.json +++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_clang_syntax.json @@ -27,7 +27,6 @@ "-fuse-ld=lld", "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", - "-Wno-implicit-int-float-conversion", "-Wno-return-stack-address", "-Werror=poison-system-directories", "-fstack-protector-strong", @@ -36,6 +35,7 @@ "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "main.cc", + "-Wno-implicit-int-float-conversion", "-B../../bin", "-target", "x86_64-cros-linux-gnu", @@ -102,7 +102,6 @@ "-fuse-ld=lld", "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", - "-Wno-implicit-int-float-conversion", "-Wno-return-stack-address", "-Werror=poison-system-directories", "-fstack-protector-strong", @@ -111,6 +110,7 @@ "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "main.cc", + "-Wno-implicit-int-float-conversion", "-B../../bin", "-target", "x86_64-cros-linux-gnu", @@ -171,7 +171,6 @@ "-fuse-ld=lld", "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", - "-Wno-implicit-int-float-conversion", "-Wno-return-stack-address", "-Werror=poison-system-directories", "-fstack-protector-strong", @@ -180,6 +179,7 @@ "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "main.cc", + "-Wno-implicit-int-float-conversion", "-B../../bin", "-target", "x86_64-cros-linux-gnu", @@ -224,7 +224,6 @@ "-fuse-ld=lld", "-Wno-reorder-init-list", "-Wno-final-dtor-non-final-class", - "-Wno-implicit-int-float-conversion", "-Wno-return-stack-address", "-Werror=poison-system-directories", "-fstack-protector-strong", @@ -233,6 +232,7 @@ "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "main.cc", + "-Wno-implicit-int-float-conversion", "-B../../bin", "-target", "x86_64-cros-linux-gnu", |