aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Burgess IV <gbiv@google.com>2023-07-20 15:10:12 -0600
committerChromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com>2023-07-25 20:48:28 +0000
commit82ce7214523ef45dbc4b5d0503df97ac257123e0 (patch)
treea1597ec01aa253abe6988a9fe87269a3d4cb2b86
parent9cf98be57924bb71c308f79420367f7806f5211d (diff)
downloadtoolchain-utils-82ce7214523ef45dbc4b5d0503df97ac257123e0.tar.gz
compiler_wrapper: manually apply -D_FORTIFY_SOURCE=2
We want to migrate to -D_FORTIFY_SOURCE=3, but doing so conflicts with the wrapper's implicit application of -D_FORTIFY_SOURCE=2. Have the wrapper skip the whole -D_FORTIFY_SOURCE=2 bit if it sees -D_FORTIFY_SOURCE=3 BUG=b:288411201 TEST=Made a json diff tool that treats -D_FORTIFY_SOURCE=2 as though TEST=it's always at the end of arg lists. All commands compared equally. Change-Id: Iedb42da661e1b67c8d640ca25ffc22200999ffa3 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/4706309 Tested-by: George Burgess <gbiv@chromium.org> Reviewed-by: Jordan Abrahams-Whitehead <ajordanr@google.com> Commit-Queue: George Burgess <gbiv@chromium.org>
Diffstat
-rw-r--r--compiler_wrapper/compiler_wrapper.go19
-rw-r--r--compiler_wrapper/config.go5
-rw-r--r--compiler_wrapper/config_test.go7
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/bisect.json6
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/clang_ftrapv_maincc_target_specific.json18
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/clang_maincc_target_specific.json18
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/clang_path.json24
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json2
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json8
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/clang_sysroot_wrapper_common.json14
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json16
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json10
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json14
-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
-rw-r--r--compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json6
-rw-r--r--compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json24
-rw-r--r--compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json16
-rw-r--r--compiler_wrapper/testdata/cros_hardened_llvmnext_golden/force_disable_werror.json10
-rw-r--r--compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_clang_syntax.json14
-rw-r--r--compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_path.json12
-rw-r--r--compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json6
-rw-r--r--compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json24
-rw-r--r--compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json16
-rw-r--r--compiler_wrapper/testdata/cros_hardened_noccache_golden/force_disable_werror.json10
-rw-r--r--compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_clang_syntax.json14
-rw-r--r--compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_path.json12
30 files changed, 203 insertions, 188 deletions
diff --git a/compiler_wrapper/compiler_wrapper.go b/compiler_wrapper/compiler_wrapper.go
index ada91b22..a299698c 100644
--- a/compiler_wrapper/compiler_wrapper.go
+++ b/compiler_wrapper/compiler_wrapper.go
@@ -332,10 +332,26 @@ func callCompilerInternal(env env, cfg *config, inputCmd *command) (exitCode int
}
}
+// TODO(b/288411201): Add -D_FORTIFY_SOURCE=2 to args if -D_FORITFY_SOURCE=3 is not present.
+// This makes migrating to -D_FORTIFY_SOURCE=3 _way_ easier, since the wrapper's implicit
+// -D_FORTIFY_SOURCE=2 can be ignored.
+func addPreUserFortifyFlag(builder *commandBuilder) {
+ for _, arg := range builder.args {
+ if arg.value == "-D_FORTIFY_SOURCE=3" {
+ return
+ }
+ }
+
+ builder.addPreUserArgs("-D_FORTIFY_SOURCE=2")
+}
+
func prepareClangCommand(builder *commandBuilder) (err error) {
if !builder.cfg.isHostWrapper {
processSysrootFlag(builder)
}
+ if builder.cfg.isHardened {
+ addPreUserFortifyFlag(builder)
+ }
builder.addPreUserArgs(builder.cfg.clangFlags...)
if builder.cfg.crashArtifactsDir != "" {
builder.addPreUserArgs("-fcrash-diagnostics-dir=" + builder.cfg.crashArtifactsDir)
@@ -361,6 +377,9 @@ func calcGccCommand(enableRusage bool, builder *commandBuilder) (bool, *command,
if !builder.cfg.isHostWrapper {
processSysrootFlag(builder)
}
+ if builder.cfg.isHardened {
+ addPreUserFortifyFlag(builder)
+ }
builder.addPreUserArgs(builder.cfg.gccFlags...)
calcCommonPreUserArgs(builder)
processGccFlags(builder)
diff --git a/compiler_wrapper/config.go b/compiler_wrapper/config.go
index 89d62516..bcf73d79 100644
--- a/compiler_wrapper/config.go
+++ b/compiler_wrapper/config.go
@@ -35,7 +35,8 @@ type config struct {
// Directory to store crash artifacts in.
crashArtifactsDir string
// Version. Only exposed via -print-config.
- version string
+ version string
+ isHardened bool
}
// Version can be set via a linker flag.
@@ -153,6 +154,7 @@ func crosCommonClangPostFlags() []string {
// Full hardening.
// Temporarily disable function splitting because of chromium:434751.
var crosHardenedConfig = config{
+ isHardened: true,
clangRootRelPath: "../..",
gccRootRelPath: "../../../../..",
// Pass "-fcommon" till the packages are fixed to work with new clang/gcc
@@ -160,7 +162,6 @@ var crosHardenedConfig = config{
commonFlags: []string{
"-fcommon",
"-fstack-protector-strong",
- "-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
},
gccFlags: []string{
diff --git a/compiler_wrapper/config_test.go b/compiler_wrapper/config_test.go
index 0e6b44c5..47432856 100644
--- a/compiler_wrapper/config_test.go
+++ b/compiler_wrapper/config_test.go
@@ -118,12 +118,7 @@ func TestRealConfigWithConfigNameFlag(t *testing.T) {
}
func isSysrootHardened(cfg *config) bool {
- for _, arg := range cfg.commonFlags {
- if arg == "-D_FORTIFY_SOURCE=2" {
- return true
- }
- }
- return false
+ return cfg.isHardened
}
func resetGlobals() {
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_golden/bisect.json
index 67953b07..b4cdd8d2 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/bisect.json
@@ -26,6 +26,7 @@
"/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",
@@ -51,7 +52,6 @@
"-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-",
@@ -107,6 +107,7 @@
"/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",
@@ -132,7 +133,6 @@
"-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-",
@@ -191,6 +191,7 @@
"/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",
@@ -216,7 +217,6 @@
"-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-",
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 68e1f2b9..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,6 +17,7 @@
"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",
@@ -42,7 +43,6 @@
"-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-",
@@ -88,6 +88,7 @@
"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",
@@ -113,7 +114,6 @@
"-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-",
@@ -159,6 +159,7 @@
"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",
@@ -184,7 +185,6 @@
"-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-",
@@ -230,6 +230,7 @@
"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",
@@ -255,7 +256,6 @@
"-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-",
@@ -300,6 +300,7 @@
"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",
@@ -325,7 +326,6 @@
"-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-",
@@ -370,6 +370,7 @@
"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",
@@ -395,7 +396,6 @@
"-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-",
@@ -440,6 +440,7 @@
"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",
@@ -465,7 +466,6 @@
"-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-",
@@ -510,6 +510,7 @@
"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",
@@ -535,7 +536,6 @@
"-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-",
@@ -580,6 +580,7 @@
"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",
@@ -605,7 +606,6 @@
"-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-",
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 e123a918..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,6 +16,7 @@
"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",
@@ -41,7 +42,6 @@
"-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-",
@@ -85,6 +85,7 @@
"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",
@@ -110,7 +111,6 @@
"-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-",
@@ -154,6 +154,7 @@
"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",
@@ -179,7 +180,6 @@
"-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-",
@@ -223,6 +223,7 @@
"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",
@@ -248,7 +249,6 @@
"-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-",
@@ -291,6 +291,7 @@
"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",
@@ -316,7 +317,6 @@
"-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-",
@@ -359,6 +359,7 @@
"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",
@@ -384,7 +385,6 @@
"-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-",
@@ -427,6 +427,7 @@
"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",
@@ -452,7 +453,6 @@
"-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-",
@@ -495,6 +495,7 @@
"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",
@@ -520,7 +521,6 @@
"-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-",
@@ -563,6 +563,7 @@
"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",
@@ -588,7 +589,6 @@
"-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-",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json
index c3785977..fc120977 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json
@@ -16,6 +16,7 @@
"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",
@@ -41,7 +42,6 @@
"-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-",
@@ -88,6 +88,7 @@
"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",
@@ -113,7 +114,6 @@
"-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-",
@@ -160,6 +160,7 @@
"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",
@@ -185,7 +186,6 @@
"-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",
@@ -233,6 +233,7 @@
"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",
@@ -258,7 +259,6 @@
"-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-",
@@ -312,6 +312,7 @@
"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",
@@ -337,7 +338,6 @@
"-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-",
@@ -396,6 +396,7 @@
"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",
@@ -421,7 +422,6 @@
"-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-",
@@ -475,6 +475,7 @@
"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",
@@ -500,7 +501,6 @@
"-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-",
@@ -549,6 +549,7 @@
"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",
@@ -574,7 +575,6 @@
"-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-",
@@ -618,6 +618,7 @@
"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",
@@ -643,7 +644,6 @@
"-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-",
@@ -687,6 +687,7 @@
"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",
@@ -712,7 +713,6 @@
"-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-",
@@ -756,6 +756,7 @@
"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",
@@ -781,7 +782,6 @@
"-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-",
@@ -828,6 +828,7 @@
"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",
@@ -853,7 +854,6 @@
"-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-",
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 91b7012f..0c9376cd 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json
@@ -513,6 +513,7 @@
"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",
@@ -538,7 +539,6 @@
"-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-",
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 dd30f48d..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,6 +26,7 @@
"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",
@@ -51,7 +52,6 @@
"-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-",
@@ -104,6 +104,7 @@
"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",
@@ -129,7 +130,6 @@
"-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-",
@@ -175,6 +175,7 @@
"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",
@@ -200,7 +201,6 @@
"-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-",
@@ -246,6 +246,7 @@
"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",
@@ -271,7 +272,6 @@
"-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-",
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 2f5a9e77..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,6 +52,7 @@
"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",
@@ -77,7 +78,6 @@
"-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-",
@@ -124,6 +124,7 @@
"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",
@@ -149,7 +150,6 @@
"-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-",
@@ -189,6 +189,7 @@
"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",
@@ -214,7 +215,6 @@
"-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-",
@@ -260,6 +260,7 @@
"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",
@@ -284,7 +285,6 @@
"-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",
@@ -331,6 +331,7 @@
"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",
@@ -355,7 +356,6 @@
"-ftrivial-auto-var-init=zero",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fcommon",
- "-D_FORTIFY_SOURCE=2",
"-static-libgcc",
"-mthumb",
"-fno-stack-protector",
@@ -400,6 +400,7 @@
"path": "/usr/bin/ccache",
"args": [
"../../usr/bin/clang",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
@@ -425,7 +426,6 @@
"-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-",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json b/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json
index 79911010..5d88fec8 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json
@@ -31,6 +31,7 @@
"--",
"-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",
@@ -56,7 +57,6 @@
"-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-",
@@ -81,6 +81,7 @@
"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",
@@ -106,7 +107,6 @@
"-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-",
@@ -161,6 +161,7 @@
"--",
"-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",
@@ -186,7 +187,6 @@
"-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-",
@@ -212,6 +212,7 @@
"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",
@@ -237,7 +238,6 @@
"-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-",
@@ -294,6 +294,7 @@
"--",
"-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",
@@ -319,7 +320,6 @@
"-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-",
@@ -348,6 +348,7 @@
"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",
@@ -373,7 +374,6 @@
"-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-",
@@ -431,6 +431,7 @@
"--",
"-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",
@@ -456,7 +457,6 @@
"-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-",
@@ -482,6 +482,7 @@
"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",
@@ -507,7 +508,6 @@
"-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-",
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 da818c3c..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,6 +19,7 @@
"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",
@@ -44,7 +45,6 @@
"-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-",
@@ -92,6 +92,7 @@
"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",
@@ -117,7 +118,6 @@
"-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-",
@@ -150,6 +150,7 @@
"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",
@@ -175,7 +176,6 @@
"-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-",
@@ -226,6 +226,7 @@
"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",
@@ -251,7 +252,6 @@
"-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-",
@@ -284,6 +284,7 @@
"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",
@@ -309,7 +310,6 @@
"-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-",
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 b00f2c86..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,6 +16,7 @@
"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",
@@ -41,7 +42,6 @@
"-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-",
@@ -69,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",
@@ -110,6 +110,7 @@
"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",
@@ -135,7 +136,6 @@
"-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-",
@@ -163,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",
@@ -199,6 +199,7 @@
"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",
@@ -224,7 +225,6 @@
"-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-",
@@ -271,6 +271,7 @@
"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",
@@ -296,7 +297,6 @@
"-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-",
@@ -324,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",
diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json
index 67953b07..b4cdd8d2 100644
--- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json
@@ -26,6 +26,7 @@
"/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",
@@ -51,7 +52,6 @@
"-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-",
@@ -107,6 +107,7 @@
"/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",
@@ -132,7 +133,6 @@
"-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-",
@@ -191,6 +191,7 @@
"/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",
@@ -216,7 +217,6 @@
"-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-",
diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json
index c3785977..fc120977 100644
--- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json
@@ -16,6 +16,7 @@
"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",
@@ -41,7 +42,6 @@
"-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-",
@@ -88,6 +88,7 @@
"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",
@@ -113,7 +114,6 @@
"-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-",
@@ -160,6 +160,7 @@
"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",
@@ -185,7 +186,6 @@
"-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",
@@ -233,6 +233,7 @@
"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",
@@ -258,7 +259,6 @@
"-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-",
@@ -312,6 +312,7 @@
"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",
@@ -337,7 +338,6 @@
"-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-",
@@ -396,6 +396,7 @@
"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",
@@ -421,7 +422,6 @@
"-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-",
@@ -475,6 +475,7 @@
"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",
@@ -500,7 +501,6 @@
"-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-",
@@ -549,6 +549,7 @@
"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",
@@ -574,7 +575,6 @@
"-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-",
@@ -618,6 +618,7 @@
"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",
@@ -643,7 +644,6 @@
"-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-",
@@ -687,6 +687,7 @@
"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",
@@ -712,7 +713,6 @@
"-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-",
@@ -756,6 +756,7 @@
"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",
@@ -781,7 +782,6 @@
"-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-",
@@ -828,6 +828,7 @@
"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",
@@ -853,7 +854,6 @@
"-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-",
diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json
index 79911010..5d88fec8 100644
--- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json
@@ -31,6 +31,7 @@
"--",
"-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",
@@ -56,7 +57,6 @@
"-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-",
@@ -81,6 +81,7 @@
"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",
@@ -106,7 +107,6 @@
"-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-",
@@ -161,6 +161,7 @@
"--",
"-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",
@@ -186,7 +187,6 @@
"-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-",
@@ -212,6 +212,7 @@
"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",
@@ -237,7 +238,6 @@
"-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-",
@@ -294,6 +294,7 @@
"--",
"-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",
@@ -319,7 +320,6 @@
"-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-",
@@ -348,6 +348,7 @@
"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",
@@ -373,7 +374,6 @@
"-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-",
@@ -431,6 +431,7 @@
"--",
"-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",
@@ -456,7 +457,6 @@
"-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-",
@@ -482,6 +482,7 @@
"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",
@@ -507,7 +508,6 @@
"-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-",
diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/force_disable_werror.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/force_disable_werror.json
index da818c3c..3d1e305e 100644
--- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/force_disable_werror.json
+++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/force_disable_werror.json
@@ -19,6 +19,7 @@
"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",
@@ -44,7 +45,6 @@
"-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-",
@@ -92,6 +92,7 @@
"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",
@@ -117,7 +118,6 @@
"-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-",
@@ -150,6 +150,7 @@
"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",
@@ -175,7 +176,6 @@
"-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-",
@@ -226,6 +226,7 @@
"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",
@@ -251,7 +252,6 @@
"-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-",
@@ -284,6 +284,7 @@
"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",
@@ -309,7 +310,6 @@
"-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-",
diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_clang_syntax.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_clang_syntax.json
index b00f2c86..9d17797a 100644
--- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_clang_syntax.json
+++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_clang_syntax.json
@@ -16,6 +16,7 @@
"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",
@@ -41,7 +42,6 @@
"-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-",
@@ -69,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",
@@ -110,6 +110,7 @@
"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",
@@ -135,7 +136,6 @@
"-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-",
@@ -163,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",
@@ -199,6 +199,7 @@
"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",
@@ -224,7 +225,6 @@
"-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-",
@@ -271,6 +271,7 @@
"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",
@@ -296,7 +297,6 @@
"-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-",
@@ -324,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_llvmnext_golden/gcc_path.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_path.json
index 6e06ce18..b6f3d1d9 100644
--- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_path.json
+++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_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_noccache_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json
index 8a6234bc..b476031b 100644
--- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json
@@ -25,6 +25,7 @@
"/tmp/sysroot_bisect",
"/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",
@@ -50,7 +51,6 @@
"-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-",
@@ -102,6 +102,7 @@
"someBisectDir",
"/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",
@@ -127,7 +128,6 @@
"-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-",
@@ -182,6 +182,7 @@
"someBisectDir",
"/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",
@@ -207,7 +208,6 @@
"-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-",
diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json
index 199d6bb1..3849ecf8 100644
--- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json
@@ -15,6 +15,7 @@
"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",
@@ -40,7 +41,6 @@
"-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-",
@@ -81,6 +81,7 @@
"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",
@@ -106,7 +107,6 @@
"-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-",
@@ -147,6 +147,7 @@
"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",
@@ -172,7 +173,6 @@
"-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",
@@ -214,6 +214,7 @@
"path": "somepath/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",
@@ -239,7 +240,6 @@
"-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-",
@@ -287,6 +287,7 @@
"path": "/somedir/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",
@@ -312,7 +313,6 @@
"-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-",
@@ -366,6 +366,7 @@
"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",
@@ -391,7 +392,6 @@
"-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-",
@@ -444,6 +444,7 @@
"path": "/somedir/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",
@@ -469,7 +470,6 @@
"-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-",
@@ -512,6 +512,7 @@
"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",
@@ -537,7 +538,6 @@
"-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-",
@@ -575,6 +575,7 @@
"path": "a/b/c/d/e/usr/bin/clang",
"args": [
"--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",
@@ -600,7 +601,6 @@
"-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-",
@@ -638,6 +638,7 @@
"path": "a/b/c/d/e/usr/bin/clang",
"args": [
"--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",
@@ -663,7 +664,6 @@
"-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-",
@@ -701,6 +701,7 @@
"path": "../usr/bin/clang",
"args": [
"--sysroot=/tmp/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
@@ -726,7 +727,6 @@
"-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-",
@@ -767,6 +767,7 @@
"path": "/tmp/usr/bin/clang",
"args": [
"--sysroot=/tmp/usr/x86_64-cros-linux-gnu",
+ "-D_FORTIFY_SOURCE=2",
"-Qunused-arguments",
"-Werror=poison-system-directories",
"-Wno-compound-token-split-by-macro",
@@ -792,7 +793,6 @@
"-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-",
diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json
index 79911010..5d88fec8 100644
--- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json
@@ -31,6 +31,7 @@
"--",
"-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",
@@ -56,7 +57,6 @@
"-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-",
@@ -81,6 +81,7 @@
"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",
@@ -106,7 +107,6 @@
"-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-",
@@ -161,6 +161,7 @@
"--",
"-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",
@@ -186,7 +187,6 @@
"-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-",
@@ -212,6 +212,7 @@
"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",
@@ -237,7 +238,6 @@
"-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-",
@@ -294,6 +294,7 @@
"--",
"-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",
@@ -319,7 +320,6 @@
"-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-",
@@ -348,6 +348,7 @@
"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",
@@ -373,7 +374,6 @@
"-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-",
@@ -431,6 +431,7 @@
"--",
"-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",
@@ -456,7 +457,6 @@
"-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-",
@@ -482,6 +482,7 @@
"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",
@@ -507,7 +508,6 @@
"-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-",
diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/force_disable_werror.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/force_disable_werror.json
index 18263f44..a4b2d2b4 100644
--- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/force_disable_werror.json
+++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/force_disable_werror.json
@@ -18,6 +18,7 @@
"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",
@@ -43,7 +44,6 @@
"-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-",
@@ -85,6 +85,7 @@
"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",
@@ -110,7 +111,6 @@
"-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-",
@@ -137,6 +137,7 @@
"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",
@@ -162,7 +163,6 @@
"-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-",
@@ -207,6 +207,7 @@
"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",
@@ -232,7 +233,6 @@
"-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-",
@@ -259,6 +259,7 @@
"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",
@@ -284,7 +285,6 @@
"-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-",
diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_clang_syntax.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_clang_syntax.json
index f34a44ba..091e00f5 100644
--- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_clang_syntax.json
+++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_clang_syntax.json
@@ -16,6 +16,7 @@
"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",
@@ -41,7 +42,6 @@
"-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-",
@@ -68,12 +68,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",
@@ -105,6 +105,7 @@
"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",
@@ -130,7 +131,6 @@
"-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-",
@@ -158,12 +158,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",
@@ -194,6 +194,7 @@
"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",
@@ -219,7 +220,6 @@
"-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-",
@@ -266,6 +266,7 @@
"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",
@@ -291,7 +292,6 @@
"-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-",
@@ -318,12 +318,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",
diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_path.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_path.json
index fb877370..ed60e6d6 100644
--- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_path.json
+++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_path.json
@@ -15,12 +15,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",
@@ -50,12 +50,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",
@@ -85,12 +85,12 @@
"path": "/tmp/stable/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",
@@ -117,12 +117,12 @@
"path": "./a/b/c/d/e/f/g/x86_64-cros-linux-gnu-gcc.real",
"args": [
"--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",
@@ -149,12 +149,12 @@
"path": "./symlinked/x86_64-cros-linux-gnu-gcc.real",
"args": [
"--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",
@@ -184,12 +184,12 @@
"path": "/tmp/stable/pathenv/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",
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-16 00:16:05 +0000