diff options
author | Manoj Gupta <manojgupta@google.com> | 2021-05-09 12:57:40 -0700 |
---|---|---|
committer | Manoj Gupta <manojgupta@chromium.org> | 2021-08-04 02:38:42 +0000 |
commit | a5ff0587131795e61fded5bc4961a0b936914bbf (patch) | |
tree | 6759cc0083583880ce152d4e4b5cd6199afe0869 /compiler_wrapper/testdata/cros_nonhardened_golden/clang_sysroot_wrapper_common.json | |
parent | a0a6360987a17271c2a6bd5d2d5162dabdc0f31f (diff) | |
download | toolchain-utils-a5ff0587131795e61fded5bc4961a0b936914bbf.tar.gz |
compiler_wrapper: Fix static libgcc handling
Do not add static-libgcc to compiler command line if user
is passing {shared|static}-libgcc.
BUG=b:187794119
TEST=CQ
Change-Id: Iecd969dd11632837013bea71df9547bd08bbf30c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/3064572
Reviewed-by: George Burgess <gbiv@chromium.org>
Tested-by: George Burgess <gbiv@chromium.org>
Auto-Submit: Manoj Gupta <manojgupta@chromium.org>
Diffstat (limited to 'compiler_wrapper/testdata/cros_nonhardened_golden/clang_sysroot_wrapper_common.json')
-rw-r--r-- | compiler_wrapper/testdata/cros_nonhardened_golden/clang_sysroot_wrapper_common.json | 13 |
1 files changed, 7 insertions, 6 deletions
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 57d098f6..96d6e65a 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 @@ -20,6 +20,7 @@ "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wtrampolines", + "-static-libgcc", "main.cc", "-mno-movbe" ] @@ -53,13 +54,13 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-Wno-final-dtor-non-final-class", "-Werror=poison-system-directories", "-fexperimental-new-pass-manager", "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -106,13 +107,13 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-Wno-final-dtor-non-final-class", "-Werror=poison-system-directories", "-fexperimental-new-pass-manager", "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -152,13 +153,13 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-Wno-final-dtor-non-final-class", "-Werror=poison-system-directories", "-fexperimental-new-pass-manager", "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -203,13 +204,13 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-Wno-final-dtor-non-final-class", "-Werror=poison-system-directories", "-fexperimental-new-pass-manager", "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", + "-static-libgcc", "-fno-stack-protector", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-D__KERNEL__", @@ -256,13 +257,13 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-Wno-final-dtor-non-final-class", "-Werror=poison-system-directories", "-fexperimental-new-pass-manager", "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", + "-static-libgcc", "-mthumb", "-fno-stack-protector", "--prefix=../../bin/armv7a-cros-linux-gnueabihf-", @@ -308,13 +309,13 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-Wno-final-dtor-non-final-class", "-Werror=poison-system-directories", "-fexperimental-new-pass-manager", "-Wno-compound-token-split-by-macro", "-Wno-deprecated-declarations", "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "--sysroot=xyz", "main.cc", |