aboutsummaryrefslogtreecommitdiff
path: root/compiler_wrapper/testdata/cros_hardened_golden
diff options
context:
space:
mode:
Diffstat (limited to 'compiler_wrapper/testdata/cros_hardened_golden')
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/bisect.json36
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/clang_ftrapv_maincc_target_specific.json108
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/clang_maincc_target_specific.json108
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/clang_path.json145
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json82
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json48
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/clang_sysroot_wrapper_common.json74
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json96
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json63
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json54
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/gcc_maincc_target_specific.json18
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/gcc_path.json12
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/gcc_sanitizer_args.json16
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/gcc_specific_args.json6
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/gcc_sysroot_wrapper_common.json14
15 files changed, 713 insertions, 167 deletions
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_golden/bisect.json
index 8bd823ed..b4cdd8d2 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/bisect.json
@@ -26,36 +26,44 @@
"/usr/bin/ccache",
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -99,36 +107,44 @@
"/usr/bin/ccache",
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -175,36 +191,44 @@
"/usr/bin/ccache",
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../../bin",
"-target",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_ftrapv_maincc_target_specific.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_ftrapv_maincc_target_specific.json
index 56f78efa..83d7a8df 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_ftrapv_maincc_target_specific.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_ftrapv_maincc_target_specific.json
@@ -17,37 +17,45 @@
"args": [
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"-ftrapv",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -80,37 +88,45 @@
"args": [
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-eabi",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-eabi-",
"-ftrapv",
"main.cc",
"-L/usr/x86_64-cros-eabi/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -143,37 +159,45 @@
"args": [
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-win-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-win-gnu-",
"-ftrapv",
"main.cc",
"-L/usr/x86_64-cros-win-gnu/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -206,37 +230,45 @@
"args": [
"../../usr/bin/clang",
"--sysroot=/usr/armv7m-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-static-libgcc",
"-mthumb",
"--prefix=../../bin/armv7m-cros-linux-gnu-",
"-ftrapv",
"main.cc",
"-L/usr/armv7m-cros-linux-gnu/usr/lib",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-B../../bin",
"-target",
"armv7m-cros-linux-gnu"
@@ -268,37 +300,45 @@
"args": [
"../../usr/bin/clang",
"--sysroot=/usr/armv7m-cros-eabi",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"--prefix=../../bin/armv7m-cros-eabi-",
"-ftrapv",
"main.cc",
"-L/usr/armv7m-cros-eabi/usr/lib",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-B../../bin",
"-target",
"armv7m-cros-eabi"
@@ -330,37 +370,45 @@
"args": [
"../../usr/bin/clang",
"--sysroot=/usr/armv7m-cros-win-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-static-libgcc",
"-mthumb",
"--prefix=../../bin/armv7m-cros-win-gnu-",
"-ftrapv",
"main.cc",
"-L/usr/armv7m-cros-win-gnu/usr/lib",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-B../../bin",
"-target",
"armv7m-cros-win-gnu"
@@ -392,37 +440,45 @@
"args": [
"../../usr/bin/clang",
"--sysroot=/usr/armv8m-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-static-libgcc",
"-mthumb",
"--prefix=../../bin/armv8m-cros-linux-gnu-",
"-ftrapv",
"main.cc",
"-L/usr/armv8m-cros-linux-gnu/usr/lib",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-B../../bin",
"-target",
"armv8m-cros-linux-gnu"
@@ -454,37 +510,45 @@
"args": [
"../../usr/bin/clang",
"--sysroot=/usr/armv8m-cros-eabi",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"--prefix=../../bin/armv8m-cros-eabi-",
"-ftrapv",
"main.cc",
"-L/usr/armv8m-cros-eabi/usr/lib",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-B../../bin",
"-target",
"armv8m-cros-eabi"
@@ -516,37 +580,45 @@
"args": [
"../../usr/bin/clang",
"--sysroot=/usr/armv8m-cros-win-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-static-libgcc",
"-mthumb",
"--prefix=../../bin/armv8m-cros-win-gnu-",
"-ftrapv",
"main.cc",
"-L/usr/armv8m-cros-win-gnu/usr/lib",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-B../../bin",
"-target",
"armv8m-cros-win-gnu"
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_maincc_target_specific.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_maincc_target_specific.json
index db2f59aa..d072960a 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_maincc_target_specific.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_maincc_target_specific.json
@@ -16,36 +16,44 @@
"args": [
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -77,36 +85,44 @@
"args": [
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-eabi",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-eabi-",
"main.cc",
"-L/usr/x86_64-cros-eabi/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -138,36 +154,44 @@
"args": [
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-win-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-win-gnu-",
"main.cc",
"-L/usr/x86_64-cros-win-gnu/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -199,36 +223,44 @@
"args": [
"../../usr/bin/clang",
"--sysroot=/usr/armv7m-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-static-libgcc",
"-mthumb",
"--prefix=../../bin/armv7m-cros-linux-gnu-",
"main.cc",
"-L/usr/armv7m-cros-linux-gnu/usr/lib",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-B../../bin",
"-target",
"armv7m-cros-linux-gnu"
@@ -259,36 +291,44 @@
"args": [
"../../usr/bin/clang",
"--sysroot=/usr/armv7m-cros-eabi",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"--prefix=../../bin/armv7m-cros-eabi-",
"main.cc",
"-L/usr/armv7m-cros-eabi/usr/lib",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-B../../bin",
"-target",
"armv7m-cros-eabi"
@@ -319,36 +359,44 @@
"args": [
"../../usr/bin/clang",
"--sysroot=/usr/armv7m-cros-win-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-static-libgcc",
"-mthumb",
"--prefix=../../bin/armv7m-cros-win-gnu-",
"main.cc",
"-L/usr/armv7m-cros-win-gnu/usr/lib",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-B../../bin",
"-target",
"armv7m-cros-win-gnu"
@@ -379,36 +427,44 @@
"args": [
"../../usr/bin/clang",
"--sysroot=/usr/armv8m-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-static-libgcc",
"-mthumb",
"--prefix=../../bin/armv8m-cros-linux-gnu-",
"main.cc",
"-L/usr/armv8m-cros-linux-gnu/usr/lib",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-B../../bin",
"-target",
"armv8m-cros-linux-gnu"
@@ -439,36 +495,44 @@
"args": [
"../../usr/bin/clang",
"--sysroot=/usr/armv8m-cros-eabi",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"--prefix=../../bin/armv8m-cros-eabi-",
"main.cc",
"-L/usr/armv8m-cros-eabi/usr/lib",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-B../../bin",
"-target",
"armv8m-cros-eabi"
@@ -499,36 +563,44 @@
"args": [
"../../usr/bin/clang",
"--sysroot=/usr/armv8m-cros-win-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-static-libgcc",
"-mthumb",
"--prefix=../../bin/armv8m-cros-win-gnu-",
"main.cc",
"-L/usr/armv8m-cros-win-gnu/usr/lib",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-B../../bin",
"-target",
"armv8m-cros-win-gnu"
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json
index 186a16ed..fc120977 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json
@@ -16,36 +16,44 @@
"args": [
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -80,36 +88,44 @@
"args": [
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -144,36 +160,45 @@
"args": [
"../../usr/bin/clang++",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
+ "-std=gnu++14",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -208,36 +233,44 @@
"args": [
"somepath/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -279,26 +312,32 @@
"args": [
"/somedir/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
@@ -306,11 +345,13 @@
"--gcc-toolchain=/usr",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -355,26 +396,32 @@
"args": [
"/somedir/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
@@ -382,11 +429,13 @@
"--gcc-toolchain=/usr",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -426,26 +475,32 @@
"args": [
"/somedir/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
@@ -453,11 +508,13 @@
"--gcc-toolchain=/usr",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -492,36 +549,44 @@
"args": [
"/usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -553,36 +618,44 @@
"args": [
"a/b/c/d/e/usr/bin/clang",
"--sysroot=/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-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-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-Ba/b/c/d/e/bin",
"-target",
@@ -614,36 +687,44 @@
"args": [
"a/b/c/d/e/usr/bin/clang",
"--sysroot=/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-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-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-Ba/b/c/d/e/bin",
"-target",
@@ -675,36 +756,44 @@
"args": [
"../usr/bin/clang",
"--sysroot=/tmp/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"--prefix=../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/tmp/usr/x86_64-cros-linux-gnu/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../bin",
"-target",
@@ -739,36 +828,44 @@
"args": [
"/tmp/usr/bin/clang",
"--sysroot=/tmp/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"--prefix=../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/tmp/usr/x86_64-cros-linux-gnu/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../bin",
"-target",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json
index 6a38e845..0c9376cd 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json
@@ -21,19 +21,25 @@
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
@@ -43,11 +49,13 @@
"-fsanitize=kernel-address",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -84,19 +92,25 @@
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
@@ -106,11 +120,13 @@
"-fsanitize=kernel-address",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -147,19 +163,25 @@
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
@@ -169,11 +191,13 @@
"-fsanitize=kernel-address",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -210,19 +234,25 @@
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
@@ -232,11 +262,13 @@
"-fsanitize=kernel-address",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -272,19 +304,25 @@
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
@@ -294,11 +332,13 @@
"-fsanitize=fuzzer",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -335,19 +375,25 @@
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
@@ -358,11 +404,13 @@
"-fprofile-instr-generate",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -398,19 +446,25 @@
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
@@ -420,11 +474,13 @@
"-fsanitize=address",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -457,37 +513,45 @@
"args": [
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"-fprofile-instr-generate",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../../bin",
"-target",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json
index ec91216d..d7f73998 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json
@@ -26,26 +26,32 @@
"args": [
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
@@ -59,11 +65,13 @@
"-Wunsafe-loop-optimizations",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -96,37 +104,45 @@
"args": [
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"-Wno-#warnings",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -159,37 +175,45 @@
"args": [
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"-Wno-error=uninitialized",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -222,37 +246,45 @@
"args": [
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"-someflag",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../../bin",
"-target",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_sysroot_wrapper_common.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_sysroot_wrapper_common.json
index 0ad97b7a..537fc89c 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_sysroot_wrapper_common.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_sysroot_wrapper_common.json
@@ -16,12 +16,12 @@
"path": "./x86_64-cros-linux-gnu-gcc.real",
"args": [
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"main.cc",
@@ -52,36 +52,44 @@
"args": [
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -116,36 +124,44 @@
"args": [
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -173,37 +189,45 @@
"args": [
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"-nopie",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -236,25 +260,31 @@
"args": [
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"-fno-stack-protector",
@@ -262,11 +292,13 @@
"-D__KERNEL__",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -299,25 +331,31 @@
"args": [
"../../usr/bin/clang",
"--sysroot=/usr/armv7a-cros-linux-gnueabihf",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
- "-D_FORTIFY_SOURCE=2",
"-static-libgcc",
"-mthumb",
"-fno-stack-protector",
@@ -325,11 +363,13 @@
"-D__KERNEL__",
"main.cc",
"-L/usr/armv7a-cros-linux-gnueabihf/usr/lib",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-B../../bin",
"-target",
"armv7a-cros-linux-gnueabihf"
@@ -360,37 +400,45 @@
"path": "/usr/bin/ccache",
"args": [
"../../usr/bin/clang",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"--sysroot=xyz",
"main.cc",
"-Lxyz/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../../bin",
"-target",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json b/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json
index f7438940..5d88fec8 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json
@@ -31,36 +31,44 @@
"--",
"-resource-dir=someResourceDir",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -73,36 +81,44 @@
"path": "../../usr/bin/clang",
"args": [
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -145,36 +161,44 @@
"--",
"-resource-dir=someResourceDir",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -188,36 +212,44 @@
"args": [
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -262,36 +294,44 @@
"--",
"-resource-dir=someResourceDir",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -308,36 +348,44 @@
"args": [
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -383,36 +431,44 @@
"--",
"-resource-dir=someResourceDir",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -426,36 +482,44 @@
"args": [
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../../bin",
"-target",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json b/compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json
index 9cd72611..3d1e305e 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json
@@ -19,36 +19,44 @@
"args": [
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -74,7 +82,8 @@
"args": [
"main.cc"
]
- }
+ },
+ "stdout": "$CROS_ARTIFACTS_TMP_DIR is not set, artifacts will be written to /tmp"
},
"cmds": [
{
@@ -83,36 +92,44 @@
"args": [
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -133,36 +150,44 @@
"args": [
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -201,36 +226,44 @@
"args": [
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -251,36 +284,44 @@
"args": [
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../../bin",
"-target",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json b/compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json
index d9b532f0..9d17797a 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json
@@ -16,36 +16,44 @@
"path": "../../usr/bin/clang",
"args": [
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -61,12 +69,12 @@
"args": [
"./x86_64-cros-linux-gnu-gcc.real",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"main.cc",
@@ -102,36 +110,44 @@
"args": [
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -147,12 +163,12 @@
"args": [
"./x86_64-cros-linux-gnu-gcc.real",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"main.cc",
@@ -183,36 +199,44 @@
"path": "../../usr/bin/clang",
"args": [
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -247,36 +271,44 @@
"path": "../../usr/bin/clang",
"args": [
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
+ "-Wno-deprecated-builtins",
"-Wno-deprecated-declarations",
+ "-Wno-enum-constexpr-conversion",
"-Wno-error=implicit-function-declaration",
"-Wno-error=implicit-int",
"-Wno-final-dtor-non-final-class",
+ "-Wno-single-bit-bitfield-constant-conversion",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-fdebug-default-version=5",
- "-fexperimental-new-pass-manager",
+ "-Wno-int-conversion",
+ "-Wno-incompatible-function-pointer-types",
+ "-D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES",
"--unwindlib=libunwind",
"-Wno-section",
"-fno-addrsig",
"-fuse-ld=lld",
+ "-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-L/usr/x86_64-cros-linux-gnu/usr/lib64",
+ "-Wno-array-parameter",
"-Wno-compound-token-split-by-space",
"-Wno-deprecated-copy",
"-Wno-unused-but-set-variable",
"-Wno-implicit-int-float-conversion",
"-Wno-string-concatenation",
+ "-Wno-gnu-offsetof-extensions",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -292,12 +324,12 @@
"args": [
"./x86_64-cros-linux-gnu-gcc.real",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"main.cc",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/gcc_maincc_target_specific.json b/compiler_wrapper/testdata/cros_hardened_golden/gcc_maincc_target_specific.json
index 63b7da18..86745dc6 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/gcc_maincc_target_specific.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/gcc_maincc_target_specific.json
@@ -16,12 +16,12 @@
"args": [
"./x86_64-cros-linux-gnu-gcc.real",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"main.cc",
@@ -53,12 +53,12 @@
"args": [
"./x86_64-cros-eabi-gcc.real",
"--sysroot=/usr/x86_64-cros-eabi",
+ "-D_FORTIFY_SOURCE=2",
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"main.cc",
@@ -90,12 +90,12 @@
"args": [
"./x86_64-cros-win-gnu-gcc.real",
"--sysroot=/usr/x86_64-cros-win-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"main.cc",
@@ -127,12 +127,12 @@
"args": [
"./armv7m-cros-linux-gnu-gcc.real",
"--sysroot=/usr/armv7m-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-static-libgcc",
"-mthumb",
"main.cc",
@@ -163,12 +163,12 @@
"args": [
"./armv7m-cros-eabi-gcc.real",
"--sysroot=/usr/armv7m-cros-eabi",
+ "-D_FORTIFY_SOURCE=2",
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"main.cc",
@@ -199,12 +199,12 @@
"args": [
"./armv7m-cros-win-gnu-gcc.real",
"--sysroot=/usr/armv7m-cros-win-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-static-libgcc",
"-mthumb",
"main.cc",
@@ -235,12 +235,12 @@
"args": [
"./armv8m-cros-linux-gnu-gcc.real",
"--sysroot=/usr/armv8m-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-static-libgcc",
"-mthumb",
"main.cc",
@@ -271,12 +271,12 @@
"args": [
"./armv8m-cros-eabi-gcc.real",
"--sysroot=/usr/armv8m-cros-eabi",
+ "-D_FORTIFY_SOURCE=2",
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"main.cc",
@@ -307,12 +307,12 @@
"args": [
"./armv8m-cros-win-gnu-gcc.real",
"--sysroot=/usr/armv8m-cros-win-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-static-libgcc",
"-mthumb",
"main.cc",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/gcc_path.json b/compiler_wrapper/testdata/cros_hardened_golden/gcc_path.json
index 6e06ce18..b6f3d1d9 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/gcc_path.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/gcc_path.json
@@ -16,12 +16,12 @@
"args": [
"./x86_64-cros-linux-gnu-gcc.real",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"main.cc",
@@ -56,12 +56,12 @@
"args": [
"./x86_64-cros-linux-gnu-gcc.real",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"main.cc",
@@ -96,12 +96,12 @@
"args": [
"/tmp/stable/x86_64-cros-linux-gnu-gcc.real",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"main.cc",
@@ -133,12 +133,12 @@
"args": [
"./a/b/c/d/e/f/g/x86_64-cros-linux-gnu-gcc.real",
"--sysroot=/tmp/stable/a/b/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"main.cc",
@@ -170,12 +170,12 @@
"args": [
"./symlinked/x86_64-cros-linux-gnu-gcc.real",
"--sysroot=/tmp/stable/a/b/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"main.cc",
@@ -210,12 +210,12 @@
"args": [
"/tmp/stable/pathenv/x86_64-cros-linux-gnu-gcc.real",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"main.cc",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/gcc_sanitizer_args.json b/compiler_wrapper/testdata/cros_hardened_golden/gcc_sanitizer_args.json
index 9aaf9c25..0552bf7c 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/gcc_sanitizer_args.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/gcc_sanitizer_args.json
@@ -18,12 +18,12 @@
"args": [
"./x86_64-cros-linux-gnu-gcc.real",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"-fsanitize=kernel-address",
@@ -58,12 +58,12 @@
"args": [
"./x86_64-cros-linux-gnu-gcc.real",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"-fsanitize=kernel-address",
@@ -98,12 +98,12 @@
"args": [
"./x86_64-cros-linux-gnu-gcc.real",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"-fsanitize=kernel-address",
@@ -138,12 +138,12 @@
"args": [
"./x86_64-cros-linux-gnu-gcc.real",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"-fsanitize=kernel-address",
@@ -177,12 +177,12 @@
"args": [
"./x86_64-cros-linux-gnu-gcc.real",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"-fsanitize=fuzzer",
@@ -217,12 +217,12 @@
"args": [
"./x86_64-cros-linux-gnu-gcc.real",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"-fsanitize=address",
@@ -257,12 +257,12 @@
"args": [
"./x86_64-cros-linux-gnu-gcc.real",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"-fsanitize=address",
@@ -296,12 +296,12 @@
"args": [
"./x86_64-cros-linux-gnu-gcc.real",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"-fprofile-instr-generate",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/gcc_specific_args.json b/compiler_wrapper/testdata/cros_hardened_golden/gcc_specific_args.json
index 4ee90cbc..52c9f2cc 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/gcc_specific_args.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/gcc_specific_args.json
@@ -17,12 +17,12 @@
"args": [
"./x86_64-cros-linux-gnu-gcc.real",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"-march=goldmont",
@@ -56,12 +56,12 @@
"args": [
"./x86_64-cros-linux-gnu-gcc.real",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"-march=goldmont-plus",
@@ -95,12 +95,12 @@
"args": [
"./x86_64-cros-linux-gnu-gcc.real",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"-march=skylake",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/gcc_sysroot_wrapper_common.json b/compiler_wrapper/testdata/cros_hardened_golden/gcc_sysroot_wrapper_common.json
index 9397333d..8b28e6e2 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/gcc_sysroot_wrapper_common.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/gcc_sysroot_wrapper_common.json
@@ -16,12 +16,12 @@
"path": "./x86_64-cros-linux-gnu-gcc.real",
"args": [
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"main.cc",
@@ -52,12 +52,12 @@
"args": [
"./x86_64-cros-linux-gnu-gcc.real",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"main.cc",
@@ -92,12 +92,12 @@
"args": [
"./x86_64-cros-linux-gnu-gcc.real",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"main.cc",
@@ -126,12 +126,12 @@
"args": [
"./x86_64-cros-linux-gnu-gcc.real",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"-nopie",
@@ -165,11 +165,11 @@
"args": [
"./x86_64-cros-linux-gnu-gcc.real",
"--sysroot=/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
"-fcommon",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"-fno-stack-protector",
@@ -204,11 +204,11 @@
"args": [
"./armv7a-cros-linux-gnueabihf-gcc.real",
"--sysroot=/usr/armv7a-cros-linux-gnueabihf",
+ "-D_FORTIFY_SOURCE=2",
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
"-fcommon",
- "-D_FORTIFY_SOURCE=2",
"-static-libgcc",
"-mthumb",
"-fno-stack-protector",
@@ -241,12 +241,12 @@
"path": "/usr/bin/ccache",
"args": [
"./x86_64-cros-linux-gnu-gcc.real",
+ "-D_FORTIFY_SOURCE=2",
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-static-libgcc",
"--sysroot=xyz",