aboutsummaryrefslogtreecommitdiff
path: root/compiler_wrapper
diff options
context:
space:
mode:
Diffstat (limited to 'compiler_wrapper')
-rw-r--r--compiler_wrapper/config.go9
-rw-r--r--compiler_wrapper/cros_llvm_next_flags.go9
-rw-r--r--compiler_wrapper/disable_werror_flag.go100
-rw-r--r--compiler_wrapper/disable_werror_flag_test.go65
-rw-r--r--compiler_wrapper/testdata/cros_clang_host_golden/bisect.json15
-rw-r--r--compiler_wrapper/testdata/cros_clang_host_golden/clang_ftrapv_maincc_target_specific.json45
-rw-r--r--compiler_wrapper/testdata/cros_clang_host_golden/clang_host_wrapper.json5
-rw-r--r--compiler_wrapper/testdata/cros_clang_host_golden/clang_maincc_target_specific.json45
-rw-r--r--compiler_wrapper/testdata/cros_clang_host_golden/clang_path.json60
-rw-r--r--compiler_wrapper/testdata/cros_clang_host_golden/clang_sanitizer_args.json40
-rw-r--r--compiler_wrapper/testdata/cros_clang_host_golden/clang_specific_args.json35
-rw-r--r--compiler_wrapper/testdata/cros_clang_host_golden/clangtidy.json40
-rw-r--r--compiler_wrapper/testdata/cros_clang_host_golden/force_disable_werror.json21
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/bisect.json9
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/clang_ftrapv_maincc_target_specific.json27
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/clang_maincc_target_specific.json27
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/clang_path.json36
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json24
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json21
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/clang_sysroot_wrapper_common.json18
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json24
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json15
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json12
-rw-r--r--compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json9
-rw-r--r--compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json36
-rw-r--r--compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json24
-rw-r--r--compiler_wrapper/testdata/cros_hardened_noccache_golden/force_disable_werror.json15
-rw-r--r--compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_clang_syntax.json12
-rw-r--r--compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json9
-rw-r--r--compiler_wrapper/testdata/cros_nonhardened_golden/clang_ftrapv_maincc_target_specific.json27
-rw-r--r--compiler_wrapper/testdata/cros_nonhardened_golden/clang_maincc_target_specific.json27
-rw-r--r--compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json36
-rw-r--r--compiler_wrapper/testdata/cros_nonhardened_golden/clang_sanitizer_args.json24
-rw-r--r--compiler_wrapper/testdata/cros_nonhardened_golden/clang_specific_args.json21
-rw-r--r--compiler_wrapper/testdata/cros_nonhardened_golden/clang_sysroot_wrapper_common.json18
-rw-r--r--compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json24
-rw-r--r--compiler_wrapper/testdata/cros_nonhardened_golden/force_disable_werror.json15
-rw-r--r--compiler_wrapper/testdata/cros_nonhardened_golden/gcc_clang_syntax.json12
38 files changed, 936 insertions, 75 deletions
diff --git a/compiler_wrapper/config.go b/compiler_wrapper/config.go
index 194ab579..8b5432b8 100644
--- a/compiler_wrapper/config.go
+++ b/compiler_wrapper/config.go
@@ -139,9 +139,12 @@ var crosHardenedConfig = &config{
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
},
clangPostFlags: []string{
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
},
newWarningsDir: "/tmp/fatal_clang_warnings",
triciumNitsDir: "/tmp/linting_output/clang-tidy",
@@ -171,9 +174,12 @@ var crosNonHardenedConfig = &config{
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
},
clangPostFlags: []string{
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
},
newWarningsDir: "/tmp/fatal_clang_warnings",
triciumNitsDir: "/tmp/linting_output/clang-tidy",
@@ -209,9 +215,12 @@ var crosHostConfig = &config{
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
},
clangPostFlags: []string{
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
},
newWarningsDir: "/tmp/fatal_clang_warnings",
triciumNitsDir: "/tmp/linting_output/clang-tidy",
diff --git a/compiler_wrapper/cros_llvm_next_flags.go b/compiler_wrapper/cros_llvm_next_flags.go
index f5823fbf..6cd7cd2a 100644
--- a/compiler_wrapper/cros_llvm_next_flags.go
+++ b/compiler_wrapper/cros_llvm_next_flags.go
@@ -13,11 +13,6 @@ package main
// tag is set.
// TODO: Enable test in config_test.go, once we have new llvm-next flags.
-var llvmNextFlags = []string{
- "-Wno-compound-token-split-by-macro",
-}
+var llvmNextFlags = []string{}
-var llvmNextPostFlags = []string{
- "-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
-}
+var llvmNextPostFlags = []string{}
diff --git a/compiler_wrapper/disable_werror_flag.go b/compiler_wrapper/disable_werror_flag.go
index 1180127c..8f20b6f3 100644
--- a/compiler_wrapper/disable_werror_flag.go
+++ b/compiler_wrapper/disable_werror_flag.go
@@ -7,9 +7,12 @@ package main
import (
"bytes"
"encoding/json"
+ "fmt"
"io"
"io/ioutil"
"os"
+ "path"
+ "strconv"
"strings"
"syscall"
)
@@ -119,10 +122,14 @@ func doubleBuildWithWNoError(env env, cfg *config, originalCmd *command) (exitCo
}
outputToLog := strings.Join(lines, "\n")
+ // Ignore the error here; we can't do anything about it. The result is always valid (though
+ // perhaps incomplete) even if this returns an error.
+ parentProcesses, _ := collectAllParentProcesses()
jsonData := warningsJSONData{
- Cwd: env.getwd(),
- Command: append([]string{originalCmd.Path}, originalCmd.Args...),
- Stdout: outputToLog,
+ Cwd: env.getwd(),
+ Command: append([]string{originalCmd.Path}, originalCmd.Args...),
+ Stdout: outputToLog,
+ ParentProcesses: parentProcesses,
}
// Write warning report to stdout for Android. On Android,
@@ -186,10 +193,87 @@ func doubleBuildWithWNoError(env env, cfg *config, originalCmd *command) (exitCo
return retryExitCode, nil
}
-// Struct used to write JSON. Fileds have to be uppercase for the json
-// encoder to read them.
+func parseParentPidFromPidStat(pidStatContents string) (parentPid int, ok bool) {
+ // The parent's pid is the fourth field of /proc/[pid]/stat. Sadly, the second field can
+ // have spaces in it. It ends at the last ')' in the contents of /proc/[pid]/stat.
+ lastParen := strings.LastIndex(pidStatContents, ")")
+ if lastParen == -1 {
+ return 0, false
+ }
+
+ thirdFieldAndBeyond := strings.TrimSpace(pidStatContents[lastParen+1:])
+ fields := strings.Fields(thirdFieldAndBeyond)
+ if len(fields) < 2 {
+ return 0, false
+ }
+
+ fourthField := fields[1]
+ parentPid, err := strconv.Atoi(fourthField)
+ if err != nil {
+ return 0, false
+ }
+ return parentPid, true
+}
+
+func collectProcessData(pid int) (args, env []string, parentPid int, err error) {
+ procDir := fmt.Sprintf("/proc/%d", pid)
+
+ readFile := func(fileName string) (string, error) {
+ s, err := ioutil.ReadFile(path.Join(procDir, fileName))
+ if err != nil {
+ return "", fmt.Errorf("reading %s: %v", fileName, err)
+ }
+ return string(s), nil
+ }
+
+ statStr, err := readFile("stat")
+ if err != nil {
+ return nil, nil, 0, err
+ }
+
+ parentPid, ok := parseParentPidFromPidStat(statStr)
+ if !ok {
+ return nil, nil, 0, fmt.Errorf("no parseable parent PID found in %q", statStr)
+ }
+
+ argsStr, err := readFile("cmdline")
+ if err != nil {
+ return nil, nil, 0, err
+ }
+ args = strings.Split(argsStr, "\x00")
+
+ envStr, err := readFile("environ")
+ if err != nil {
+ return nil, nil, 0, err
+ }
+ env = strings.Split(envStr, "\x00")
+ return args, env, parentPid, nil
+}
+
+// The returned []processData is valid even if this returns an error. The error is just the first we
+// encountered when trying to collect parent process data.
+func collectAllParentProcesses() ([]processData, error) {
+ results := []processData{}
+ for parent := os.Getppid(); parent != 1; {
+ args, env, p, err := collectProcessData(parent)
+ if err != nil {
+ return results, fmt.Errorf("inspecting parent %d: %v", parent, err)
+ }
+ results = append(results, processData{Args: args, Env: env})
+ parent = p
+ }
+ return results, nil
+}
+
+type processData struct {
+ Args []string `json:"invocation"`
+ Env []string `json:"env"`
+}
+
+// Struct used to write JSON. Fields have to be uppercase for the json encoder to read them.
type warningsJSONData struct {
- Cwd string `json:"cwd"`
- Command []string `json:"command"`
- Stdout string `json:"stdout"`
+ Cwd string `json:"cwd"`
+ Command []string `json:"command"`
+ Stdout string `json:"stdout"`
+ ParentProcesses []processData `json:"parent_process_data"`
}
diff --git a/compiler_wrapper/disable_werror_flag_test.go b/compiler_wrapper/disable_werror_flag_test.go
index ecc1090b..0c43dbe0 100644
--- a/compiler_wrapper/disable_werror_flag_test.go
+++ b/compiler_wrapper/disable_werror_flag_test.go
@@ -500,3 +500,68 @@ func TestClangTidyDoubleBuildClangError(t *testing.T) {
}
})
}
+
+func TestProcPidStatParsingWorksAsIntended(t *testing.T) {
+ t.Parallel()
+
+ type expected struct {
+ parent int
+ ok bool
+ }
+
+ testCases := []struct {
+ input string
+ expected expected
+ }{
+ {
+ input: "2556041 (cat) R 2519408 2556041 2519408 34818 2556041 4194304",
+ expected: expected{
+ parent: 2519408,
+ ok: true,
+ },
+ },
+ {
+ input: "2556041 (c a t) R 2519408 2556041 2519408 34818 2556041 4194304",
+ expected: expected{
+ parent: 2519408,
+ ok: true,
+ },
+ },
+ {
+ input: "",
+ expected: expected{
+ ok: false,
+ },
+ },
+ {
+ input: "foo (bar)",
+ expected: expected{
+ ok: false,
+ },
+ },
+ {
+ input: "foo (bar) baz",
+ expected: expected{
+ ok: false,
+ },
+ },
+ {
+ input: "foo (bar) baz 1qux2",
+ expected: expected{
+ ok: false,
+ },
+ },
+ }
+
+ for _, tc := range testCases {
+ parent, ok := parseParentPidFromPidStat(tc.input)
+ if tc.expected.ok != ok {
+ t.Errorf("Got ok=%v when parsing %q; expected %v", ok, tc.input, tc.expected.ok)
+ continue
+ }
+
+ if tc.expected.parent != parent {
+ t.Errorf("Got parent=%v when parsing %q; expected %v", parent, tc.input, tc.expected.parent)
+ }
+ }
+}
diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json b/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json
index cc55bc4f..1c2e5a0e 100644
--- a/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json
@@ -36,9 +36,12 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
],
"env_updates": [
"PYTHONPATH=/somepath/test_binary"
@@ -85,9 +88,12 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
],
"env_updates": [
"PYTHONPATH=/somepath/test_binary"
@@ -137,9 +143,12 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
],
"env_updates": [
"PYTHONPATH=/somepath/test_binary"
diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clang_ftrapv_maincc_target_specific.json b/compiler_wrapper/testdata/cros_clang_host_golden/clang_ftrapv_maincc_target_specific.json
index 5a59277c..ec57b0d7 100644
--- a/compiler_wrapper/testdata/cros_clang_host_golden/clang_ftrapv_maincc_target_specific.json
+++ b/compiler_wrapper/testdata/cros_clang_host_golden/clang_ftrapv_maincc_target_specific.json
@@ -27,9 +27,12 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
}
}
@@ -63,9 +66,12 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
}
}
@@ -99,9 +105,12 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
}
}
@@ -135,9 +144,12 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
}
}
@@ -171,9 +183,12 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
}
}
@@ -207,9 +222,12 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
}
}
@@ -243,9 +261,12 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
}
}
@@ -279,9 +300,12 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
}
}
@@ -315,9 +339,12 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
}
}
diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clang_host_wrapper.json b/compiler_wrapper/testdata/cros_clang_host_golden/clang_host_wrapper.json
index 44b2fb91..99c12725 100644
--- a/compiler_wrapper/testdata/cros_clang_host_golden/clang_host_wrapper.json
+++ b/compiler_wrapper/testdata/cros_clang_host_golden/clang_host_wrapper.json
@@ -26,9 +26,12 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
}
}
diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clang_maincc_target_specific.json b/compiler_wrapper/testdata/cros_clang_host_golden/clang_maincc_target_specific.json
index 0b951f3e..9389a4d8 100644
--- a/compiler_wrapper/testdata/cros_clang_host_golden/clang_maincc_target_specific.json
+++ b/compiler_wrapper/testdata/cros_clang_host_golden/clang_maincc_target_specific.json
@@ -26,9 +26,12 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
}
}
@@ -61,9 +64,12 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
}
}
@@ -96,9 +102,12 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
}
}
@@ -131,9 +140,12 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
}
}
@@ -166,9 +178,12 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
}
}
@@ -201,9 +216,12 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
}
}
@@ -236,9 +254,12 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
}
}
@@ -271,9 +292,12 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
}
}
@@ -306,9 +330,12 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
}
}
diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clang_path.json b/compiler_wrapper/testdata/cros_clang_host_golden/clang_path.json
index 69fb4410..080f1d48 100644
--- a/compiler_wrapper/testdata/cros_clang_host_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_clang_host_golden/clang_path.json
@@ -26,9 +26,12 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
}
}
@@ -64,9 +67,12 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
},
"stdout": "somemessage",
@@ -102,9 +108,12 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
}
}
@@ -140,9 +149,12 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
}
}
@@ -185,11 +197,14 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-resource-dir=someResourceDir",
"--gcc-toolchain=/usr",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
}
}
@@ -235,11 +250,14 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-resource-dir=someResourceDir",
"--gcc-toolchain=/usr",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
}
}
@@ -285,11 +303,14 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-resource-dir=someResourceDir",
"--gcc-toolchain=/usr",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
},
"stdout": "somemessage",
@@ -325,9 +346,12 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
}
}
@@ -360,9 +384,12 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
}
}
@@ -395,9 +422,12 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
}
}
@@ -430,9 +460,12 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
}
}
@@ -468,9 +501,12 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
}
}
diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clang_sanitizer_args.json b/compiler_wrapper/testdata/cros_clang_host_golden/clang_sanitizer_args.json
index 93e566fe..0aeb2362 100644
--- a/compiler_wrapper/testdata/cros_clang_host_golden/clang_sanitizer_args.json
+++ b/compiler_wrapper/testdata/cros_clang_host_golden/clang_sanitizer_args.json
@@ -28,10 +28,13 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fsanitize=kernel-address",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
}
}
@@ -66,10 +69,13 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fsanitize=kernel-address",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
}
}
@@ -104,10 +110,13 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fsanitize=kernel-address",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
}
}
@@ -142,10 +151,13 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fsanitize=kernel-address",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
}
}
@@ -179,11 +191,14 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fno-experimental-new-pass-manager",
"-fsanitize=fuzzer",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
}
}
@@ -218,12 +233,15 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fno-experimental-new-pass-manager",
"-fsanitize=address",
"-fprofile-instr-generate",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
}
}
@@ -257,10 +275,13 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fsanitize=address",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
}
}
@@ -294,10 +315,13 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fprofile-instr-generate",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
}
}
diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clang_specific_args.json b/compiler_wrapper/testdata/cros_clang_host_golden/clang_specific_args.json
index 41143bf0..bddb110e 100644
--- a/compiler_wrapper/testdata/cros_clang_host_golden/clang_specific_args.json
+++ b/compiler_wrapper/testdata/cros_clang_host_golden/clang_specific_args.json
@@ -37,6 +37,7 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-mno-movbe",
"-Wclobbered",
@@ -47,7 +48,9 @@
"-Woverride-init",
"-Wunsafe-loop-optimizations",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
}
}
@@ -81,10 +84,13 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-Wno-#warnings",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
}
}
@@ -118,10 +124,13 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-Wno-error=uninitialized",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
}
}
@@ -155,10 +164,13 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-Wno-error=unused-variable",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
}
}
@@ -192,10 +204,13 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-Wno-unused-variable",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
}
}
@@ -229,10 +244,13 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-Wunused-variable",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
}
}
@@ -266,10 +284,13 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-someflag",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
}
}
diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clangtidy.json b/compiler_wrapper/testdata/cros_clang_host_golden/clangtidy.json
index c4f86b01..89e4c6f3 100644
--- a/compiler_wrapper/testdata/cros_clang_host_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_clang_host_golden/clangtidy.json
@@ -42,9 +42,12 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
}
},
@@ -64,9 +67,12 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
}
}
@@ -116,9 +122,12 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
}
},
@@ -138,9 +147,12 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
}
}
@@ -192,9 +204,12 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
},
"stdout": "somemessage",
@@ -217,9 +232,12 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
}
}
@@ -272,9 +290,12 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
}
},
@@ -294,9 +315,12 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
},
"stdout": "somemessage",
diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/force_disable_werror.json b/compiler_wrapper/testdata/cros_clang_host_golden/force_disable_werror.json
index 272b4220..75f5e474 100644
--- a/compiler_wrapper/testdata/cros_clang_host_golden/force_disable_werror.json
+++ b/compiler_wrapper/testdata/cros_clang_host_golden/force_disable_werror.json
@@ -29,9 +29,12 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
}
}
@@ -67,9 +70,12 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
},
"stderr": "-Werror originalerror",
@@ -91,9 +97,12 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-Wno-error",
"-Wno-error=poison-system-directories"
]
@@ -133,9 +142,12 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
- "-Wno-implicit-int-float-conversion"
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation"
]
},
"stderr": "-Werror originalerror",
@@ -157,9 +169,12 @@
"-Werror=poison-system-directories",
"-Wno-unknown-warning-option",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-Wno-error",
"-Wno-error=poison-system-directories"
]
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_golden/bisect.json
index 97dec849..b8e0e462 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/bisect.json
@@ -38,6 +38,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -46,6 +47,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -101,6 +104,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -109,6 +113,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -167,6 +173,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -175,6 +182,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_ftrapv_maincc_target_specific.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_ftrapv_maincc_target_specific.json
index 6223ed91..13e97dc0 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_ftrapv_maincc_target_specific.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_ftrapv_maincc_target_specific.json
@@ -29,6 +29,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -38,6 +39,8 @@
"-ftrapv",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -82,6 +85,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -91,6 +95,8 @@
"-ftrapv",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -135,6 +141,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -144,6 +151,8 @@
"-ftrapv",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -188,6 +197,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -197,6 +207,8 @@
"-ftrapv",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-B../../bin",
"-target",
"armv7m-cros-linux-gnu"
@@ -240,6 +252,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -249,6 +262,8 @@
"-ftrapv",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-B../../bin",
"-target",
"armv7m-cros-eabi"
@@ -292,6 +307,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -301,6 +317,8 @@
"-ftrapv",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-B../../bin",
"-target",
"armv7m-cros-win-gnu"
@@ -344,6 +362,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -353,6 +372,8 @@
"-ftrapv",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-B../../bin",
"-target",
"armv8m-cros-linux-gnu"
@@ -396,6 +417,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -405,6 +427,8 @@
"-ftrapv",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-B../../bin",
"-target",
"armv8m-cros-eabi"
@@ -448,6 +472,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -457,6 +482,8 @@
"-ftrapv",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-B../../bin",
"-target",
"armv8m-cros-win-gnu"
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_maincc_target_specific.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_maincc_target_specific.json
index 717681c4..b604692a 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_maincc_target_specific.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_maincc_target_specific.json
@@ -28,6 +28,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -36,6 +37,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -79,6 +82,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -87,6 +91,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -130,6 +136,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -138,6 +145,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -181,6 +190,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -189,6 +199,8 @@
"-mthumb",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-B../../bin",
"-target",
"armv7m-cros-linux-gnu"
@@ -231,6 +243,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -239,6 +252,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-B../../bin",
"-target",
"armv7m-cros-eabi"
@@ -281,6 +296,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -289,6 +305,8 @@
"-mthumb",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-B../../bin",
"-target",
"armv7m-cros-win-gnu"
@@ -331,6 +349,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -339,6 +358,8 @@
"-mthumb",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-B../../bin",
"-target",
"armv8m-cros-linux-gnu"
@@ -381,6 +402,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -389,6 +411,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-B../../bin",
"-target",
"armv8m-cros-eabi"
@@ -431,6 +455,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -439,6 +464,8 @@
"-mthumb",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-B../../bin",
"-target",
"armv8m-cros-win-gnu"
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json
index 6940fcaf..9780356e 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json
@@ -28,6 +28,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -36,6 +37,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -82,6 +85,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -90,6 +94,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -136,6 +142,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -144,6 +151,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -190,6 +199,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -198,6 +208,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -251,6 +263,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -261,6 +274,8 @@
"--gcc-toolchain=/usr",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -317,6 +332,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -327,6 +343,8 @@
"--gcc-toolchain=/usr",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -378,6 +396,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -388,6 +407,8 @@
"--gcc-toolchain=/usr",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -434,6 +455,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -442,6 +464,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -485,6 +509,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -493,6 +518,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-Ba/b/bin",
"-target",
@@ -536,6 +563,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -544,6 +572,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-Ba/b/bin",
"-target",
@@ -587,6 +617,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -595,6 +626,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -641,6 +674,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -649,6 +683,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json
index acf6c24c..b90ad65d 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json
@@ -30,6 +30,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -38,6 +39,8 @@
"-fsanitize=kernel-address",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -83,6 +86,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -91,6 +95,8 @@
"-fsanitize=kernel-address",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -136,6 +142,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -144,6 +151,8 @@
"-fsanitize=kernel-address",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -189,6 +198,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -197,6 +207,8 @@
"-fsanitize=kernel-address",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -241,6 +253,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -250,6 +263,8 @@
"-fsanitize=fuzzer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -295,6 +310,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -305,6 +321,8 @@
"-fprofile-instr-generate",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -349,6 +367,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -357,6 +376,8 @@
"-fsanitize=address",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -401,6 +422,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -410,6 +432,8 @@
"-fprofile-instr-generate",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json
index 26f5a665..0d4aaf92 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json
@@ -39,6 +39,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -55,6 +56,8 @@
"-Wunsafe-loop-optimizations",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -99,6 +102,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -108,6 +112,8 @@
"-Wno-#warnings",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -152,6 +158,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -161,6 +168,8 @@
"-Wno-error=uninitialized",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -205,6 +214,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -214,6 +224,8 @@
"-Wno-error=unused-variable",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -258,6 +270,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -267,6 +280,8 @@
"-Wno-unused-variable",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -311,6 +326,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -320,6 +336,8 @@
"-Wunused-variable",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -364,6 +382,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -373,6 +392,8 @@
"-someflag",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_sysroot_wrapper_common.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_sysroot_wrapper_common.json
index 247f207c..0ef55357 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_sysroot_wrapper_common.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_sysroot_wrapper_common.json
@@ -63,6 +63,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -71,6 +72,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -117,6 +120,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -125,6 +129,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -164,12 +170,15 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -214,6 +223,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
@@ -221,6 +231,8 @@
"-D__KERNEL__",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -265,6 +277,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-D_FORTIFY_SOURCE=2",
"-mthumb",
@@ -272,6 +285,8 @@
"-D__KERNEL__",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-B../../bin",
"-target",
"armv7a-cros-linux-gnueabihf"
@@ -314,6 +329,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -323,6 +339,8 @@
"--sysroot=xyz",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json b/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json
index 219a8b2f..06e114cb 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json
@@ -43,6 +43,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -51,6 +52,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -75,6 +78,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -83,6 +87,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -137,6 +143,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -145,6 +152,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -170,6 +179,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -178,6 +188,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -234,6 +246,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -242,6 +255,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -270,6 +285,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -278,6 +294,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -335,6 +353,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -343,6 +362,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -368,6 +389,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -376,6 +398,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json b/compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json
index 10e485da..cd460a79 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json
@@ -31,6 +31,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -39,6 +40,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -85,6 +88,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -93,6 +97,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -125,6 +131,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -133,6 +140,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -183,6 +192,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -191,6 +201,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -223,6 +235,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -231,6 +244,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json b/compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json
index ea804d97..c7f619d9 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json
@@ -28,6 +28,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -36,6 +37,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -103,6 +106,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -111,6 +115,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -173,6 +179,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -181,6 +188,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -227,6 +236,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -235,6 +245,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json
index af4e3ff5..b53bcc59 100644
--- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json
@@ -37,6 +37,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -45,6 +46,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -96,6 +99,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -104,6 +108,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -158,6 +164,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -166,6 +173,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json
index 50423288..9176e9d7 100644
--- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json
@@ -27,6 +27,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -35,6 +36,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -75,6 +78,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -83,6 +87,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -123,6 +129,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -131,6 +138,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -171,6 +180,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -179,6 +189,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -226,6 +238,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -236,6 +249,8 @@
"--gcc-toolchain=/usr",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -287,6 +302,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -297,6 +313,8 @@
"--gcc-toolchain=/usr",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -347,6 +365,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -357,6 +376,8 @@
"--gcc-toolchain=/usr",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -397,6 +418,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -405,6 +427,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -442,6 +466,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -450,6 +475,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-Ba/b/bin",
"-target",
@@ -487,6 +514,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -495,6 +523,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-Ba/b/bin",
"-target",
@@ -532,6 +562,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -540,6 +571,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -580,6 +613,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -588,6 +622,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json
index 219a8b2f..06e114cb 100644
--- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json
@@ -43,6 +43,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -51,6 +52,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -75,6 +78,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -83,6 +87,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -137,6 +143,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -145,6 +152,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -170,6 +179,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -178,6 +188,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -234,6 +246,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -242,6 +255,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -270,6 +285,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -278,6 +294,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -335,6 +353,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -343,6 +362,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -368,6 +389,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -376,6 +398,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/force_disable_werror.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/force_disable_werror.json
index a7fa8525..a85e91ee 100644
--- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/force_disable_werror.json
+++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/force_disable_werror.json
@@ -30,6 +30,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -38,6 +39,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -78,6 +81,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -86,6 +90,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -112,6 +118,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -120,6 +127,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -164,6 +173,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -172,6 +182,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -198,6 +210,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -206,6 +219,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_clang_syntax.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_clang_syntax.json
index bafca635..fe1e9b35 100644
--- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_clang_syntax.json
+++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_clang_syntax.json
@@ -28,6 +28,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -36,6 +37,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -98,6 +101,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -106,6 +110,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -168,6 +174,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -176,6 +183,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -222,6 +231,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
@@ -230,6 +240,8 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json b/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json
index 8b03c092..b7e4de39 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json
@@ -35,9 +35,12 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -90,9 +93,12 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -148,9 +154,12 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_ftrapv_maincc_target_specific.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_ftrapv_maincc_target_specific.json
index 5d72756d..a9e8b859 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_ftrapv_maincc_target_specific.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_ftrapv_maincc_target_specific.json
@@ -26,10 +26,13 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-ftrapv",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -71,10 +74,13 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-ftrapv",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -116,10 +122,13 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-ftrapv",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -161,11 +170,14 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-mthumb",
"-ftrapv",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-B../../bin",
"-target",
"armv7m-cros-linux-gnu"
@@ -206,10 +218,13 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-ftrapv",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-B../../bin",
"-target",
"armv7m-cros-eabi"
@@ -250,11 +265,14 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-mthumb",
"-ftrapv",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-B../../bin",
"-target",
"armv7m-cros-win-gnu"
@@ -295,11 +313,14 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-mthumb",
"-ftrapv",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-B../../bin",
"-target",
"armv8m-cros-linux-gnu"
@@ -340,10 +361,13 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-ftrapv",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-B../../bin",
"-target",
"armv8m-cros-eabi"
@@ -384,11 +408,14 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-mthumb",
"-ftrapv",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-B../../bin",
"-target",
"armv8m-cros-win-gnu"
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_maincc_target_specific.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_maincc_target_specific.json
index 382b7097..bedbd6eb 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_maincc_target_specific.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_maincc_target_specific.json
@@ -25,9 +25,12 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -68,9 +71,12 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -111,9 +117,12 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -154,10 +163,13 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-mthumb",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-B../../bin",
"-target",
"armv7m-cros-linux-gnu"
@@ -197,9 +209,12 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-B../../bin",
"-target",
"armv7m-cros-eabi"
@@ -239,10 +254,13 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-mthumb",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-B../../bin",
"-target",
"armv7m-cros-win-gnu"
@@ -282,10 +300,13 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-mthumb",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-B../../bin",
"-target",
"armv8m-cros-linux-gnu"
@@ -325,9 +346,12 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-B../../bin",
"-target",
"armv8m-cros-eabi"
@@ -367,10 +391,13 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-mthumb",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-B../../bin",
"-target",
"armv8m-cros-win-gnu"
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json
index cadfd1fe..edd40b72 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json
@@ -25,9 +25,12 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -71,9 +74,12 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -117,9 +123,12 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -163,9 +172,12 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -216,11 +228,14 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-resource-dir=someResourceDir",
"--gcc-toolchain=/usr",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -274,11 +289,14 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-resource-dir=someResourceDir",
"--gcc-toolchain=/usr",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -327,11 +345,14 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-resource-dir=someResourceDir",
"--gcc-toolchain=/usr",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -375,9 +396,12 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -418,9 +442,12 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-Ba/b/bin",
"-target",
@@ -461,9 +488,12 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-Ba/b/bin",
"-target",
@@ -504,9 +534,12 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -550,9 +583,12 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sanitizer_args.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sanitizer_args.json
index 8786db27..e10a92b9 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sanitizer_args.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sanitizer_args.json
@@ -27,10 +27,13 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fsanitize=kernel-address",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -73,10 +76,13 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fsanitize=kernel-address",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -119,10 +125,13 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fsanitize=kernel-address",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -165,10 +174,13 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fsanitize=kernel-address",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -210,11 +222,14 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fno-experimental-new-pass-manager",
"-fsanitize=fuzzer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -257,12 +272,15 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fno-experimental-new-pass-manager",
"-fsanitize=address",
"-fprofile-instr-generate",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -304,10 +322,13 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fsanitize=address",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -349,10 +370,13 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fprofile-instr-generate",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_specific_args.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_specific_args.json
index 98ca5a67..aafdaba0 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_specific_args.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_specific_args.json
@@ -36,6 +36,7 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-mno-movbe",
"-Wclobbered",
@@ -47,6 +48,8 @@
"-Wunsafe-loop-optimizations",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -88,10 +91,13 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-Wno-#warnings",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -133,10 +139,13 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-Wno-error=uninitialized",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -178,10 +187,13 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-Wno-error=unused-variable",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -223,10 +235,13 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-Wno-unused-variable",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -268,10 +283,13 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-Wunused-variable",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -313,10 +331,13 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-someflag",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sysroot_wrapper_common.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sysroot_wrapper_common.json
index d39e2b0a..e094f911 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sysroot_wrapper_common.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sysroot_wrapper_common.json
@@ -56,9 +56,12 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -102,9 +105,12 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -141,9 +147,12 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -185,11 +194,14 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fno-stack-protector",
"-D__KERNEL__",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -231,12 +243,15 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-mthumb",
"-fno-stack-protector",
"-D__KERNEL__",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-B../../bin",
"-target",
"armv7a-cros-linux-gnueabihf"
@@ -276,10 +291,13 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"--sysroot=xyz",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json
index ce9659a2..4e6ec630 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json
@@ -40,9 +40,12 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -64,9 +67,12 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -118,9 +124,12 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -143,9 +152,12 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -199,9 +211,12 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -227,9 +242,12 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -284,9 +302,12 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -309,9 +330,12 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/force_disable_werror.json b/compiler_wrapper/testdata/cros_nonhardened_golden/force_disable_werror.json
index 61bff7d7..ef266efa 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/force_disable_werror.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/force_disable_werror.json
@@ -28,9 +28,12 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -74,9 +77,12 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -106,9 +112,12 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -156,9 +165,12 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -188,9 +200,12 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_clang_syntax.json b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_clang_syntax.json
index 244e8fad..9ea1c01d 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_clang_syntax.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_clang_syntax.json
@@ -25,9 +25,12 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -88,9 +91,12 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -146,9 +152,12 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -192,9 +201,12 @@
"-Wno-final-dtor-non-final-class",
"-Werror=poison-system-directories",
"-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",