diff options
| author | Christopher Di Bella <cjdb@google.com> | 2021-12-07 19:54:18 +0000 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-12-07 21:37:41 +0000 |
| commit | 86fe58c1efd0db1d0d95b3cb0d6c34d105b39126 (patch) | |
| tree | 2a26fac4faba08b637c65fc3a01f1431b2f8069b | |
| parent | d02a62da66a5ca7d7d849aca8289ca783a68a7c8 (diff) | |
| download | toolchain-utils-86fe58c1efd0db1d0d95b3cb0d6c34d105b39126.tar.gz | |
compiler_wrapper: adds ${sysroot}/usr/lib to linker path
This change has been in chromiumos-overlay for a while now, but it
apparently wasn't ever committed to toolchain-utils.
BUG=b:209649372
TEST=This has been in prod for ages.
Change-Id: Ied0b519f2f30ef275e921f41e6dbdee9c9442d03
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/3321723
Tested-by: Christopher Di Bella <cjdb@google.com>
Auto-Submit: Christopher Di Bella <cjdb@google.com>
Reviewed-by: Manoj Gupta <manojgupta@chromium.org>
Commit-Queue: Manoj Gupta <manojgupta@chromium.org>
43 files changed, 319 insertions, 14 deletions
diff --git a/compiler_wrapper/sysroot_flag.go b/compiler_wrapper/sysroot_flag.go index 501fb20e..e0583b22 100644 --- a/compiler_wrapper/sysroot_flag.go +++ b/compiler_wrapper/sysroot_flag.go @@ -11,9 +11,14 @@ import ( func processSysrootFlag(builder *commandBuilder) { fromUser := false + userSysroot := "" for _, arg := range builder.args { if arg.fromUser && strings.HasPrefix(arg.value, "--sysroot=") { fromUser = true + sysrootArg := strings.Split(arg.value, "=") + if len(sysrootArg) == 2 { + userSysroot = sysrootArg[1] + } break } } @@ -27,5 +32,13 @@ func processSysrootFlag(builder *commandBuilder) { } if !fromUser { builder.addPreUserArgs("--sysroot=" + sysroot) + } else { + sysroot = userSysroot } + + libdir := "-L" + sysroot + "/usr/lib" + if strings.Contains(builder.target.target, "64") { + libdir += "64" + } + builder.addPostUserArgs(libdir) } diff --git a/compiler_wrapper/testdata/cros_hardened_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_golden/bisect.json index 995ce860..05aea31f 100644 --- a/compiler_wrapper/testdata/cros_hardened_golden/bisect.json +++ b/compiler_wrapper/testdata/cros_hardened_golden/bisect.json @@ -50,6 +50,7 @@ "-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", @@ -122,6 +123,7 @@ "-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", @@ -197,6 +199,7 @@ "-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", 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 86809109..2b04d0c9 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 @@ -42,6 +42,7 @@ "--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", @@ -104,6 +105,7 @@ "--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", @@ -166,6 +168,7 @@ "--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", @@ -228,6 +231,7 @@ "--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", @@ -289,6 +293,7 @@ "--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", @@ -350,6 +355,7 @@ "--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", @@ -411,6 +417,7 @@ "--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", @@ -472,6 +479,7 @@ "--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", @@ -533,6 +541,7 @@ "--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", 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 2aae9cbb..ea834174 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 @@ -40,6 +40,7 @@ "-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", @@ -100,6 +101,7 @@ "-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", @@ -160,6 +162,7 @@ "-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", @@ -220,6 +223,7 @@ "-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", @@ -279,6 +283,7 @@ "-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", @@ -338,6 +343,7 @@ "-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", @@ -397,6 +403,7 @@ "-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", @@ -456,6 +463,7 @@ "-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", @@ -515,6 +523,7 @@ "-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", diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json index 3e396ab9..52d4184a 100644 --- a/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json +++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json @@ -40,6 +40,7 @@ "-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", @@ -103,6 +104,7 @@ "-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", @@ -166,6 +168,7 @@ "-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", @@ -229,6 +232,7 @@ "-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", @@ -301,6 +305,7 @@ "-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", @@ -376,6 +381,7 @@ "-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", @@ -446,6 +452,7 @@ "-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", @@ -509,6 +516,7 @@ "-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", @@ -569,6 +577,7 @@ "-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", @@ -629,6 +638,7 @@ "-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", @@ -689,6 +699,7 @@ "-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", @@ -752,6 +763,7 @@ "-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", 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 38a34c02..948c19b2 100644 --- a/compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json +++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json @@ -42,6 +42,7 @@ "--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", @@ -104,6 +105,7 @@ "--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", @@ -166,6 +168,7 @@ "--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", @@ -228,6 +231,7 @@ "--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", @@ -290,6 +294,7 @@ "--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", @@ -354,6 +359,7 @@ "-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", @@ -415,6 +421,7 @@ "--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", @@ -477,6 +484,7 @@ "--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", 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 1098b059..d10e6cd0 100644 --- a/compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json +++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json @@ -58,6 +58,7 @@ "-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", @@ -120,6 +121,7 @@ "--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", @@ -182,6 +184,7 @@ "--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", @@ -244,6 +247,7 @@ "--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", 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 6ea77a71..42209185 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 @@ -27,6 +27,7 @@ "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", + "-L/usr/x86_64-cros-linux-gnu/usr/lib64", "-mno-movbe" ] } @@ -77,6 +78,7 @@ "-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", @@ -140,6 +142,7 @@ "-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", @@ -194,6 +197,7 @@ "-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", @@ -254,6 +258,7 @@ "--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", @@ -314,6 +319,7 @@ "--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", @@ -374,6 +380,7 @@ "--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", diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json b/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json index 0d4ee88f..ea1363e7 100644 --- a/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json +++ b/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json @@ -55,6 +55,7 @@ "-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", @@ -96,6 +97,7 @@ "-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", @@ -167,6 +169,7 @@ "-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", @@ -209,6 +212,7 @@ "-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", @@ -282,6 +286,7 @@ "-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", @@ -327,6 +332,7 @@ "-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", @@ -401,6 +407,7 @@ "-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", @@ -443,6 +450,7 @@ "-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", 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 fc55b4cd..4df81578 100644 --- a/compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json +++ b/compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json @@ -43,6 +43,7 @@ "-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", @@ -106,6 +107,7 @@ "-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", @@ -155,6 +157,7 @@ "-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", @@ -222,6 +225,7 @@ "-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", @@ -271,6 +275,7 @@ "-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", 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 ede8dd00..e2037e26 100644 --- a/compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json +++ b/compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json @@ -40,6 +40,7 @@ "-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", @@ -71,6 +72,7 @@ "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", + "-L/usr/x86_64-cros-linux-gnu/usr/lib64", "-mno-movbe" ], "env_updates": [ @@ -126,6 +128,7 @@ "-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", @@ -157,6 +160,7 @@ "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", + "-L/usr/x86_64-cros-linux-gnu/usr/lib64", "-mno-movbe" ] } @@ -207,6 +211,7 @@ "-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", @@ -270,6 +275,7 @@ "-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", @@ -301,6 +307,7 @@ "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", + "-L/usr/x86_64-cros-linux-gnu/usr/lib64", "-mno-movbe" ], "env_updates": [ 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 92fec35e..0cc3d8a9 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 @@ -27,6 +27,7 @@ "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", + "-L/usr/x86_64-cros-linux-gnu/usr/lib64", "-mno-movbe" ], "env_updates": [ @@ -65,6 +66,7 @@ "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", + "-L/usr/x86_64-cros-eabi/usr/lib64", "-mno-movbe" ], "env_updates": [ @@ -103,6 +105,7 @@ "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", + "-L/usr/x86_64-cros-win-gnu/usr/lib64", "-mno-movbe" ], "env_updates": [ @@ -140,7 +143,8 @@ "-D_FORTIFY_SOURCE=2", "-static-libgcc", "-mthumb", - "main.cc" + "main.cc", + "-L/usr/armv7m-cros-linux-gnu/usr/lib" ], "env_updates": [ "CCACHE_DIR=/var/cache/distfiles/ccache", @@ -177,7 +181,8 @@ "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", - "main.cc" + "main.cc", + "-L/usr/armv7m-cros-eabi/usr/lib" ], "env_updates": [ "CCACHE_DIR=/var/cache/distfiles/ccache", @@ -214,7 +219,8 @@ "-D_FORTIFY_SOURCE=2", "-static-libgcc", "-mthumb", - "main.cc" + "main.cc", + "-L/usr/armv7m-cros-win-gnu/usr/lib" ], "env_updates": [ "CCACHE_DIR=/var/cache/distfiles/ccache", @@ -251,7 +257,8 @@ "-D_FORTIFY_SOURCE=2", "-static-libgcc", "-mthumb", - "main.cc" + "main.cc", + "-L/usr/armv8m-cros-linux-gnu/usr/lib" ], "env_updates": [ "CCACHE_DIR=/var/cache/distfiles/ccache", @@ -288,7 +295,8 @@ "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", "-static-libgcc", - "main.cc" + "main.cc", + "-L/usr/armv8m-cros-eabi/usr/lib" ], "env_updates": [ "CCACHE_DIR=/var/cache/distfiles/ccache", @@ -325,7 +333,8 @@ "-D_FORTIFY_SOURCE=2", "-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_hardened_golden/gcc_path.json b/compiler_wrapper/testdata/cros_hardened_golden/gcc_path.json index f44e69dd..5b129d7d 100644 --- a/compiler_wrapper/testdata/cros_hardened_golden/gcc_path.json +++ b/compiler_wrapper/testdata/cros_hardened_golden/gcc_path.json @@ -27,6 +27,7 @@ "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", + "-L/usr/x86_64-cros-linux-gnu/usr/lib64", "-mno-movbe" ], "env_updates": [ @@ -68,6 +69,7 @@ "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", + "-L/usr/x86_64-cros-linux-gnu/usr/lib64", "-mno-movbe" ], "env_updates": [ @@ -109,6 +111,7 @@ "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", + "-L/usr/x86_64-cros-linux-gnu/usr/lib64", "-mno-movbe" ], "env_updates": [ @@ -147,6 +150,7 @@ "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", + "-L/tmp/stable/a/b/usr/x86_64-cros-linux-gnu/usr/lib64", "-mno-movbe" ], "env_updates": [ @@ -185,6 +189,7 @@ "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", + "-L/tmp/stable/a/b/usr/x86_64-cros-linux-gnu/usr/lib64", "-mno-movbe" ], "env_updates": [ @@ -226,6 +231,7 @@ "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", + "-L/usr/x86_64-cros-linux-gnu/usr/lib64", "-mno-movbe" ], "env_updates": [ 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 96215022..a61ead8e 100644 --- a/compiler_wrapper/testdata/cros_hardened_golden/gcc_sanitizer_args.json +++ b/compiler_wrapper/testdata/cros_hardened_golden/gcc_sanitizer_args.json @@ -30,6 +30,7 @@ "-static-libgcc", "-fsanitize=kernel-address", "main.cc", + "-L/usr/x86_64-cros-linux-gnu/usr/lib64", "-mno-movbe" ], "env_updates": [ @@ -71,6 +72,7 @@ "-static-libgcc", "-fsanitize=kernel-address", "main.cc", + "-L/usr/x86_64-cros-linux-gnu/usr/lib64", "-mno-movbe" ], "env_updates": [ @@ -112,6 +114,7 @@ "-static-libgcc", "-fsanitize=kernel-address", "main.cc", + "-L/usr/x86_64-cros-linux-gnu/usr/lib64", "-mno-movbe" ], "env_updates": [ @@ -153,6 +156,7 @@ "-static-libgcc", "-fsanitize=kernel-address", "main.cc", + "-L/usr/x86_64-cros-linux-gnu/usr/lib64", "-mno-movbe" ], "env_updates": [ @@ -193,6 +197,7 @@ "-static-libgcc", "-fsanitize=fuzzer", "main.cc", + "-L/usr/x86_64-cros-linux-gnu/usr/lib64", "-mno-movbe" ], "env_updates": [ @@ -235,6 +240,7 @@ "-fsanitize=address", "-fprofile-instr-generate", "main.cc", + "-L/usr/x86_64-cros-linux-gnu/usr/lib64", "-mno-movbe" ], "env_updates": [ @@ -275,6 +281,7 @@ "-static-libgcc", "-fsanitize=address", "main.cc", + "-L/usr/x86_64-cros-linux-gnu/usr/lib64", "-mno-movbe" ], "env_updates": [ @@ -315,6 +322,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_hardened_golden/gcc_specific_args.json b/compiler_wrapper/testdata/cros_hardened_golden/gcc_specific_args.json index f5c311b4..f7b20001 100644 --- a/compiler_wrapper/testdata/cros_hardened_golden/gcc_specific_args.json +++ b/compiler_wrapper/testdata/cros_hardened_golden/gcc_specific_args.json @@ -29,6 +29,7 @@ "-static-libgcc", "-march=goldmont", "main.cc", + "-L/usr/x86_64-cros-linux-gnu/usr/lib64", "-mno-movbe" ], "env_updates": [ @@ -69,6 +70,7 @@ "-static-libgcc", "-march=goldmont-plus", "main.cc", + "-L/usr/x86_64-cros-linux-gnu/usr/lib64", "-mno-movbe" ], "env_updates": [ @@ -109,6 +111,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_hardened_golden/gcc_sysroot_wrapper_common.json b/compiler_wrapper/testdata/cros_hardened_golden/gcc_sysroot_wrapper_common.json index 9ca8403e..299b46b6 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 @@ -27,6 +27,7 @@ "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", + "-L/usr/x86_64-cros-linux-gnu/usr/lib64", "-mno-movbe" ] } @@ -64,6 +65,7 @@ "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", + "-L/usr/x86_64-cros-linux-gnu/usr/lib64", "-mno-movbe" ], "env_updates": [ @@ -105,6 +107,7 @@ "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", + "-L/usr/x86_64-cros-linux-gnu/usr/lib64", "-mno-movbe" ] } @@ -138,6 +141,7 @@ "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", + "-L/usr/x86_64-cros-linux-gnu/usr/lib64", "-mno-movbe" ], "env_updates": [ @@ -176,6 +180,7 @@ "-fno-stack-protector", "-D__KERNEL__", "main.cc", + "-L/usr/x86_64-cros-linux-gnu/usr/lib64", "-mno-movbe" ], "env_updates": [ @@ -213,7 +218,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", @@ -252,6 +258,7 @@ "-static-libgcc", "--sysroot=xyz", "main.cc", + "-Lxyz/usr/lib64", "-mno-movbe" ], "env_updates": [ diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json index 995ce860..05aea31f 100644 --- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json +++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json @@ -50,6 +50,7 @@ "-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", @@ -122,6 +123,7 @@ "-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", @@ -197,6 +199,7 @@ "-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", 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 3e396ab9..52d4184a 100644 --- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json +++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json @@ -40,6 +40,7 @@ "-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", @@ -103,6 +104,7 @@ "-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", @@ -166,6 +168,7 @@ "-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", @@ -229,6 +232,7 @@ "-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", @@ -301,6 +305,7 @@ "-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", @@ -376,6 +381,7 @@ "-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", @@ -446,6 +452,7 @@ "-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", @@ -509,6 +516,7 @@ "-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", @@ -569,6 +577,7 @@ "-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", @@ -629,6 +638,7 @@ "-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", @@ -689,6 +699,7 @@ "-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", @@ -752,6 +763,7 @@ "-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", diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json index 0d4ee88f..ea1363e7 100644 --- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json +++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json @@ -55,6 +55,7 @@ "-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", @@ -96,6 +97,7 @@ "-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", @@ -167,6 +169,7 @@ "-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", @@ -209,6 +212,7 @@ "-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", @@ -282,6 +286,7 @@ "-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", @@ -327,6 +332,7 @@ "-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", @@ -401,6 +407,7 @@ "-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", @@ -443,6 +450,7 @@ "-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", 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 fc55b4cd..4df81578 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 @@ -43,6 +43,7 @@ "-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", @@ -106,6 +107,7 @@ "-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", @@ -155,6 +157,7 @@ "-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", @@ -222,6 +225,7 @@ "-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", @@ -271,6 +275,7 @@ "-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", 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 ede8dd00..e2037e26 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 @@ -40,6 +40,7 @@ "-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", @@ -71,6 +72,7 @@ "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", + "-L/usr/x86_64-cros-linux-gnu/usr/lib64", "-mno-movbe" ], "env_updates": [ @@ -126,6 +128,7 @@ "-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", @@ -157,6 +160,7 @@ "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", + "-L/usr/x86_64-cros-linux-gnu/usr/lib64", "-mno-movbe" ] } @@ -207,6 +211,7 @@ "-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", @@ -270,6 +275,7 @@ "-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", @@ -301,6 +307,7 @@ "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", + "-L/usr/x86_64-cros-linux-gnu/usr/lib64", "-mno-movbe" ], "env_updates": [ 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 f44e69dd..5b129d7d 100644 --- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_path.json +++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_path.json @@ -27,6 +27,7 @@ "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", + "-L/usr/x86_64-cros-linux-gnu/usr/lib64", "-mno-movbe" ], "env_updates": [ @@ -68,6 +69,7 @@ "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", + "-L/usr/x86_64-cros-linux-gnu/usr/lib64", "-mno-movbe" ], "env_updates": [ @@ -109,6 +111,7 @@ "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", + "-L/usr/x86_64-cros-linux-gnu/usr/lib64", "-mno-movbe" ], "env_updates": [ @@ -147,6 +150,7 @@ "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", + "-L/tmp/stable/a/b/usr/x86_64-cros-linux-gnu/usr/lib64", "-mno-movbe" ], "env_updates": [ @@ -185,6 +189,7 @@ "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", + "-L/tmp/stable/a/b/usr/x86_64-cros-linux-gnu/usr/lib64", "-mno-movbe" ], "env_updates": [ @@ -226,6 +231,7 @@ "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", + "-L/usr/x86_64-cros-linux-gnu/usr/lib64", "-mno-movbe" ], "env_updates": [ diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json index 049722e1..a676dc6e 100644 --- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json +++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json @@ -49,6 +49,7 @@ "-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", @@ -117,6 +118,7 @@ "-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", @@ -188,6 +190,7 @@ "-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", 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 536797ac..cc6d1ada 100644 --- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json +++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json @@ -39,6 +39,7 @@ "-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", @@ -96,6 +97,7 @@ "-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", @@ -153,6 +155,7 @@ "-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", @@ -210,6 +213,7 @@ "-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", @@ -276,6 +280,7 @@ "-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", @@ -346,6 +351,7 @@ "-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", @@ -415,6 +421,7 @@ "-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", @@ -472,6 +479,7 @@ "-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", @@ -526,6 +534,7 @@ "-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", @@ -580,6 +589,7 @@ "-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", @@ -634,6 +644,7 @@ "-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", @@ -691,6 +702,7 @@ "-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", diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json index 0d4ee88f..ea1363e7 100644 --- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json +++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json @@ -55,6 +55,7 @@ "-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", @@ -96,6 +97,7 @@ "-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", @@ -167,6 +169,7 @@ "-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", @@ -209,6 +212,7 @@ "-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", @@ -282,6 +286,7 @@ "-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", @@ -327,6 +332,7 @@ "-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", @@ -401,6 +407,7 @@ "-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", @@ -443,6 +450,7 @@ "-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", 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 c49ac467..2c34edb4 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 @@ -42,6 +42,7 @@ "-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", @@ -99,6 +100,7 @@ "-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", @@ -142,6 +144,7 @@ "-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", @@ -203,6 +206,7 @@ "-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", @@ -246,6 +250,7 @@ "-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", 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 f8bed840..368eb855 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 @@ -40,6 +40,7 @@ "-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", @@ -70,6 +71,7 @@ "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", + "-L/usr/x86_64-cros-linux-gnu/usr/lib64", "-mno-movbe" ] } @@ -121,6 +123,7 @@ "-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", @@ -152,6 +155,7 @@ "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", + "-L/usr/x86_64-cros-linux-gnu/usr/lib64", "-mno-movbe" ] } @@ -202,6 +206,7 @@ "-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", @@ -265,6 +270,7 @@ "-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", @@ -295,6 +301,7 @@ "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", + "-L/usr/x86_64-cros-linux-gnu/usr/lib64", "-mno-movbe" ] }, 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 9a964aad..9393c4b3 100644 --- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_path.json +++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_path.json @@ -26,6 +26,7 @@ "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", + "-L/usr/x86_64-cros-linux-gnu/usr/lib64", "-mno-movbe" ] } @@ -62,6 +63,7 @@ "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", + "-L/usr/x86_64-cros-linux-gnu/usr/lib64", "-mno-movbe" ] }, @@ -98,6 +100,7 @@ "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", + "-L/usr/x86_64-cros-linux-gnu/usr/lib64", "-mno-movbe" ] } @@ -131,6 +134,7 @@ "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", + "-L/tmp/stable/a/b/usr/x86_64-cros-linux-gnu/usr/lib64", "-mno-movbe" ] } @@ -164,6 +168,7 @@ "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", + "-L/tmp/stable/a/b/usr/x86_64-cros-linux-gnu/usr/lib64", "-mno-movbe" ] } @@ -200,6 +205,7 @@ "-fno-omit-frame-pointer", "-static-libgcc", "main.cc", + "-L/usr/x86_64-cros-linux-gnu/usr/lib64", "-mno-movbe" ] } diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json b/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json index cc0d88c9..6c46fee8 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json @@ -41,6 +41,7 @@ "-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", @@ -104,6 +105,7 @@ "-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", @@ -170,6 +172,7 @@ "-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", 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 2a1c799e..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,6 +33,7 @@ "--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", @@ -86,6 +87,7 @@ "--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", @@ -139,6 +141,7 @@ "--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", @@ -193,6 +196,7 @@ "--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", @@ -245,6 +249,7 @@ "--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", @@ -298,6 +303,7 @@ "--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", @@ -351,6 +357,7 @@ "--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", @@ -403,6 +410,7 @@ "--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", @@ -456,6 +464,7 @@ "--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", 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 182e692e..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,6 +31,7 @@ "-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", @@ -82,6 +83,7 @@ "-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", @@ -133,6 +135,7 @@ "-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", @@ -185,6 +188,7 @@ "-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", @@ -235,6 +239,7 @@ "-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", @@ -286,6 +291,7 @@ "-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", @@ -337,6 +343,7 @@ "-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", @@ -387,6 +394,7 @@ "-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", @@ -438,6 +446,7 @@ "-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", diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json index c5ff7dae..afc79511 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json @@ -31,6 +31,7 @@ "-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", @@ -85,6 +86,7 @@ "-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", @@ -139,6 +141,7 @@ "-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", @@ -193,6 +196,7 @@ "-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", @@ -256,6 +260,7 @@ "-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", @@ -322,6 +327,7 @@ "-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", @@ -383,6 +389,7 @@ "-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", @@ -437,6 +444,7 @@ "-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", @@ -488,6 +496,7 @@ "-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", @@ -539,6 +548,7 @@ "-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", @@ -590,6 +600,7 @@ "-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", @@ -644,6 +655,7 @@ "-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", 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 02b873f3..f6c9f7cb 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sanitizer_args.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sanitizer_args.json @@ -34,6 +34,7 @@ "--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", @@ -88,6 +89,7 @@ "--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", @@ -142,6 +144,7 @@ "--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", @@ -196,6 +199,7 @@ "--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", @@ -250,6 +254,7 @@ "--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", @@ -306,6 +311,7 @@ "-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", @@ -359,6 +365,7 @@ "--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", @@ -412,6 +419,7 @@ "--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", 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 bb1142c9..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,6 +49,7 @@ "-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", @@ -102,6 +103,7 @@ "--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", @@ -155,6 +157,7 @@ "--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", @@ -208,6 +211,7 @@ "--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", 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 4d69954b..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,6 +64,7 @@ "-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", @@ -117,6 +119,7 @@ "-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", @@ -164,6 +167,7 @@ "-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", @@ -218,6 +222,7 @@ "--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", @@ -273,6 +278,7 @@ "--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", @@ -324,6 +330,7 @@ "--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", diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json index 469678ab..dc641c96 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json @@ -46,6 +46,7 @@ "-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", @@ -78,6 +79,7 @@ "-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", @@ -140,6 +142,7 @@ "-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", @@ -173,6 +176,7 @@ "-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", @@ -237,6 +241,7 @@ "-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", @@ -273,6 +278,7 @@ "-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", @@ -338,6 +344,7 @@ "-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", @@ -371,6 +378,7 @@ "-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", 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 665fddbb..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,6 +34,7 @@ "-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", @@ -88,6 +89,7 @@ "-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", @@ -128,6 +130,7 @@ "-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", @@ -186,6 +189,7 @@ "-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", @@ -226,6 +230,7 @@ "-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", 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 af220315..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,6 +31,7 @@ "-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", @@ -57,6 +58,7 @@ "-Wtrampolines", "-static-libgcc", "main.cc", + "-L/usr/x86_64-cros-linux-gnu/usr/lib64", "-mno-movbe" ], "env_updates": [ @@ -103,6 +105,7 @@ "-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", @@ -129,6 +132,7 @@ "-Wtrampolines", "-static-libgcc", "main.cc", + "-L/usr/x86_64-cros-linux-gnu/usr/lib64", "-mno-movbe" ] } @@ -170,6 +174,7 @@ "-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", @@ -224,6 +229,7 @@ "-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", @@ -250,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": [ |