aboutsummaryrefslogtreecommitdiff
path: root/compiler_wrapper/testdata/cros_nonhardened_golden
diff options
context:
space:
mode:
Diffstat (limited to 'compiler_wrapper/testdata/cros_nonhardened_golden')
-rw-r--r--compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json54
-rw-r--r--compiler_wrapper/testdata/cros_nonhardened_golden/clang_ftrapv_maincc_target_specific.json162
-rw-r--r--compiler_wrapper/testdata/cros_nonhardened_golden/clang_maincc_target_specific.json162
-rw-r--r--compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json216
-rw-r--r--compiler_wrapper/testdata/cros_nonhardened_golden/clang_sanitizer_args.json144
-rw-r--r--compiler_wrapper/testdata/cros_nonhardened_golden/clang_specific_args.json72
-rw-r--r--compiler_wrapper/testdata/cros_nonhardened_golden/clang_sysroot_wrapper_common.json109
-rw-r--r--compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json144
-rw-r--r--compiler_wrapper/testdata/cros_nonhardened_golden/force_disable_werror.json90
-rw-r--r--compiler_wrapper/testdata/cros_nonhardened_golden/gcc_clang_syntax.json72
-rw-r--r--compiler_wrapper/testdata/cros_nonhardened_golden/gcc_sysroot_wrapper_common.json1
11 files changed, 682 insertions, 544 deletions
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json b/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json
index 6c46fee8..96fd88cf 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json
@@ -27,26 +27,28 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -91,26 +93,28 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -158,26 +162,28 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-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 86960cc9..35f90b1e 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
@@ -18,27 +18,29 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"-ftrapv",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -72,27 +74,29 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-eabi",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-eabi-",
"-ftrapv",
"main.cc",
"-L/usr/x86_64-cros-eabi/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -126,27 +130,29 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-win-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-win-gnu-",
"-ftrapv",
"main.cc",
"-L/usr/x86_64-cros-win-gnu/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -180,16 +186,18 @@
"../../usr/bin/clang",
"--sysroot=/usr/armv7m-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"-mthumb",
@@ -197,11 +205,11 @@
"-ftrapv",
"main.cc",
"-L/usr/armv7m-cros-linux-gnu/usr/lib",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-B../../bin",
"-target",
"armv7m-cros-linux-gnu"
@@ -234,27 +242,29 @@
"../../usr/bin/clang",
"--sysroot=/usr/armv7m-cros-eabi",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/armv7m-cros-eabi-",
"-ftrapv",
"main.cc",
"-L/usr/armv7m-cros-eabi/usr/lib",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-B../../bin",
"-target",
"armv7m-cros-eabi"
@@ -287,16 +297,18 @@
"../../usr/bin/clang",
"--sysroot=/usr/armv7m-cros-win-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"-mthumb",
@@ -304,11 +316,11 @@
"-ftrapv",
"main.cc",
"-L/usr/armv7m-cros-win-gnu/usr/lib",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-B../../bin",
"-target",
"armv7m-cros-win-gnu"
@@ -341,16 +353,18 @@
"../../usr/bin/clang",
"--sysroot=/usr/armv8m-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"-mthumb",
@@ -358,11 +372,11 @@
"-ftrapv",
"main.cc",
"-L/usr/armv8m-cros-linux-gnu/usr/lib",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-B../../bin",
"-target",
"armv8m-cros-linux-gnu"
@@ -395,27 +409,29 @@
"../../usr/bin/clang",
"--sysroot=/usr/armv8m-cros-eabi",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/armv8m-cros-eabi-",
"-ftrapv",
"main.cc",
"-L/usr/armv8m-cros-eabi/usr/lib",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-B../../bin",
"-target",
"armv8m-cros-eabi"
@@ -448,16 +464,18 @@
"../../usr/bin/clang",
"--sysroot=/usr/armv8m-cros-win-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"-mthumb",
@@ -465,11 +483,11 @@
"-ftrapv",
"main.cc",
"-L/usr/armv8m-cros-win-gnu/usr/lib",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-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 69af166d..e2479e9b 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
@@ -17,26 +17,28 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -69,26 +71,28 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-eabi",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-eabi-",
"main.cc",
"-L/usr/x86_64-cros-eabi/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -121,26 +125,28 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-win-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-win-gnu-",
"main.cc",
"-L/usr/x86_64-cros-win-gnu/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -173,27 +179,29 @@
"../../usr/bin/clang",
"--sysroot=/usr/armv7m-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"-mthumb",
"--prefix=../../bin/armv7m-cros-linux-gnu-",
"main.cc",
"-L/usr/armv7m-cros-linux-gnu/usr/lib",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-B../../bin",
"-target",
"armv7m-cros-linux-gnu"
@@ -225,26 +233,28 @@
"../../usr/bin/clang",
"--sysroot=/usr/armv7m-cros-eabi",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/armv7m-cros-eabi-",
"main.cc",
"-L/usr/armv7m-cros-eabi/usr/lib",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-B../../bin",
"-target",
"armv7m-cros-eabi"
@@ -276,27 +286,29 @@
"../../usr/bin/clang",
"--sysroot=/usr/armv7m-cros-win-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"-mthumb",
"--prefix=../../bin/armv7m-cros-win-gnu-",
"main.cc",
"-L/usr/armv7m-cros-win-gnu/usr/lib",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-B../../bin",
"-target",
"armv7m-cros-win-gnu"
@@ -328,27 +340,29 @@
"../../usr/bin/clang",
"--sysroot=/usr/armv8m-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"-mthumb",
"--prefix=../../bin/armv8m-cros-linux-gnu-",
"main.cc",
"-L/usr/armv8m-cros-linux-gnu/usr/lib",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-B../../bin",
"-target",
"armv8m-cros-linux-gnu"
@@ -380,26 +394,28 @@
"../../usr/bin/clang",
"--sysroot=/usr/armv8m-cros-eabi",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/armv8m-cros-eabi-",
"main.cc",
"-L/usr/armv8m-cros-eabi/usr/lib",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-B../../bin",
"-target",
"armv8m-cros-eabi"
@@ -431,27 +447,29 @@
"../../usr/bin/clang",
"--sysroot=/usr/armv8m-cros-win-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"-mthumb",
"--prefix=../../bin/armv8m-cros-win-gnu-",
"main.cc",
"-L/usr/armv8m-cros-win-gnu/usr/lib",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-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 afc79511..11c566b6 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json
@@ -17,26 +17,28 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -72,26 +74,28 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -127,26 +131,28 @@
"../../usr/bin/clang++",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -182,26 +188,28 @@
"somepath/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -244,16 +252,18 @@
"/somedir/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
@@ -261,11 +271,11 @@
"--gcc-toolchain=/usr",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -311,16 +321,18 @@
"/somedir/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
@@ -328,11 +340,11 @@
"--gcc-toolchain=/usr",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -373,16 +385,18 @@
"/somedir/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
@@ -390,11 +404,11 @@
"--gcc-toolchain=/usr",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -430,26 +444,28 @@
"/usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -482,26 +498,28 @@
"a/b/c/d/e/usr/bin/clang",
"--sysroot=/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=a/b/c/d/e/bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-Ba/b/c/d/e/bin",
"-target",
@@ -534,26 +552,28 @@
"a/b/c/d/e/usr/bin/clang",
"--sysroot=/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=a/b/c/d/e/bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-Ba/b/c/d/e/bin",
"-target",
@@ -586,26 +606,28 @@
"../usr/bin/clang",
"--sysroot=/tmp/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/tmp/usr/x86_64-cros-linux-gnu/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../bin",
"-target",
@@ -641,26 +663,28 @@
"/tmp/usr/bin/clang",
"--sysroot=/tmp/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/tmp/usr/x86_64-cros-linux-gnu/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-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 3e140d59..fe0df74d 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sanitizer_args.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sanitizer_args.json
@@ -19,27 +19,29 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"-fsanitize=kernel-address",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -74,27 +76,29 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"-fsanitize=kernel-address",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -129,27 +133,29 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"-fsanitize=kernel-address",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -184,27 +190,29 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"-fsanitize=kernel-address",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -238,27 +246,29 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"-fsanitize=fuzzer",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -293,16 +303,18 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
@@ -310,11 +322,11 @@
"-fprofile-instr-generate",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -348,27 +360,29 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"-fsanitize=address",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -402,27 +416,29 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"-fprofile-instr-generate",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-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 fbe038e7..b744e8c6 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_specific_args.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_specific_args.json
@@ -27,16 +27,18 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
@@ -50,11 +52,11 @@
"-Wunsafe-loop-optimizations",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -88,27 +90,29 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"-Wno-#warnings",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -142,27 +146,29 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"-Wno-error=uninitialized",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -196,27 +202,29 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"-someflag",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-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 f2ccadb9..ed3a6ef1 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
@@ -50,26 +50,28 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -105,26 +107,28 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -153,26 +157,29 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
+ "-nopie",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -206,16 +213,18 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"-fno-stack-protector",
@@ -223,11 +232,11 @@
"-D__KERNEL__",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -261,16 +270,18 @@
"../../usr/bin/clang",
"--sysroot=/usr/armv7a-cros-linux-gnueabihf",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"-mthumb",
@@ -279,11 +290,11 @@
"-D__KERNEL__",
"main.cc",
"-L/usr/armv7a-cros-linux-gnueabihf/usr/lib",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-B../../bin",
"-target",
"armv7a-cros-linux-gnueabihf"
@@ -315,27 +326,29 @@
"args": [
"../../usr/bin/clang",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"--sysroot=xyz",
"main.cc",
"-Lxyz/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-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 dc641c96..830abee6 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json
@@ -32,26 +32,28 @@
"-resource-dir=someResourceDir",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -65,26 +67,28 @@
"args": [
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -128,26 +132,28 @@
"-resource-dir=someResourceDir",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -162,26 +168,28 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -227,26 +235,28 @@
"-resource-dir=someResourceDir",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -264,26 +274,28 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -330,26 +342,28 @@
"-resource-dir=someResourceDir",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -364,26 +378,28 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-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 54b994cc..07c20900 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/force_disable_werror.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/force_disable_werror.json
@@ -20,26 +20,28 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -75,26 +77,28 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -116,26 +120,28 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -175,26 +181,28 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -216,26 +224,28 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-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 5234715d..9dd5687b 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_clang_syntax.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_clang_syntax.json
@@ -17,26 +17,28 @@
"args": [
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -91,26 +93,28 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -160,26 +164,28 @@
"args": [
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -215,26 +221,28 @@
"args": [
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-fdebug-default-version=5",
+ "-Werror=poison-system-directories",
+ "-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-declarations",
+ "-Wno-error=implicit-function-declaration",
+ "-Wno-error=implicit-int",
+ "-Wno-final-dtor-non-final-class",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
- "-Wno-section",
- "-Wno-final-dtor-non-final-class",
- "-Werror=poison-system-directories",
+ "-fdebug-default-version=5",
"-fexperimental-new-pass-manager",
- "-Wno-compound-token-split-by-macro",
- "-Wno-deprecated-declarations",
+ "-Wno-section",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
- "-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
- "-Wno-string-concatenation",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
+ "-Wno-implicit-int-float-conversion",
+ "-Wno-string-concatenation",
"-mno-movbe",
"-B../../bin",
"-target",
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_sysroot_wrapper_common.json b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_sysroot_wrapper_common.json
index ba2f292c..25411f20 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_sysroot_wrapper_common.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_sysroot_wrapper_common.json
@@ -122,6 +122,7 @@
"-Wno-deprecated-declarations",
"-Wtrampolines",
"-static-libgcc",
+ "-nopie",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-mno-movbe"