aboutsummaryrefslogtreecommitdiff
path: root/compiler_wrapper/testdata/cros_nonhardened_golden
diff options
context:
space:
mode:
Diffstat (limited to 'compiler_wrapper/testdata/cros_nonhardened_golden')
-rw-r--r--compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json6
-rw-r--r--compiler_wrapper/testdata/cros_nonhardened_golden/clang_ftrapv_maincc_target_specific.json18
-rw-r--r--compiler_wrapper/testdata/cros_nonhardened_golden/clang_maincc_target_specific.json18
-rw-r--r--compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json24
-rw-r--r--compiler_wrapper/testdata/cros_nonhardened_golden/clang_sanitizer_args.json18
-rw-r--r--compiler_wrapper/testdata/cros_nonhardened_golden/clang_specific_args.json8
-rw-r--r--compiler_wrapper/testdata/cros_nonhardened_golden/clang_sysroot_wrapper_common.json13
-rw-r--r--compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json16
-rw-r--r--compiler_wrapper/testdata/cros_nonhardened_golden/force_disable_werror.json10
-rw-r--r--compiler_wrapper/testdata/cros_nonhardened_golden/gcc_clang_syntax.json11
-rw-r--r--compiler_wrapper/testdata/cros_nonhardened_golden/gcc_maincc_target_specific.json21
-rw-r--r--compiler_wrapper/testdata/cros_nonhardened_golden/gcc_path.json6
-rw-r--r--compiler_wrapper/testdata/cros_nonhardened_golden/gcc_sanitizer_args.json8
-rw-r--r--compiler_wrapper/testdata/cros_nonhardened_golden/gcc_specific_args.json3
-rw-r--r--compiler_wrapper/testdata/cros_nonhardened_golden/gcc_sysroot_wrapper_common.json9
15 files changed, 180 insertions, 9 deletions
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json b/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json
index 7ccc0f66..6c46fee8 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json
@@ -41,10 +41,12 @@
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -103,10 +105,12 @@
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -168,10 +172,12 @@
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../../bin",
"-target",
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_ftrapv_maincc_target_specific.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_ftrapv_maincc_target_specific.json
index 36e8f7d0..86960cc9 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_ftrapv_maincc_target_specific.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_ftrapv_maincc_target_specific.json
@@ -33,10 +33,12 @@
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"-ftrapv",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -85,10 +87,12 @@
"--prefix=../../bin/x86_64-cros-eabi-",
"-ftrapv",
"main.cc",
+ "-L/usr/x86_64-cros-eabi/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -137,10 +141,12 @@
"--prefix=../../bin/x86_64-cros-win-gnu-",
"-ftrapv",
"main.cc",
+ "-L/usr/x86_64-cros-win-gnu/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -190,10 +196,12 @@
"--prefix=../../bin/armv7m-cros-linux-gnu-",
"-ftrapv",
"main.cc",
+ "-L/usr/armv7m-cros-linux-gnu/usr/lib",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-B../../bin",
"-target",
"armv7m-cros-linux-gnu"
@@ -241,10 +249,12 @@
"--prefix=../../bin/armv7m-cros-eabi-",
"-ftrapv",
"main.cc",
+ "-L/usr/armv7m-cros-eabi/usr/lib",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-B../../bin",
"-target",
"armv7m-cros-eabi"
@@ -293,10 +303,12 @@
"--prefix=../../bin/armv7m-cros-win-gnu-",
"-ftrapv",
"main.cc",
+ "-L/usr/armv7m-cros-win-gnu/usr/lib",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-B../../bin",
"-target",
"armv7m-cros-win-gnu"
@@ -345,10 +357,12 @@
"--prefix=../../bin/armv8m-cros-linux-gnu-",
"-ftrapv",
"main.cc",
+ "-L/usr/armv8m-cros-linux-gnu/usr/lib",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-B../../bin",
"-target",
"armv8m-cros-linux-gnu"
@@ -396,10 +410,12 @@
"--prefix=../../bin/armv8m-cros-eabi-",
"-ftrapv",
"main.cc",
+ "-L/usr/armv8m-cros-eabi/usr/lib",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-B../../bin",
"-target",
"armv8m-cros-eabi"
@@ -448,10 +464,12 @@
"--prefix=../../bin/armv8m-cros-win-gnu-",
"-ftrapv",
"main.cc",
+ "-L/usr/armv8m-cros-win-gnu/usr/lib",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-B../../bin",
"-target",
"armv8m-cros-win-gnu"
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_maincc_target_specific.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_maincc_target_specific.json
index af33ad3a..69af166d 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_maincc_target_specific.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_maincc_target_specific.json
@@ -31,10 +31,12 @@
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -81,10 +83,12 @@
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-eabi-",
"main.cc",
+ "-L/usr/x86_64-cros-eabi/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -131,10 +135,12 @@
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-win-gnu-",
"main.cc",
+ "-L/usr/x86_64-cros-win-gnu/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -182,10 +188,12 @@
"-mthumb",
"--prefix=../../bin/armv7m-cros-linux-gnu-",
"main.cc",
+ "-L/usr/armv7m-cros-linux-gnu/usr/lib",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-B../../bin",
"-target",
"armv7m-cros-linux-gnu"
@@ -231,10 +239,12 @@
"-static-libgcc",
"--prefix=../../bin/armv7m-cros-eabi-",
"main.cc",
+ "-L/usr/armv7m-cros-eabi/usr/lib",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-B../../bin",
"-target",
"armv7m-cros-eabi"
@@ -281,10 +291,12 @@
"-mthumb",
"--prefix=../../bin/armv7m-cros-win-gnu-",
"main.cc",
+ "-L/usr/armv7m-cros-win-gnu/usr/lib",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-B../../bin",
"-target",
"armv7m-cros-win-gnu"
@@ -331,10 +343,12 @@
"-mthumb",
"--prefix=../../bin/armv8m-cros-linux-gnu-",
"main.cc",
+ "-L/usr/armv8m-cros-linux-gnu/usr/lib",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-B../../bin",
"-target",
"armv8m-cros-linux-gnu"
@@ -380,10 +394,12 @@
"-static-libgcc",
"--prefix=../../bin/armv8m-cros-eabi-",
"main.cc",
+ "-L/usr/armv8m-cros-eabi/usr/lib",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-B../../bin",
"-target",
"armv8m-cros-eabi"
@@ -430,10 +446,12 @@
"-mthumb",
"--prefix=../../bin/armv8m-cros-win-gnu-",
"main.cc",
+ "-L/usr/armv8m-cros-win-gnu/usr/lib",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-B../../bin",
"-target",
"armv8m-cros-win-gnu"
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json
index bb03aa25..afc79511 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json
@@ -31,10 +31,12 @@
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -84,10 +86,12 @@
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -137,10 +141,12 @@
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -190,10 +196,12 @@
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -252,10 +260,12 @@
"-resource-dir=someResourceDir",
"--gcc-toolchain=/usr",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -317,10 +327,12 @@
"-resource-dir=someResourceDir",
"--gcc-toolchain=/usr",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -377,10 +389,12 @@
"-resource-dir=someResourceDir",
"--gcc-toolchain=/usr",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -430,10 +444,12 @@
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -480,10 +496,12 @@
"-static-libgcc",
"--prefix=a/b/c/d/e/bin/x86_64-cros-linux-gnu-",
"main.cc",
+ "-L/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-Ba/b/c/d/e/bin",
"-target",
@@ -530,10 +548,12 @@
"-static-libgcc",
"--prefix=a/b/c/d/e/bin/x86_64-cros-linux-gnu-",
"main.cc",
+ "-L/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-Ba/b/c/d/e/bin",
"-target",
@@ -580,10 +600,12 @@
"-static-libgcc",
"--prefix=../bin/x86_64-cros-linux-gnu-",
"main.cc",
+ "-L/tmp/usr/x86_64-cros-linux-gnu/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../bin",
"-target",
@@ -633,10 +655,12 @@
"-static-libgcc",
"--prefix=../bin/x86_64-cros-linux-gnu-",
"main.cc",
+ "-L/tmp/usr/x86_64-cros-linux-gnu/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../bin",
"-target",
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sanitizer_args.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sanitizer_args.json
index 26addbcb..3e140d59 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sanitizer_args.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sanitizer_args.json
@@ -34,10 +34,12 @@
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"-fsanitize=kernel-address",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -87,10 +89,12 @@
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"-fsanitize=kernel-address",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -140,10 +144,12 @@
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"-fsanitize=kernel-address",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -193,10 +199,12 @@
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"-fsanitize=kernel-address",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -242,14 +250,15 @@
"-Wno-deprecated-declarations",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
- "-fno-experimental-new-pass-manager",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"-fsanitize=fuzzer",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -296,15 +305,16 @@
"-Wno-deprecated-declarations",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-static-libgcc",
- "-fno-experimental-new-pass-manager",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"-fsanitize=address",
"-fprofile-instr-generate",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -353,10 +363,12 @@
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"-fsanitize=address",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -405,10 +417,12 @@
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"-fprofile-instr-generate",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../../bin",
"-target",
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_specific_args.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_specific_args.json
index 2b73d51b..fbe038e7 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_specific_args.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_specific_args.json
@@ -49,10 +49,12 @@
"-Woverride-init",
"-Wunsafe-loop-optimizations",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -101,10 +103,12 @@
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"-Wno-#warnings",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -153,10 +157,12 @@
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"-Wno-error=uninitialized",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -205,10 +211,12 @@
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"-someflag",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../../bin",
"-target",
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sysroot_wrapper_common.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sysroot_wrapper_common.json
index 96d6e65a..f2ccadb9 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sysroot_wrapper_common.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sysroot_wrapper_common.json
@@ -22,6 +22,7 @@
"-Wtrampolines",
"-static-libgcc",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-mno-movbe"
]
}
@@ -63,10 +64,12 @@
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -116,10 +119,12 @@
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -162,10 +167,12 @@
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -215,10 +222,12 @@
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"-D__KERNEL__",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -269,10 +278,12 @@
"--prefix=../../bin/armv7a-cros-linux-gnueabihf-",
"-D__KERNEL__",
"main.cc",
+ "-L/usr/armv7a-cros-linux-gnueabihf/usr/lib",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-B../../bin",
"-target",
"armv7a-cros-linux-gnueabihf"
@@ -319,10 +330,12 @@
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"--sysroot=xyz",
"main.cc",
+ "-Lxyz/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../../bin",
"-target",
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json
index ad6cb480..dc641c96 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json
@@ -46,10 +46,12 @@
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -77,10 +79,12 @@
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -138,10 +142,12 @@
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -170,10 +176,12 @@
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -233,10 +241,12 @@
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -268,10 +278,12 @@
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -332,10 +344,12 @@
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -364,10 +378,12 @@
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../../bin",
"-target",
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/force_disable_werror.json b/compiler_wrapper/testdata/cros_nonhardened_golden/force_disable_werror.json
index ba7f61f4..54b994cc 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/force_disable_werror.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/force_disable_werror.json
@@ -34,10 +34,12 @@
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -87,10 +89,12 @@
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -126,10 +130,12 @@
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -183,10 +189,12 @@
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -222,10 +230,12 @@
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../../bin",
"-target",
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_clang_syntax.json b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_clang_syntax.json
index 5e62ca2e..5234715d 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_clang_syntax.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_clang_syntax.json
@@ -31,10 +31,12 @@
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -56,6 +58,7 @@
"-Wtrampolines",
"-static-libgcc",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-mno-movbe"
],
"env_updates": [
@@ -102,10 +105,12 @@
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -127,6 +132,7 @@
"-Wtrampolines",
"-static-libgcc",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-mno-movbe"
]
}
@@ -168,10 +174,12 @@
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -221,10 +229,12 @@
"-static-libgcc",
"--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
"-Wno-string-concatenation",
"-Wno-deprecated-copy",
+ "-Wno-unused-but-set-variable",
"-mno-movbe",
"-B../../bin",
"-target",
@@ -246,6 +256,7 @@
"-Wtrampolines",
"-static-libgcc",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-mno-movbe"
],
"env_updates": [
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_maincc_target_specific.json b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_maincc_target_specific.json
index 5bb170bd..24f90fbf 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_maincc_target_specific.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_maincc_target_specific.json
@@ -22,6 +22,7 @@
"-Wtrampolines",
"-static-libgcc",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-mno-movbe"
],
"env_updates": [
@@ -55,6 +56,7 @@
"-Wtrampolines",
"-static-libgcc",
"main.cc",
+ "-L/usr/x86_64-cros-eabi/usr/lib64",
"-mno-movbe"
],
"env_updates": [
@@ -88,6 +90,7 @@
"-Wtrampolines",
"-static-libgcc",
"main.cc",
+ "-L/usr/x86_64-cros-win-gnu/usr/lib64",
"-mno-movbe"
],
"env_updates": [
@@ -121,7 +124,8 @@
"-Wtrampolines",
"-static-libgcc",
"-mthumb",
- "main.cc"
+ "main.cc",
+ "-L/usr/armv7m-cros-linux-gnu/usr/lib"
],
"env_updates": [
"CCACHE_DIR=/var/cache/distfiles/ccache",
@@ -153,7 +157,8 @@
"-Wno-deprecated-declarations",
"-Wtrampolines",
"-static-libgcc",
- "main.cc"
+ "main.cc",
+ "-L/usr/armv7m-cros-eabi/usr/lib"
],
"env_updates": [
"CCACHE_DIR=/var/cache/distfiles/ccache",
@@ -186,7 +191,8 @@
"-Wtrampolines",
"-static-libgcc",
"-mthumb",
- "main.cc"
+ "main.cc",
+ "-L/usr/armv7m-cros-win-gnu/usr/lib"
],
"env_updates": [
"CCACHE_DIR=/var/cache/distfiles/ccache",
@@ -219,7 +225,8 @@
"-Wtrampolines",
"-static-libgcc",
"-mthumb",
- "main.cc"
+ "main.cc",
+ "-L/usr/armv8m-cros-linux-gnu/usr/lib"
],
"env_updates": [
"CCACHE_DIR=/var/cache/distfiles/ccache",
@@ -251,7 +258,8 @@
"-Wno-deprecated-declarations",
"-Wtrampolines",
"-static-libgcc",
- "main.cc"
+ "main.cc",
+ "-L/usr/armv8m-cros-eabi/usr/lib"
],
"env_updates": [
"CCACHE_DIR=/var/cache/distfiles/ccache",
@@ -284,7 +292,8 @@
"-Wtrampolines",
"-static-libgcc",
"-mthumb",
- "main.cc"
+ "main.cc",
+ "-L/usr/armv8m-cros-win-gnu/usr/lib"
],
"env_updates": [
"CCACHE_DIR=/var/cache/distfiles/ccache",
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_path.json b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_path.json
index 00f2a364..b2662930 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_path.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_path.json
@@ -22,6 +22,7 @@
"-Wtrampolines",
"-static-libgcc",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-mno-movbe"
],
"env_updates": [
@@ -58,6 +59,7 @@
"-Wtrampolines",
"-static-libgcc",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-mno-movbe"
],
"env_updates": [
@@ -94,6 +96,7 @@
"-Wtrampolines",
"-static-libgcc",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-mno-movbe"
],
"env_updates": [
@@ -127,6 +130,7 @@
"-Wtrampolines",
"-static-libgcc",
"main.cc",
+ "-L/tmp/stable/a/b/usr/x86_64-cros-linux-gnu/usr/lib64",
"-mno-movbe"
],
"env_updates": [
@@ -160,6 +164,7 @@
"-Wtrampolines",
"-static-libgcc",
"main.cc",
+ "-L/tmp/stable/a/b/usr/x86_64-cros-linux-gnu/usr/lib64",
"-mno-movbe"
],
"env_updates": [
@@ -196,6 +201,7 @@
"-Wtrampolines",
"-static-libgcc",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-mno-movbe"
],
"env_updates": [
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_sanitizer_args.json b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_sanitizer_args.json
index 10ff7383..79e02c3d 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_sanitizer_args.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_sanitizer_args.json
@@ -25,6 +25,7 @@
"-static-libgcc",
"-fsanitize=kernel-address",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-mno-movbe"
],
"env_updates": [
@@ -61,6 +62,7 @@
"-static-libgcc",
"-fsanitize=kernel-address",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-mno-movbe"
],
"env_updates": [
@@ -97,6 +99,7 @@
"-static-libgcc",
"-fsanitize=kernel-address",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-mno-movbe"
],
"env_updates": [
@@ -133,6 +136,7 @@
"-static-libgcc",
"-fsanitize=kernel-address",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-mno-movbe"
],
"env_updates": [
@@ -168,6 +172,7 @@
"-static-libgcc",
"-fsanitize=fuzzer",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-mno-movbe"
],
"env_updates": [
@@ -205,6 +210,7 @@
"-fsanitize=address",
"-fprofile-instr-generate",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-mno-movbe"
],
"env_updates": [
@@ -240,6 +246,7 @@
"-static-libgcc",
"-fsanitize=address",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-mno-movbe"
],
"env_updates": [
@@ -275,6 +282,7 @@
"-static-libgcc",
"-fprofile-instr-generate",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-mno-movbe"
],
"env_updates": [
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_specific_args.json b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_specific_args.json
index 5228e12b..e0fe5515 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_specific_args.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_specific_args.json
@@ -24,6 +24,7 @@
"-static-libgcc",
"-march=goldmont",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-mno-movbe"
],
"env_updates": [
@@ -59,6 +60,7 @@
"-static-libgcc",
"-march=goldmont-plus",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-mno-movbe"
],
"env_updates": [
@@ -94,6 +96,7 @@
"-static-libgcc",
"-march=skylake",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-mno-movbe"
],
"env_updates": [
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_sysroot_wrapper_common.json b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_sysroot_wrapper_common.json
index 23109bc4..ba2f292c 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_sysroot_wrapper_common.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_sysroot_wrapper_common.json
@@ -22,6 +22,7 @@
"-Wtrampolines",
"-static-libgcc",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-mno-movbe"
]
}
@@ -54,6 +55,7 @@
"-Wtrampolines",
"-static-libgcc",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-mno-movbe"
],
"env_updates": [
@@ -90,6 +92,7 @@
"-Wtrampolines",
"-static-libgcc",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-mno-movbe"
]
}
@@ -120,6 +123,7 @@
"-Wtrampolines",
"-static-libgcc",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-mno-movbe"
],
"env_updates": [
@@ -156,6 +160,7 @@
"-fno-stack-protector",
"-D__KERNEL__",
"main.cc",
+ "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
"-mno-movbe"
],
"env_updates": [
@@ -192,7 +197,8 @@
"-mthumb",
"-fno-stack-protector",
"-D__KERNEL__",
- "main.cc"
+ "main.cc",
+ "-L/usr/armv7a-cros-linux-gnueabihf/usr/lib"
],
"env_updates": [
"CCACHE_DIR=/var/cache/distfiles/ccache",
@@ -226,6 +232,7 @@
"-static-libgcc",
"--sysroot=xyz",
"main.cc",
+ "-Lxyz/usr/lib64",
"-mno-movbe"
],
"env_updates": [