diff options
6 files changed, 68 insertions, 1 deletions
diff --git a/compiler_wrapper/cros_llvm_next_flags.go b/compiler_wrapper/cros_llvm_next_flags.go index ef4b828d..f5823fbf 100644 --- a/compiler_wrapper/cros_llvm_next_flags.go +++ b/compiler_wrapper/cros_llvm_next_flags.go @@ -13,8 +13,11 @@ package main // tag is set. // TODO: Enable test in config_test.go, once we have new llvm-next flags. -var llvmNextFlags = []string{} +var llvmNextFlags = []string{ + "-Wno-compound-token-split-by-macro", +} var llvmNextPostFlags = []string{ "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation", } diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json index 2648ce08..b8e0e462 100644 --- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json +++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_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", @@ -47,6 +48,7 @@ "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -102,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", @@ -111,6 +114,7 @@ "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -169,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", @@ -178,6 +183,7 @@ "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_llvmnext_golden/clang_path.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json index d7d500c1..9780356e 100644 --- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json +++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_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", @@ -37,6 +38,7 @@ "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -83,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", @@ -92,6 +95,7 @@ "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -138,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", @@ -147,6 +152,7 @@ "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -193,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", @@ -202,6 +209,7 @@ "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -255,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", @@ -266,6 +275,7 @@ "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -322,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", @@ -333,6 +344,7 @@ "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -384,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", @@ -395,6 +408,7 @@ "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -441,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", @@ -450,6 +465,7 @@ "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -493,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", @@ -502,6 +519,7 @@ "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation", "-mno-movbe", "-Ba/b/bin", "-target", @@ -545,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", @@ -554,6 +573,7 @@ "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation", "-mno-movbe", "-Ba/b/bin", "-target", @@ -597,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", @@ -606,6 +627,7 @@ "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -652,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", @@ -661,6 +684,7 @@ "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_llvmnext_golden/clangtidy.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json index b0526836..06e114cb 100644 --- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json +++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_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", @@ -52,6 +53,7 @@ "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -76,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", @@ -85,6 +88,7 @@ "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -139,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", @@ -148,6 +153,7 @@ "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", @@ -182,6 +189,7 @@ "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -238,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", @@ -247,6 +256,7 @@ "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -275,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", @@ -284,6 +295,7 @@ "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -341,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", @@ -350,6 +363,7 @@ "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -375,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", @@ -384,6 +399,7 @@ "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_llvmnext_golden/force_disable_werror.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/force_disable_werror.json index 670a361a..cd460a79 100644 --- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/force_disable_werror.json +++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/force_disable_werror.json @@ -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", @@ -40,6 +41,7 @@ "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -86,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", @@ -95,6 +98,7 @@ "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -127,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", @@ -136,6 +141,7 @@ "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -186,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", @@ -195,6 +202,7 @@ "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -227,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", @@ -236,6 +245,7 @@ "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_llvmnext_golden/gcc_clang_syntax.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_clang_syntax.json index 20e9746f..c7f619d9 100644 --- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_clang_syntax.json +++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_clang_syntax.json @@ -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", @@ -37,6 +38,7 @@ "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -104,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", @@ -113,6 +116,7 @@ "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -175,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", @@ -184,6 +189,7 @@ "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", @@ -230,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", @@ -239,6 +246,7 @@ "main.cc", "-Wno-implicit-int-float-conversion", "-Wno-compound-token-split-by-space", + "-Wno-string-concatenation", "-mno-movbe", "-B../../bin", "-target", |