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.json45
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/clang_ftrapv_maincc_target_specific.json93
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/clang_maincc_target_specific.json93
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/clang_path.json131
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json88
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json85
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/clang_sysroot_wrapper_common.json64
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json88
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json61
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json42
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/gcc_maincc_target_specific.json9
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/gcc_path.json6
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/gcc_sanitizer_args.json8
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/gcc_specific_args.json3
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/gcc_sysroot_wrapper_common.json5
15 files changed, 506 insertions, 315 deletions
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_golden/bisect.json
index b00f9740..b8e0e462 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/bisect.json
@@ -18,27 +18,28 @@
"cmd": {
"path": "/usr/bin/env",
"args": [
- "python",
+ "python3",
"-c",
- "\nimport bisect_driver\nimport shlex\nimport sys\n\ndef ExpandArgs(args, target):\n\tfor arg in args:\n\t\tif arg[0] == '@':\n\t\t\twith open(arg[1:], 'rb') as f:\n\t\t\t\tExpandArgs(shlex.split(f.read()), target)\n\t\telse:\n\t\t\ttarget.append(arg)\n\treturn target\n\nstage = sys.argv[1]\ndir = sys.argv[2]\nexecargs = ExpandArgs(sys.argv[3:], [])\n\nsys.exit(bisect_driver.bisect_driver(stage, dir, execargs))\n",
+ "\nimport bisect_driver\nimport shlex\nimport sys\n\ndef ExpandArgs(args, target):\n\tfor arg in args:\n\t\tif arg[0] == '@':\n\t\t\twith open(arg[1:], 'r', encoding='utf-8') as f:\n\t\t\t\tExpandArgs(shlex.split(f.read()), target)\n\t\telse:\n\t\t\ttarget.append(arg)\n\treturn target\n\nstage = sys.argv[1]\ndir = sys.argv[2]\nexecargs = ExpandArgs(sys.argv[3:], [])\n\nsys.exit(bisect_driver.bisect_driver(stage, dir, execargs))\n",
"someBisectStage",
"/tmp/sysroot_bisect",
"/usr/bin/ccache",
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -46,12 +47,14 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-linux-gnu"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes",
@@ -81,27 +84,28 @@
"cmd": {
"path": "/usr/bin/env",
"args": [
- "python",
+ "python3",
"-c",
- "\nimport bisect_driver\nimport shlex\nimport sys\n\ndef ExpandArgs(args, target):\n\tfor arg in args:\n\t\tif arg[0] == '@':\n\t\t\twith open(arg[1:], 'rb') as f:\n\t\t\t\tExpandArgs(shlex.split(f.read()), target)\n\t\telse:\n\t\t\ttarget.append(arg)\n\treturn target\n\nstage = sys.argv[1]\ndir = sys.argv[2]\nexecargs = ExpandArgs(sys.argv[3:], [])\n\nsys.exit(bisect_driver.bisect_driver(stage, dir, execargs))\n",
+ "\nimport bisect_driver\nimport shlex\nimport sys\n\ndef ExpandArgs(args, target):\n\tfor arg in args:\n\t\tif arg[0] == '@':\n\t\t\twith open(arg[1:], 'r', encoding='utf-8') as f:\n\t\t\t\tExpandArgs(shlex.split(f.read()), target)\n\t\telse:\n\t\t\ttarget.append(arg)\n\treturn target\n\nstage = sys.argv[1]\ndir = sys.argv[2]\nexecargs = ExpandArgs(sys.argv[3:], [])\n\nsys.exit(bisect_driver.bisect_driver(stage, dir, execargs))\n",
"someBisectStage",
"someBisectDir",
"/usr/bin/ccache",
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -109,12 +113,14 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-linux-gnu"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes",
@@ -147,27 +153,28 @@
"cmd": {
"path": "/usr/bin/env",
"args": [
- "python",
+ "python3",
"-c",
- "\nimport bisect_driver\nimport shlex\nimport sys\n\ndef ExpandArgs(args, target):\n\tfor arg in args:\n\t\tif arg[0] == '@':\n\t\t\twith open(arg[1:], 'rb') as f:\n\t\t\t\tExpandArgs(shlex.split(f.read()), target)\n\t\telse:\n\t\t\ttarget.append(arg)\n\treturn target\n\nstage = sys.argv[1]\ndir = sys.argv[2]\nexecargs = ExpandArgs(sys.argv[3:], [])\n\nsys.exit(bisect_driver.bisect_driver(stage, dir, execargs))\n",
+ "\nimport bisect_driver\nimport shlex\nimport sys\n\ndef ExpandArgs(args, target):\n\tfor arg in args:\n\t\tif arg[0] == '@':\n\t\t\twith open(arg[1:], 'r', encoding='utf-8') as f:\n\t\t\t\tExpandArgs(shlex.split(f.read()), target)\n\t\telse:\n\t\t\ttarget.append(arg)\n\treturn target\n\nstage = sys.argv[1]\ndir = sys.argv[2]\nexecargs = ExpandArgs(sys.argv[3:], [])\n\nsys.exit(bisect_driver.bisect_driver(stage, dir, execargs))\n",
"someBisectStage",
"someBisectDir",
"/usr/bin/ccache",
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -175,12 +182,14 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-linux-gnu"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes",
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 f71551be..13e97dc0 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_ftrapv_maincc_target_specific.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_ftrapv_maincc_target_specific.json
@@ -18,18 +18,19 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -38,12 +39,14 @@
"-ftrapv",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-linux-gnu"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
@@ -71,18 +74,19 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-eabi",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -91,12 +95,14 @@
"-ftrapv",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-eabi"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-eabi",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
@@ -124,18 +130,19 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-win-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -144,12 +151,14 @@
"-ftrapv",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-win-gnu"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-win-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
@@ -177,18 +186,19 @@
"../../usr/bin/clang",
"--sysroot=/usr/armv7m-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -197,12 +207,13 @@
"-ftrapv",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-B../../bin",
"-target",
"armv7m-cros-linux-gnu"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/armv7m-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
@@ -230,18 +241,19 @@
"../../usr/bin/clang",
"--sysroot=/usr/armv7m-cros-eabi",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -250,12 +262,13 @@
"-ftrapv",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-B../../bin",
"-target",
"armv7m-cros-eabi"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/armv7m-cros-eabi",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
@@ -283,18 +296,19 @@
"../../usr/bin/clang",
"--sysroot=/usr/armv7m-cros-win-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -303,12 +317,13 @@
"-ftrapv",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-B../../bin",
"-target",
"armv7m-cros-win-gnu"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/armv7m-cros-win-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
@@ -336,18 +351,19 @@
"../../usr/bin/clang",
"--sysroot=/usr/armv8m-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -356,12 +372,13 @@
"-ftrapv",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-B../../bin",
"-target",
"armv8m-cros-linux-gnu"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/armv8m-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
@@ -389,18 +406,19 @@
"../../usr/bin/clang",
"--sysroot=/usr/armv8m-cros-eabi",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -409,12 +427,13 @@
"-ftrapv",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-B../../bin",
"-target",
"armv8m-cros-eabi"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/armv8m-cros-eabi",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
@@ -442,18 +461,19 @@
"../../usr/bin/clang",
"--sysroot=/usr/armv8m-cros-win-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -462,12 +482,13 @@
"-ftrapv",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-B../../bin",
"-target",
"armv8m-cros-win-gnu"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/armv8m-cros-win-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
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 0dae3e82..b604692a 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_maincc_target_specific.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_maincc_target_specific.json
@@ -17,18 +17,19 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -36,12 +37,14 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-linux-gnu"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
@@ -68,18 +71,19 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-eabi",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -87,12 +91,14 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-eabi"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-eabi",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
@@ -119,18 +125,19 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-win-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -138,12 +145,14 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-win-gnu"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-win-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
@@ -170,18 +179,19 @@
"../../usr/bin/clang",
"--sysroot=/usr/armv7m-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -189,12 +199,13 @@
"-mthumb",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-B../../bin",
"-target",
"armv7m-cros-linux-gnu"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/armv7m-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
@@ -221,18 +232,19 @@
"../../usr/bin/clang",
"--sysroot=/usr/armv7m-cros-eabi",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -240,12 +252,13 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-B../../bin",
"-target",
"armv7m-cros-eabi"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/armv7m-cros-eabi",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
@@ -272,18 +285,19 @@
"../../usr/bin/clang",
"--sysroot=/usr/armv7m-cros-win-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -291,12 +305,13 @@
"-mthumb",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-B../../bin",
"-target",
"armv7m-cros-win-gnu"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/armv7m-cros-win-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
@@ -323,18 +338,19 @@
"../../usr/bin/clang",
"--sysroot=/usr/armv8m-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -342,12 +358,13 @@
"-mthumb",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-B../../bin",
"-target",
"armv8m-cros-linux-gnu"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/armv8m-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
@@ -374,18 +391,19 @@
"../../usr/bin/clang",
"--sysroot=/usr/armv8m-cros-eabi",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -393,12 +411,13 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-B../../bin",
"-target",
"armv8m-cros-eabi"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/armv8m-cros-eabi",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
@@ -425,18 +444,19 @@
"../../usr/bin/clang",
"--sysroot=/usr/armv8m-cros-win-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -444,12 +464,13 @@
"-mthumb",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-B../../bin",
"-target",
"armv8m-cros-win-gnu"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/armv8m-cros-win-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json
index 6932398b..9780356e 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json
@@ -17,18 +17,19 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -36,12 +37,14 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-linux-gnu"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
@@ -71,18 +74,19 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -90,12 +94,14 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-linux-gnu"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
@@ -125,18 +131,19 @@
"../../usr/bin/clang++",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -144,12 +151,14 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-linux-gnu"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
@@ -179,18 +188,19 @@
"somepath/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -198,12 +208,14 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-linux-gnu"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
@@ -240,18 +252,19 @@
"/somedir/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -261,12 +274,14 @@
"--gcc-toolchain=/usr",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-linux-gnu"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
@@ -306,18 +321,19 @@
"/somedir/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -327,6 +343,9 @@
"--gcc-toolchain=/usr",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-linux-gnu"
@@ -366,18 +385,19 @@
"/somedir/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -387,12 +407,14 @@
"--gcc-toolchain=/usr",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-linux-gnu"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
@@ -422,18 +444,19 @@
"/usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -441,12 +464,14 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-linux-gnu"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
@@ -473,18 +498,19 @@
"a/b/usr/bin/clang",
"--sysroot=/tmp/stable/a/b/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -492,12 +518,14 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-Ba/b/bin",
"-target",
"x86_64-cros-linux-gnu"
],
"env_updates": [
- "CCACHE_BASEDIR=/tmp/stable/a/b/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
@@ -524,18 +552,19 @@
"a/b/usr/bin/clang",
"--sysroot=/tmp/stable/a/b/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -543,12 +572,14 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-Ba/b/bin",
"-target",
"x86_64-cros-linux-gnu"
],
"env_updates": [
- "CCACHE_BASEDIR=/tmp/stable/a/b/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
@@ -575,18 +606,19 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -594,12 +626,14 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-linux-gnu"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
@@ -629,18 +663,19 @@
"/usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -648,12 +683,14 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-linux-gnu"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
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 398b6d5c..b90ad65d 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json
@@ -19,18 +19,19 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -38,12 +39,14 @@
"-fsanitize=kernel-address",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-linux-gnu"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
@@ -72,18 +75,19 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -91,12 +95,14 @@
"-fsanitize=kernel-address",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-linux-gnu"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
@@ -125,18 +131,19 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -144,12 +151,14 @@
"-fsanitize=kernel-address",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-linux-gnu"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
@@ -178,18 +187,19 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -197,12 +207,14 @@
"-fsanitize=kernel-address",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-linux-gnu"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
@@ -230,18 +242,19 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -250,12 +263,14 @@
"-fsanitize=fuzzer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-linux-gnu"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
@@ -284,18 +299,19 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -305,12 +321,14 @@
"-fprofile-instr-generate",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-linux-gnu"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
@@ -338,18 +356,19 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -357,12 +376,14 @@
"-fsanitize=address",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-linux-gnu"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
@@ -390,18 +411,19 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -410,12 +432,14 @@
"-fprofile-instr-generate",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-linux-gnu"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
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 a1a05c22..0d4aaf92 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json
@@ -28,31 +28,42 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "-mno-movbe",
+ "-Wclobbered",
+ "-Wno-psabi",
+ "-Wlogical-op",
+ "-Wmissing-parameter-type",
+ "-Wold-style-declaration",
+ "-Woverride-init",
+ "-Wunsafe-loop-optimizations",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-linux-gnu"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
@@ -80,18 +91,19 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -100,12 +112,14 @@
"-Wno-#warnings",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-linux-gnu"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
@@ -133,18 +147,19 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -153,12 +168,14 @@
"-Wno-error=uninitialized",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-linux-gnu"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
@@ -186,18 +203,19 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -206,12 +224,14 @@
"-Wno-error=unused-variable",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-linux-gnu"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
@@ -239,18 +259,19 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -259,12 +280,14 @@
"-Wno-unused-variable",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-linux-gnu"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
@@ -292,18 +315,19 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -312,12 +336,14 @@
"-Wunused-variable",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-linux-gnu"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
@@ -345,18 +371,19 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -365,12 +392,14 @@
"-someflag",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-linux-gnu"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
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 161bad6f..0ef55357 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_sysroot_wrapper_common.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_sysroot_wrapper_common.json
@@ -52,18 +52,19 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -71,12 +72,14 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-linux-gnu"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
@@ -106,18 +109,19 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -125,6 +129,9 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-linux-gnu"
@@ -152,29 +159,32 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-linux-gnu"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
@@ -202,30 +212,33 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-fno-stack-protector",
"-D__KERNEL__",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-linux-gnu"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
@@ -253,30 +266,32 @@
"../../usr/bin/clang",
"--sysroot=/usr/armv7a-cros-linux-gnueabihf",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-D_FORTIFY_SOURCE=2",
"-mthumb",
"-fno-stack-protector",
"-D__KERNEL__",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
"-B../../bin",
"-target",
"armv7a-cros-linux-gnueabihf"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/armv7a-cros-linux-gnueabihf",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
@@ -303,18 +318,19 @@
"args": [
"../../usr/bin/clang",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -323,12 +339,14 @@
"--sysroot=xyz",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-linux-gnu"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json b/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json
index d75eb527..06e114cb 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json
@@ -26,24 +26,25 @@
"cmd": {
"path": "../../usr/bin/clang-tidy",
"args": [
- "-checks=*,google*,-bugprone-narrowing-conversions,-cppcoreguidelines-*,-fuchsia-*,-google-build-using-namespace,-google-default-arguments,-google-explicit-constructor,-google-readability*,-google-runtime-int,-google-runtime-references,-hicpp-avoid-c-arrays,-hicpp-braces-around-statements,-hicpp-no-array-decay,-hicpp-signed-bitwise,-hicpp-uppercase-literal-suffix,-hicpp-use-auto,-llvm-namespace-comment,-misc-non-private-member-variables-in-classes,-misc-unused-parameters,-modernize-*,-readability-*",
+ "-checks=*,-bugprone-narrowing-conversions,-cppcoreguidelines-*,-fuchsia-*,-google-readability*,-google-runtime-references,-hicpp-*,-llvm-*,-misc-non-private-member-variables-in-classes,-misc-unused-parameters,-modernize-*,-readability-*",
"main.cc",
"--",
"-resource-dir=someResourceDir",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -51,6 +52,9 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-linux-gnu"
@@ -63,18 +67,19 @@
"args": [
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -82,6 +87,9 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-linux-gnu"
@@ -118,24 +126,25 @@
"cmd": {
"path": "../../usr/bin/clang-tidy",
"args": [
- "-checks=*,google*,-bugprone-narrowing-conversions,-cppcoreguidelines-*,-fuchsia-*,-google-build-using-namespace,-google-default-arguments,-google-explicit-constructor,-google-readability*,-google-runtime-int,-google-runtime-references,-hicpp-avoid-c-arrays,-hicpp-braces-around-statements,-hicpp-no-array-decay,-hicpp-signed-bitwise,-hicpp-uppercase-literal-suffix,-hicpp-use-auto,-llvm-namespace-comment,-misc-non-private-member-variables-in-classes,-misc-unused-parameters,-modernize-*,-readability-*",
+ "-checks=*,-bugprone-narrowing-conversions,-cppcoreguidelines-*,-fuchsia-*,-google-readability*,-google-runtime-references,-hicpp-*,-llvm-*,-misc-non-private-member-variables-in-classes,-misc-unused-parameters,-modernize-*,-readability-*",
"main.cc",
"--",
"-resource-dir=someResourceDir",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -143,6 +152,9 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-linux-gnu"
@@ -156,18 +168,19 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -175,6 +188,9 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-linux-gnu"
@@ -213,24 +229,25 @@
"cmd": {
"path": "../../usr/bin/clang-tidy",
"args": [
- "-checks=*,google*,-bugprone-narrowing-conversions,-cppcoreguidelines-*,-fuchsia-*,-google-build-using-namespace,-google-default-arguments,-google-explicit-constructor,-google-readability*,-google-runtime-int,-google-runtime-references,-hicpp-avoid-c-arrays,-hicpp-braces-around-statements,-hicpp-no-array-decay,-hicpp-signed-bitwise,-hicpp-uppercase-literal-suffix,-hicpp-use-auto,-llvm-namespace-comment,-misc-non-private-member-variables-in-classes,-misc-unused-parameters,-modernize-*,-readability-*",
+ "-checks=*,-bugprone-narrowing-conversions,-cppcoreguidelines-*,-fuchsia-*,-google-readability*,-google-runtime-references,-hicpp-*,-llvm-*,-misc-non-private-member-variables-in-classes,-misc-unused-parameters,-modernize-*,-readability-*",
"main.cc",
"--",
"-resource-dir=someResourceDir",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -238,6 +255,9 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-linux-gnu"
@@ -254,18 +274,19 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -273,6 +294,9 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-linux-gnu"
@@ -312,24 +336,25 @@
"cmd": {
"path": "../../usr/bin/clang-tidy",
"args": [
- "-checks=*,google*,-bugprone-narrowing-conversions,-cppcoreguidelines-*,-fuchsia-*,-google-build-using-namespace,-google-default-arguments,-google-explicit-constructor,-google-readability*,-google-runtime-int,-google-runtime-references,-hicpp-avoid-c-arrays,-hicpp-braces-around-statements,-hicpp-no-array-decay,-hicpp-signed-bitwise,-hicpp-uppercase-literal-suffix,-hicpp-use-auto,-llvm-namespace-comment,-misc-non-private-member-variables-in-classes,-misc-unused-parameters,-modernize-*,-readability-*",
+ "-checks=*,-bugprone-narrowing-conversions,-cppcoreguidelines-*,-fuchsia-*,-google-readability*,-google-runtime-references,-hicpp-*,-llvm-*,-misc-non-private-member-variables-in-classes,-misc-unused-parameters,-modernize-*,-readability-*",
"main.cc",
"--",
"-resource-dir=someResourceDir",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -337,6 +362,9 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-linux-gnu"
@@ -350,18 +378,19 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -369,6 +398,9 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-linux-gnu"
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 f975f452..cd460a79 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json
@@ -20,18 +20,19 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -39,12 +40,14 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-linux-gnu"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
@@ -74,18 +77,19 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -93,12 +97,14 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-linux-gnu"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
@@ -114,18 +120,19 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -133,13 +140,16 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-linux-gnu",
- "-Wno-error"
+ "-Wno-error",
+ "-Wno-error=poison-system-directories"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
@@ -171,18 +181,19 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -190,12 +201,14 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-linux-gnu"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
@@ -211,18 +224,19 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -230,13 +244,16 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-linux-gnu",
- "-Wno-error"
+ "-Wno-error",
+ "-Wno-error=poison-system-directories"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002",
"CCACHE_CPP2=yes"
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 b9582f6d..c7f619d9 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json
@@ -17,18 +17,19 @@
"args": [
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -36,6 +37,9 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-linux-gnu",
@@ -62,7 +66,6 @@
"-mno-movbe"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002"
]
@@ -92,18 +95,19 @@
"../../usr/bin/clang",
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -111,6 +115,9 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-linux-gnu",
@@ -161,18 +168,19 @@
"args": [
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -180,6 +188,9 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-linux-gnu",
@@ -214,18 +225,19 @@
"args": [
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
- "-grecord-gcc-switches",
"-fno-addrsig",
+ "-fcommon",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
"-Wno-section",
"-static-libgcc",
"-fuse-ld=lld",
- "-Wno-reorder-init-list",
"-Wno-final-dtor-non-final-class",
- "-Wno-return-stack-address",
"-Werror=poison-system-directories",
+ "-fexperimental-new-pass-manager",
+ "-Wno-compound-token-split-by-macro",
+ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -233,6 +245,9 @@
"-fno-omit-frame-pointer",
"main.cc",
"-Wno-implicit-int-float-conversion",
+ "-Wno-compound-token-split-by-space",
+ "-Wno-string-concatenation",
+ "-mno-movbe",
"-B../../bin",
"-target",
"x86_64-cros-linux-gnu",
@@ -259,7 +274,6 @@
"-mno-movbe"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002"
]
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 a037dd10..a45c95f1 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
@@ -28,7 +28,6 @@
"-mno-movbe"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002"
]
@@ -65,7 +64,6 @@
"-mno-movbe"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-eabi",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002"
]
@@ -102,7 +100,6 @@
"-mno-movbe"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-win-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002"
]
@@ -138,7 +135,6 @@
"main.cc"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/armv7m-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002"
]
@@ -174,7 +170,6 @@
"main.cc"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/armv7m-cros-eabi",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002"
]
@@ -210,7 +205,6 @@
"main.cc"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/armv7m-cros-win-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002"
]
@@ -246,7 +240,6 @@
"main.cc"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/armv8m-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002"
]
@@ -282,7 +275,6 @@
"main.cc"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/armv8m-cros-eabi",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002"
]
@@ -318,7 +310,6 @@
"main.cc"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/armv8m-cros-win-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002"
]
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/gcc_path.json b/compiler_wrapper/testdata/cros_hardened_golden/gcc_path.json
index 24ad65ae..36bf222b 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/gcc_path.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/gcc_path.json
@@ -28,7 +28,6 @@
"-mno-movbe"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002"
]
@@ -68,7 +67,6 @@
"-mno-movbe"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002"
]
@@ -108,7 +106,6 @@
"-mno-movbe"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002"
]
@@ -145,7 +142,6 @@
"-mno-movbe"
],
"env_updates": [
- "CCACHE_BASEDIR=/tmp/stable/a/b/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002"
]
@@ -182,7 +178,6 @@
"-mno-movbe"
],
"env_updates": [
- "CCACHE_BASEDIR=/tmp/stable/a/b/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002"
]
@@ -222,7 +217,6 @@
"-mno-movbe"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002"
]
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 a63aa25c..3807d8ab 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/gcc_sanitizer_args.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/gcc_sanitizer_args.json
@@ -31,7 +31,6 @@
"-mno-movbe"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002"
]
@@ -71,7 +70,6 @@
"-mno-movbe"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002"
]
@@ -111,7 +109,6 @@
"-mno-movbe"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002"
]
@@ -151,7 +148,6 @@
"-mno-movbe"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002"
]
@@ -190,7 +186,6 @@
"-mno-movbe"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002"
]
@@ -231,7 +226,6 @@
"-mno-movbe"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002"
]
@@ -270,7 +264,6 @@
"-mno-movbe"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002"
]
@@ -309,7 +302,6 @@
"-mno-movbe"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002"
]
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 b7a56ce4..e8a57b2f 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/gcc_specific_args.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/gcc_specific_args.json
@@ -30,7 +30,6 @@
"-mno-movbe"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002"
]
@@ -69,7 +68,6 @@
"-mno-movbe"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002"
]
@@ -108,7 +106,6 @@
"-mno-movbe"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002"
]
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 c52003b7..d17707a8 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
@@ -63,7 +63,6 @@
"-mno-movbe"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002"
]
@@ -134,7 +133,6 @@
"-mno-movbe"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002"
]
@@ -171,7 +169,6 @@
"-mno-movbe"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002"
]
@@ -207,7 +204,6 @@
"main.cc"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/armv7a-cros-linux-gnueabihf",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002"
]
@@ -245,7 +241,6 @@
"-mno-movbe"
],
"env_updates": [
- "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu",
"CCACHE_DIR=/var/cache/distfiles/ccache",
"CCACHE_UMASK=002"
]