toolchain-utils: Update compiler wrapper to disable warning.
This CL updates toolchain-utils to match recent compiler wrapper
changes in sys-devel/llvm/files. It's purpose is to disable the
new warning -Wcompound-token-split-by-space.
Also update golden tests appropriately.
BUG=chromium:1130080
TEST=Previous CL already tessted/committed.
Change-Id: I261250dc7ed6f1be7c3aa4652d793c924e1dc18d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/2423619
Commit-Queue: Caroline Tice <cmtice@chromium.org>
Commit-Queue: George Burgess <gbiv@chromium.org>
Tested-by: Caroline Tice <cmtice@chromium.org>
Auto-Submit: Caroline Tice <cmtice@chromium.org>
Reviewed-by: George Burgess <gbiv@chromium.org>
diff --git a/compiler_wrapper/config.go b/compiler_wrapper/config.go
index 10a6967..194ab57 100644
--- a/compiler_wrapper/config.go
+++ b/compiler_wrapper/config.go
@@ -96,6 +96,7 @@
cfg.useLlvmNext = useLlvmNext
if useLlvmNext {
cfg.clangFlags = append(cfg.clangFlags, llvmNextFlags...)
+ cfg.clangPostFlags = append(cfg.clangPostFlags, llvmNextPostFlags...)
}
cfg.version = version
return &cfg, nil
@@ -142,8 +143,8 @@
clangPostFlags: []string{
"-Wno-implicit-int-float-conversion",
},
- newWarningsDir: "/tmp/fatal_clang_warnings",
- triciumNitsDir: "/tmp/linting_output/clang-tidy",
+ newWarningsDir: "/tmp/fatal_clang_warnings",
+ triciumNitsDir: "/tmp/linting_output/clang-tidy",
crashArtifactsDir: "/tmp/clang_crash_diagnostics",
}
diff --git a/compiler_wrapper/cros_llvm_next_flags.go b/compiler_wrapper/cros_llvm_next_flags.go
index 6cd7cd2..ef4b828 100644
--- a/compiler_wrapper/cros_llvm_next_flags.go
+++ b/compiler_wrapper/cros_llvm_next_flags.go
@@ -15,4 +15,6 @@
// TODO: Enable test in config_test.go, once we have new llvm-next flags.
var llvmNextFlags = []string{}
-var llvmNextPostFlags = []string{}
+var llvmNextPostFlags = []string{
+ "-Wno-compound-token-split-by-space",
+}
diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json
index 97dec84..2648ce0 100644
--- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json
@@ -46,6 +46,7 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -109,6 +110,7 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -175,6 +177,7 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
"-mno-movbe",
"-B../../bin",
"-target",
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 6940fca..d7d500c 100644
--- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json
@@ -36,6 +36,7 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -90,6 +91,7 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -144,6 +146,7 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -198,6 +201,7 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -261,6 +265,7 @@
"--gcc-toolchain=/usr",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -327,6 +332,7 @@
"--gcc-toolchain=/usr",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -388,6 +394,7 @@
"--gcc-toolchain=/usr",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -442,6 +449,7 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -493,6 +501,7 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
"-mno-movbe",
"-Ba/b/bin",
"-target",
@@ -544,6 +553,7 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
"-mno-movbe",
"-Ba/b/bin",
"-target",
@@ -595,6 +605,7 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -649,6 +660,7 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
"-mno-movbe",
"-B../../bin",
"-target",
diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json
index 219a8b2..b052683 100644
--- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json
@@ -51,6 +51,7 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -83,6 +84,7 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -145,6 +147,7 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -178,6 +181,7 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -242,6 +246,7 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -278,6 +283,7 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -343,6 +349,7 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -376,6 +383,7 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
"-mno-movbe",
"-B../../bin",
"-target",
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 10e485d..670a361 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
@@ -39,6 +39,7 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -93,6 +94,7 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -133,6 +135,7 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -191,6 +194,7 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -231,6 +235,7 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
"-mno-movbe",
"-B../../bin",
"-target",
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 ea804d9..20e9746 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
@@ -36,6 +36,7 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -111,6 +112,7 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -181,6 +183,7 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -235,6 +238,7 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
"-mno-movbe",
"-B../../bin",
"-target",
