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 | |
| 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>
46 files changed, 381 insertions, 208 deletions
diff --git a/compiler_wrapper/compiler_wrapper.go b/compiler_wrapper/compiler_wrapper.go index e772484d..6d29ff0e 100644 --- a/compiler_wrapper/compiler_wrapper.go +++ b/compiler_wrapper/compiler_wrapper.go @@ -303,6 +303,7 @@ func calcGccCommand(enableRusage bool, builder *commandBuilder) (bool, *command, func calcCommonPreUserArgs(builder *commandBuilder) { builder.addPreUserArgs(builder.cfg.commonFlags...) if !builder.cfg.isHostWrapper { + processLibGCCFlags(builder) processPieFlags(builder) processThumbCodeFlags(builder) processStackProtectorFlags(builder) diff --git a/compiler_wrapper/config.go b/compiler_wrapper/config.go index e5385009..11d77ba7 100644 --- a/compiler_wrapper/config.go +++ b/compiler_wrapper/config.go @@ -139,7 +139,6 @@ var crosHardenedConfig = &config{ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -183,7 +182,6 @@ var crosNonHardenedConfig = &config{ "-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", diff --git a/compiler_wrapper/libgcc_flags.go b/compiler_wrapper/libgcc_flags.go new file mode 100644 index 00000000..72fa8381 --- /dev/null +++ b/compiler_wrapper/libgcc_flags.go @@ -0,0 +1,25 @@ +// Copyright 2021 The Chromium OS Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package main + +import ( + "strings" +) + +// Add "-static-libgcc" flag to compiler command line unless +// already specified by user or user has passed "-shared-libgcc". +func processLibGCCFlags(builder *commandBuilder) { + fromUser := false + for _, arg := range builder.args { + if arg.fromUser && (strings.HasPrefix(arg.value, "-shared-libgcc") || + strings.HasPrefix(arg.value, "-static-libgcc")) { + fromUser = true + break + } + } + if !fromUser { + builder.addPreUserArgs("-static-libgcc") + } +} diff --git a/compiler_wrapper/libgcc_flags_test.go b/compiler_wrapper/libgcc_flags_test.go new file mode 100644 index 00000000..717c0e52 --- /dev/null +++ b/compiler_wrapper/libgcc_flags_test.go @@ -0,0 +1,57 @@ +// Copyright 2021 The Chromium OS Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package main + +import ( + "testing" +) + +func TestDefaultStaticLibGCC(t *testing.T) { + withTestContext(t, func(ctx *testContext) { + runWithCompiler := func(compiler string) { + cmd := ctx.must(callCompiler(ctx, ctx.cfg, + ctx.newCommand(compiler, mainCc))) + if err := verifyArgCount(cmd, 1, "-static-libgcc"); err != nil { + t.Error(err) + } + } + + runWithCompiler(gccX86_64) + runWithCompiler(clangX86_64) + }) +} + +func TestKeepStaticLibGCCWithUserArgs(t *testing.T) { + withTestContext(t, func(ctx *testContext) { + runWithCompiler := func(compiler string) { + cmd := ctx.must(callCompiler(ctx, ctx.cfg, + ctx.newCommand(compiler, "-static-libgcc", mainCc))) + if err := verifyArgOrder(cmd, "-static-libgcc", mainCc); err != nil { + t.Error(err) + } + } + + runWithCompiler(gccX86_64) + runWithCompiler(clangX86_64) + }) +} + +func TestNoAddedStaticLibGCCWithSharedLibGCC(t *testing.T) { + withTestContext(t, func(ctx *testContext) { + runWithCompiler := func(compiler string) { + cmd := ctx.must(callCompiler(ctx, ctx.cfg, + ctx.newCommand(compiler, "-shared-libgcc", mainCc))) + if err := verifyArgCount(cmd, 0, "-static-libgcc"); err != nil { + t.Error(err) + } + if err := verifyArgCount(cmd, 1, "-shared-libgcc"); err != nil { + t.Error(err) + } + } + + runWithCompiler(gccX86_64) + runWithCompiler(clangX86_64) + }) +} diff --git a/compiler_wrapper/testdata/cros_hardened_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_golden/bisect.json index 13802c6e..c3bac4d2 100644 --- a/compiler_wrapper/testdata/cros_hardened_golden/bisect.json +++ b/compiler_wrapper/testdata/cros_hardened_golden/bisect.json @@ -33,7 +33,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -48,6 +47,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -104,7 +104,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -119,6 +118,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -178,7 +178,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -193,6 +192,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", 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 b699aa8f..6efe1d2a 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 @@ -24,7 +24,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -39,6 +38,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-ftrapv", "main.cc", @@ -85,7 +85,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -100,6 +99,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-eabi-", "-ftrapv", "main.cc", @@ -146,7 +146,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -161,6 +160,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-win-gnu-", "-ftrapv", "main.cc", @@ -207,7 +207,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -221,6 +220,7 @@ "-fPIE", "-pie", "-D_FORTIFY_SOURCE=2", + "-static-libgcc", "-mthumb", "--prefix=../../bin/armv7m-cros-linux-gnu-", "-ftrapv", @@ -267,7 +267,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -282,6 +281,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/armv7m-cros-eabi-", "-ftrapv", "main.cc", @@ -327,7 +327,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -341,6 +340,7 @@ "-fPIE", "-pie", "-D_FORTIFY_SOURCE=2", + "-static-libgcc", "-mthumb", "--prefix=../../bin/armv7m-cros-win-gnu-", "-ftrapv", @@ -387,7 +387,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -401,6 +400,7 @@ "-fPIE", "-pie", "-D_FORTIFY_SOURCE=2", + "-static-libgcc", "-mthumb", "--prefix=../../bin/armv8m-cros-linux-gnu-", "-ftrapv", @@ -447,7 +447,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -462,6 +461,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/armv8m-cros-eabi-", "-ftrapv", "main.cc", @@ -507,7 +507,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -521,6 +520,7 @@ "-fPIE", "-pie", "-D_FORTIFY_SOURCE=2", + "-static-libgcc", "-mthumb", "--prefix=../../bin/armv8m-cros-win-gnu-", "-ftrapv", 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 f0b34d0a..ac1109c1 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 @@ -23,7 +23,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -38,6 +37,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -82,7 +82,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -97,6 +96,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-eabi-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -141,7 +141,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -156,6 +155,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-win-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -200,7 +200,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -214,6 +213,7 @@ "-fPIE", "-pie", "-D_FORTIFY_SOURCE=2", + "-static-libgcc", "-mthumb", "--prefix=../../bin/armv7m-cros-linux-gnu-", "main.cc", @@ -258,7 +258,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -273,6 +272,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/armv7m-cros-eabi-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -316,7 +316,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -330,6 +329,7 @@ "-fPIE", "-pie", "-D_FORTIFY_SOURCE=2", + "-static-libgcc", "-mthumb", "--prefix=../../bin/armv7m-cros-win-gnu-", "main.cc", @@ -374,7 +374,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -388,6 +387,7 @@ "-fPIE", "-pie", "-D_FORTIFY_SOURCE=2", + "-static-libgcc", "-mthumb", "--prefix=../../bin/armv8m-cros-linux-gnu-", "main.cc", @@ -432,7 +432,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -447,6 +446,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/armv8m-cros-eabi-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -490,7 +490,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -504,6 +503,7 @@ "-fPIE", "-pie", "-D_FORTIFY_SOURCE=2", + "-static-libgcc", "-mthumb", "--prefix=../../bin/armv8m-cros-win-gnu-", "main.cc", diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json index 1923c509..d3dc7287 100644 --- a/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json +++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json @@ -23,7 +23,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -38,6 +37,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -85,7 +85,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -100,6 +99,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -147,7 +147,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -162,6 +161,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -209,7 +209,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -224,6 +223,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -278,7 +278,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -293,6 +292,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-resource-dir=someResourceDir", "--gcc-toolchain=/usr", @@ -352,7 +352,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -367,6 +366,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-resource-dir=someResourceDir", "--gcc-toolchain=/usr", @@ -421,7 +421,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -436,6 +435,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-resource-dir=someResourceDir", "--gcc-toolchain=/usr", @@ -485,7 +485,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -500,6 +499,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -544,7 +544,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -559,6 +558,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=a/b/c/d/e/bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -603,7 +603,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -618,6 +617,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=a/b/c/d/e/bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -662,7 +662,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -677,6 +676,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -724,7 +724,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -739,6 +738,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", 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 79881b54..8ef57484 100644 --- a/compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json +++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json @@ -25,7 +25,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -39,6 +38,7 @@ "-fPIE", "-pie", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-fsanitize=kernel-address", "main.cc", @@ -86,7 +86,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -100,6 +99,7 @@ "-fPIE", "-pie", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-fsanitize=kernel-address", "main.cc", @@ -147,7 +147,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -161,6 +160,7 @@ "-fPIE", "-pie", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-fsanitize=kernel-address", "main.cc", @@ -208,7 +208,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -222,6 +221,7 @@ "-fPIE", "-pie", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-fsanitize=kernel-address", "main.cc", @@ -268,7 +268,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -282,6 +281,7 @@ "-fPIE", "-pie", "-fno-omit-frame-pointer", + "-static-libgcc", "-fno-experimental-new-pass-manager", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-fsanitize=fuzzer", @@ -330,7 +330,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -344,6 +343,7 @@ "-fPIE", "-pie", "-fno-omit-frame-pointer", + "-static-libgcc", "-fno-experimental-new-pass-manager", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-fsanitize=address", @@ -392,7 +392,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -406,6 +405,7 @@ "-fPIE", "-pie", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-fsanitize=address", "main.cc", @@ -452,7 +452,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -467,6 +466,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-fprofile-instr-generate", "main.cc", 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 f0de96de..dd026196 100644 --- a/compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json +++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json @@ -33,7 +33,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -48,6 +47,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-mno-movbe", "-Wclobbered", @@ -101,7 +101,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -116,6 +115,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-Wno-#warnings", "main.cc", @@ -162,7 +162,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -177,6 +176,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-Wno-error=uninitialized", "main.cc", @@ -223,7 +223,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -238,6 +237,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-Wno-error=unused-variable", "main.cc", @@ -284,7 +284,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -299,6 +298,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-Wno-unused-variable", "main.cc", @@ -345,7 +345,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -360,6 +359,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-Wunused-variable", "main.cc", @@ -406,7 +406,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -421,6 +420,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-someflag", "main.cc", 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 3bd76349..5cfe476e 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 @@ -25,6 +25,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "main.cc", "-mno-movbe" ] @@ -59,7 +60,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -74,6 +74,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -121,7 +122,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -136,6 +136,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -176,7 +177,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -189,6 +189,7 @@ "-fstack-protector-strong", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -234,7 +235,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -246,6 +246,7 @@ "-fcommon", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "-fno-stack-protector", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-D__KERNEL__", @@ -293,7 +294,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -304,6 +304,7 @@ "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics", "-fcommon", "-D_FORTIFY_SOURCE=2", + "-static-libgcc", "-mthumb", "-fno-stack-protector", "--prefix=../../bin/armv7a-cros-linux-gnueabihf-", @@ -350,7 +351,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -365,6 +365,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "--sysroot=xyz", "main.cc", diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json b/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json index 00161baf..658ecc26 100644 --- a/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json +++ b/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json @@ -38,7 +38,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -53,6 +52,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -78,7 +78,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -93,6 +92,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -148,7 +148,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -163,6 +162,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -189,7 +189,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -204,6 +203,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -261,7 +261,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -276,6 +275,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -305,7 +305,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -320,6 +319,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -378,7 +378,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -393,6 +392,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -419,7 +419,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -434,6 +433,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", 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 0804b2b6..14441d7b 100644 --- a/compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json +++ b/compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json @@ -26,7 +26,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -41,6 +40,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -88,7 +88,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -103,6 +102,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -136,7 +136,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -151,6 +150,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -202,7 +202,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -217,6 +216,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -250,7 +250,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -265,6 +264,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", 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 b4380cd6..3ffd9e96 100644 --- a/compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json +++ b/compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json @@ -23,7 +23,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -38,6 +37,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -68,6 +68,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "main.cc", "-mno-movbe" ], @@ -107,7 +108,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -122,6 +122,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -152,6 +153,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "main.cc", "-mno-movbe" ] @@ -186,7 +188,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -201,6 +202,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -248,7 +250,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -263,6 +264,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -293,6 +295,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "main.cc", "-mno-movbe" ], 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 7affa691..92fec35e 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 @@ -25,6 +25,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "main.cc", "-mno-movbe" ], @@ -62,6 +63,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "main.cc", "-mno-movbe" ], @@ -99,6 +101,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "main.cc", "-mno-movbe" ], @@ -135,6 +138,7 @@ "-fPIE", "-pie", "-D_FORTIFY_SOURCE=2", + "-static-libgcc", "-mthumb", "main.cc" ], @@ -172,6 +176,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "main.cc" ], "env_updates": [ @@ -207,6 +212,7 @@ "-fPIE", "-pie", "-D_FORTIFY_SOURCE=2", + "-static-libgcc", "-mthumb", "main.cc" ], @@ -243,6 +249,7 @@ "-fPIE", "-pie", "-D_FORTIFY_SOURCE=2", + "-static-libgcc", "-mthumb", "main.cc" ], @@ -280,6 +287,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "main.cc" ], "env_updates": [ @@ -315,6 +323,7 @@ "-fPIE", "-pie", "-D_FORTIFY_SOURCE=2", + "-static-libgcc", "-mthumb", "main.cc" ], diff --git a/compiler_wrapper/testdata/cros_hardened_golden/gcc_path.json b/compiler_wrapper/testdata/cros_hardened_golden/gcc_path.json index c32ef3b8..f44e69dd 100644 --- a/compiler_wrapper/testdata/cros_hardened_golden/gcc_path.json +++ b/compiler_wrapper/testdata/cros_hardened_golden/gcc_path.json @@ -25,6 +25,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "main.cc", "-mno-movbe" ], @@ -65,6 +66,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "main.cc", "-mno-movbe" ], @@ -105,6 +107,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "main.cc", "-mno-movbe" ], @@ -142,6 +145,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "main.cc", "-mno-movbe" ], @@ -179,6 +183,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "main.cc", "-mno-movbe" ], @@ -219,6 +224,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "main.cc", "-mno-movbe" ], 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 380665f8..96215022 100644 --- a/compiler_wrapper/testdata/cros_hardened_golden/gcc_sanitizer_args.json +++ b/compiler_wrapper/testdata/cros_hardened_golden/gcc_sanitizer_args.json @@ -27,6 +27,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "-fsanitize=kernel-address", "main.cc", "-mno-movbe" @@ -67,6 +68,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "-fsanitize=kernel-address", "main.cc", "-mno-movbe" @@ -107,6 +109,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "-fsanitize=kernel-address", "main.cc", "-mno-movbe" @@ -147,6 +150,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "-fsanitize=kernel-address", "main.cc", "-mno-movbe" @@ -186,6 +190,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "-fsanitize=fuzzer", "main.cc", "-mno-movbe" @@ -226,6 +231,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "-fsanitize=address", "-fprofile-instr-generate", "main.cc", @@ -266,6 +272,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "-fsanitize=address", "main.cc", "-mno-movbe" @@ -305,6 +312,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "-fprofile-instr-generate", "main.cc", "-mno-movbe" 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 bade6d95..f5c311b4 100644 --- a/compiler_wrapper/testdata/cros_hardened_golden/gcc_specific_args.json +++ b/compiler_wrapper/testdata/cros_hardened_golden/gcc_specific_args.json @@ -26,6 +26,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "-march=goldmont", "main.cc", "-mno-movbe" @@ -65,6 +66,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "-march=goldmont-plus", "main.cc", "-mno-movbe" @@ -104,6 +106,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "-march=skylake", "main.cc", "-mno-movbe" 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 11d58f55..9ca8403e 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 @@ -25,6 +25,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "main.cc", "-mno-movbe" ] @@ -61,6 +62,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "main.cc", "-mno-movbe" ], @@ -101,6 +103,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "main.cc", "-mno-movbe" ] @@ -133,6 +136,7 @@ "-fstack-protector-strong", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "main.cc", "-mno-movbe" ], @@ -168,6 +172,7 @@ "-fcommon", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "-fno-stack-protector", "-D__KERNEL__", "main.cc", @@ -204,6 +209,7 @@ "-Wno-maybe-uninitialized", "-fcommon", "-D_FORTIFY_SOURCE=2", + "-static-libgcc", "-mthumb", "-fno-stack-protector", "-D__KERNEL__", @@ -243,6 +249,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--sysroot=xyz", "main.cc", "-mno-movbe" diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json index 61cfa7ec..8403e302 100644 --- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json +++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json @@ -33,7 +33,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -49,6 +48,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -105,7 +105,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -121,6 +120,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -180,7 +180,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -196,6 +195,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", 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 1b59a942..49e21410 100644 --- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json +++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json @@ -23,7 +23,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -39,6 +38,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -86,7 +86,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -102,6 +101,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -149,7 +149,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -165,6 +164,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -212,7 +212,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -228,6 +227,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -282,7 +282,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -298,6 +297,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-resource-dir=someResourceDir", "--gcc-toolchain=/usr", @@ -357,7 +357,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -373,6 +372,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-resource-dir=someResourceDir", "--gcc-toolchain=/usr", @@ -427,7 +427,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -443,6 +442,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-resource-dir=someResourceDir", "--gcc-toolchain=/usr", @@ -492,7 +492,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -508,6 +507,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -552,7 +552,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -568,6 +567,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=a/b/c/d/e/bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -612,7 +612,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -628,6 +627,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=a/b/c/d/e/bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -672,7 +672,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -688,6 +687,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -735,7 +735,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -751,6 +750,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json index 634caa50..4028cde8 100644 --- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json +++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json @@ -38,7 +38,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -54,6 +53,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -79,7 +79,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -95,6 +94,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -150,7 +150,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -166,6 +165,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -192,7 +192,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -208,6 +207,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -265,7 +265,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -281,6 +280,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -310,7 +310,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -326,6 +325,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -384,7 +384,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -400,6 +399,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -426,7 +426,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -442,6 +441,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", 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 b8973cdc..9e05a2b3 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 @@ -26,7 +26,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -42,6 +41,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -89,7 +89,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -105,6 +104,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -138,7 +138,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -154,6 +153,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -205,7 +205,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -221,6 +220,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -254,7 +254,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -270,6 +269,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", 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 422bd4fc..01546d27 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 @@ -23,7 +23,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -39,6 +38,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -69,6 +69,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "main.cc", "-mno-movbe" ], @@ -108,7 +109,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -124,6 +124,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -154,6 +155,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "main.cc", "-mno-movbe" ] @@ -188,7 +190,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -204,6 +205,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -251,7 +253,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -267,6 +268,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -297,6 +299,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "main.cc", "-mno-movbe" ], 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 c32ef3b8..f44e69dd 100644 --- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_path.json +++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_path.json @@ -25,6 +25,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "main.cc", "-mno-movbe" ], @@ -65,6 +66,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "main.cc", "-mno-movbe" ], @@ -105,6 +107,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "main.cc", "-mno-movbe" ], @@ -142,6 +145,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "main.cc", "-mno-movbe" ], @@ -179,6 +183,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "main.cc", "-mno-movbe" ], @@ -219,6 +224,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "main.cc", "-mno-movbe" ], diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json index c54aa485..58a0846f 100644 --- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json +++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json @@ -32,7 +32,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -47,6 +46,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -99,7 +99,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -114,6 +113,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -169,7 +169,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -184,6 +183,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", 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 15140212..5865a12f 100644 --- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json +++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json @@ -22,7 +22,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -37,6 +36,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -78,7 +78,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -93,6 +92,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -134,7 +134,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -149,6 +148,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -190,7 +190,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -205,6 +204,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -253,7 +253,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -268,6 +267,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-resource-dir=someResourceDir", "--gcc-toolchain=/usr", @@ -322,7 +322,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -337,6 +336,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-resource-dir=someResourceDir", "--gcc-toolchain=/usr", @@ -390,7 +390,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -405,6 +404,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-resource-dir=someResourceDir", "--gcc-toolchain=/usr", @@ -448,7 +448,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -463,6 +462,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -501,7 +501,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -516,6 +515,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=a/b/c/d/e/bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -554,7 +554,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -569,6 +568,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=a/b/c/d/e/bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -607,7 +607,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -622,6 +621,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -663,7 +663,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -678,6 +677,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json index 00161baf..658ecc26 100644 --- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json +++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json @@ -38,7 +38,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -53,6 +52,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -78,7 +78,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -93,6 +92,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -148,7 +148,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -163,6 +162,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -189,7 +189,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -204,6 +203,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -261,7 +261,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -276,6 +275,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -305,7 +305,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -320,6 +319,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -378,7 +378,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -393,6 +392,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -419,7 +419,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -434,6 +433,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", 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 19f1c7f4..aa3de738 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 @@ -25,7 +25,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -40,6 +39,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -81,7 +81,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -96,6 +95,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -123,7 +123,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -138,6 +137,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -183,7 +183,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -198,6 +197,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -225,7 +225,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -240,6 +239,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", 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 5a4c4e13..a532745f 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 @@ -23,7 +23,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -38,6 +37,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -67,6 +67,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "main.cc", "-mno-movbe" ] @@ -102,7 +103,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -117,6 +117,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -147,6 +148,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "main.cc", "-mno-movbe" ] @@ -181,7 +183,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -196,6 +197,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -243,7 +245,6 @@ "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", "-Wno-section", - "-static-libgcc", "-fuse-ld=lld", "--unwindlib=libgcc", "-Wno-final-dtor-non-final-class", @@ -258,6 +259,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "--prefix=../../bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -287,6 +289,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "main.cc", "-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 6bd35ffa..9a964aad 100644 --- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_path.json +++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_path.json @@ -24,6 +24,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "main.cc", "-mno-movbe" ] @@ -59,6 +60,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "main.cc", "-mno-movbe" ] @@ -94,6 +96,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "main.cc", "-mno-movbe" ] @@ -126,6 +129,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "main.cc", "-mno-movbe" ] @@ -158,6 +162,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "main.cc", "-mno-movbe" ] @@ -193,6 +198,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", + "-static-libgcc", "main.cc", "-mno-movbe" ] diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json b/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json index 6f849967..7ccc0f66 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json @@ -32,13 +32,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", @@ -94,13 +94,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", @@ -159,13 +159,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", 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 a6481822..36e8f7d0 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 @@ -23,13 +23,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-", "-ftrapv", "main.cc", @@ -75,13 +75,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-eabi-", "-ftrapv", "main.cc", @@ -127,13 +127,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-win-gnu-", "-ftrapv", "main.cc", @@ -179,13 +179,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", "--prefix=../../bin/armv7m-cros-linux-gnu-", "-ftrapv", @@ -231,13 +231,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/armv7m-cros-eabi-", "-ftrapv", "main.cc", @@ -282,13 +282,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", "--prefix=../../bin/armv7m-cros-win-gnu-", "-ftrapv", @@ -334,13 +334,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", "--prefix=../../bin/armv8m-cros-linux-gnu-", "-ftrapv", @@ -386,13 +386,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/armv8m-cros-eabi-", "-ftrapv", "main.cc", @@ -437,13 +437,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", "--prefix=../../bin/armv8m-cros-win-gnu-", "-ftrapv", 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 762f9608..af33ad3a 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 @@ -22,13 +22,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", @@ -72,13 +72,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-eabi-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -122,13 +122,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-win-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -172,13 +172,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", "--prefix=../../bin/armv7m-cros-linux-gnu-", "main.cc", @@ -222,13 +222,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/armv7m-cros-eabi-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -271,13 +271,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", "--prefix=../../bin/armv7m-cros-win-gnu-", "main.cc", @@ -321,13 +321,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", "--prefix=../../bin/armv8m-cros-linux-gnu-", "main.cc", @@ -371,13 +371,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/armv8m-cros-eabi-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -420,13 +420,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", "--prefix=../../bin/armv8m-cros-win-gnu-", "main.cc", diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json index 261dfb6b..bb03aa25 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json @@ -22,13 +22,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", @@ -75,13 +75,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", @@ -128,13 +128,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", @@ -181,13 +181,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", @@ -241,13 +241,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-", "-resource-dir=someResourceDir", "--gcc-toolchain=/usr", @@ -306,13 +306,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-", "-resource-dir=someResourceDir", "--gcc-toolchain=/usr", @@ -366,13 +366,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-", "-resource-dir=someResourceDir", "--gcc-toolchain=/usr", @@ -421,13 +421,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", @@ -471,13 +471,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=a/b/c/d/e/bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -521,13 +521,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=a/b/c/d/e/bin/x86_64-cros-linux-gnu-", "main.cc", "-Wno-implicit-int-float-conversion", @@ -571,13 +571,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", @@ -624,13 +624,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", 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 bbb0a8a1..26addbcb 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sanitizer_args.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sanitizer_args.json @@ -24,13 +24,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-", "-fsanitize=kernel-address", "main.cc", @@ -77,13 +77,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-", "-fsanitize=kernel-address", "main.cc", @@ -130,13 +130,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-", "-fsanitize=kernel-address", "main.cc", @@ -183,13 +183,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-", "-fsanitize=kernel-address", "main.cc", @@ -235,13 +235,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-experimental-new-pass-manager", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-fsanitize=fuzzer", @@ -289,13 +289,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-experimental-new-pass-manager", "--prefix=../../bin/x86_64-cros-linux-gnu-", "-fsanitize=address", @@ -343,13 +343,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-", "-fsanitize=address", "main.cc", @@ -395,13 +395,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-", "-fprofile-instr-generate", "main.cc", 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 16d16216..1c809647 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_specific_args.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_specific_args.json @@ -32,13 +32,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-", "-mno-movbe", "-Wclobbered", @@ -91,13 +91,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-", "-Wno-#warnings", "main.cc", @@ -143,13 +143,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-", "-Wno-error=uninitialized", "main.cc", @@ -195,13 +195,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-", "-Wno-error=unused-variable", "main.cc", @@ -247,13 +247,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-", "-Wno-unused-variable", "main.cc", @@ -299,13 +299,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-", "-Wunused-variable", "main.cc", @@ -351,13 +351,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-", "-someflag", "main.cc", 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", diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json index c0efa953..ad6cb480 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json @@ -37,13 +37,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", @@ -68,13 +68,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", @@ -129,13 +129,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", @@ -161,13 +161,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", @@ -224,13 +224,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", @@ -259,13 +259,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", @@ -323,13 +323,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", @@ -355,13 +355,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", 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 8768b2b0..ba7f61f4 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/force_disable_werror.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/force_disable_werror.json @@ -25,13 +25,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", @@ -78,13 +78,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", @@ -117,13 +117,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", @@ -174,13 +174,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", @@ -213,13 +213,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", 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 73ee224a..5e62ca2e 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_clang_syntax.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_clang_syntax.json @@ -22,13 +22,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", @@ -54,6 +54,7 @@ "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wtrampolines", + "-static-libgcc", "main.cc", "-mno-movbe" ], @@ -92,13 +93,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", @@ -124,6 +125,7 @@ "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wtrampolines", + "-static-libgcc", "main.cc", "-mno-movbe" ] @@ -157,13 +159,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", @@ -210,13 +212,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", @@ -242,6 +244,7 @@ "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wtrampolines", + "-static-libgcc", "main.cc", "-mno-movbe" ], 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 d11a7413..5bb170bd 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 @@ -20,6 +20,7 @@ "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wtrampolines", + "-static-libgcc", "main.cc", "-mno-movbe" ], @@ -52,6 +53,7 @@ "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wtrampolines", + "-static-libgcc", "main.cc", "-mno-movbe" ], @@ -84,6 +86,7 @@ "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wtrampolines", + "-static-libgcc", "main.cc", "-mno-movbe" ], @@ -116,6 +119,7 @@ "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wtrampolines", + "-static-libgcc", "-mthumb", "main.cc" ], @@ -148,6 +152,7 @@ "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wtrampolines", + "-static-libgcc", "main.cc" ], "env_updates": [ @@ -179,6 +184,7 @@ "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wtrampolines", + "-static-libgcc", "-mthumb", "main.cc" ], @@ -211,6 +217,7 @@ "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wtrampolines", + "-static-libgcc", "-mthumb", "main.cc" ], @@ -243,6 +250,7 @@ "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wtrampolines", + "-static-libgcc", "main.cc" ], "env_updates": [ @@ -274,6 +282,7 @@ "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wtrampolines", + "-static-libgcc", "-mthumb", "main.cc" ], diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_path.json b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_path.json index 17483eee..00f2a364 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_path.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_path.json @@ -20,6 +20,7 @@ "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wtrampolines", + "-static-libgcc", "main.cc", "-mno-movbe" ], @@ -55,6 +56,7 @@ "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wtrampolines", + "-static-libgcc", "main.cc", "-mno-movbe" ], @@ -90,6 +92,7 @@ "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wtrampolines", + "-static-libgcc", "main.cc", "-mno-movbe" ], @@ -122,6 +125,7 @@ "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wtrampolines", + "-static-libgcc", "main.cc", "-mno-movbe" ], @@ -154,6 +158,7 @@ "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wtrampolines", + "-static-libgcc", "main.cc", "-mno-movbe" ], @@ -189,6 +194,7 @@ "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wtrampolines", + "-static-libgcc", "main.cc", "-mno-movbe" ], 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 4aacc51a..10ff7383 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_sanitizer_args.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_sanitizer_args.json @@ -22,6 +22,7 @@ "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wtrampolines", + "-static-libgcc", "-fsanitize=kernel-address", "main.cc", "-mno-movbe" @@ -57,6 +58,7 @@ "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wtrampolines", + "-static-libgcc", "-fsanitize=kernel-address", "main.cc", "-mno-movbe" @@ -92,6 +94,7 @@ "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wtrampolines", + "-static-libgcc", "-fsanitize=kernel-address", "main.cc", "-mno-movbe" @@ -127,6 +130,7 @@ "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wtrampolines", + "-static-libgcc", "-fsanitize=kernel-address", "main.cc", "-mno-movbe" @@ -161,6 +165,7 @@ "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wtrampolines", + "-static-libgcc", "-fsanitize=fuzzer", "main.cc", "-mno-movbe" @@ -196,6 +201,7 @@ "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wtrampolines", + "-static-libgcc", "-fsanitize=address", "-fprofile-instr-generate", "main.cc", @@ -231,6 +237,7 @@ "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wtrampolines", + "-static-libgcc", "-fsanitize=address", "main.cc", "-mno-movbe" @@ -265,6 +272,7 @@ "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wtrampolines", + "-static-libgcc", "-fprofile-instr-generate", "main.cc", "-mno-movbe" 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 dc9bdbe0..5228e12b 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_specific_args.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_specific_args.json @@ -21,6 +21,7 @@ "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wtrampolines", + "-static-libgcc", "-march=goldmont", "main.cc", "-mno-movbe" @@ -55,6 +56,7 @@ "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wtrampolines", + "-static-libgcc", "-march=goldmont-plus", "main.cc", "-mno-movbe" @@ -89,6 +91,7 @@ "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wtrampolines", + "-static-libgcc", "-march=skylake", "main.cc", "-mno-movbe" 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 be2df4cf..23109bc4 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 @@ -20,6 +20,7 @@ "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wtrampolines", + "-static-libgcc", "main.cc", "-mno-movbe" ] @@ -51,6 +52,7 @@ "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wtrampolines", + "-static-libgcc", "main.cc", "-mno-movbe" ], @@ -86,6 +88,7 @@ "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wtrampolines", + "-static-libgcc", "main.cc", "-mno-movbe" ] @@ -115,6 +118,7 @@ "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wtrampolines", + "-static-libgcc", "main.cc", "-mno-movbe" ], @@ -148,6 +152,7 @@ "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wtrampolines", + "-static-libgcc", "-fno-stack-protector", "-D__KERNEL__", "main.cc", @@ -183,6 +188,7 @@ "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wtrampolines", + "-static-libgcc", "-mthumb", "-fno-stack-protector", "-D__KERNEL__", @@ -217,6 +223,7 @@ "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wtrampolines", + "-static-libgcc", "--sysroot=xyz", "main.cc", "-mno-movbe" |