diff options
| author | Michael Cheng <michael.cheng@intel.com> | 2021-02-11 11:04:52 -0800 |
|---|---|---|
| committer | Manoj Gupta <manojgupta@chromium.org> | 2021-02-11 20:29:18 +0000 |
| commit | 21929ca0b632ed328920391488eeaae4811eb617 (patch) | |
| tree | c7bc7dff68eb2a211f0cdc5233709c70263f0223 /compiler_wrapper | |
| parent | 1f5d6951b5ffb60b7eee6128994f22791c07dc7b (diff) | |
| download | toolchain-utils-21929ca0b632ed328920391488eeaae4811eb617.tar.gz | |
gcc: Remove deprecated conversions
Recent update to gcc 10 supports up to tigerlake. This CL
removes depcreated march conversions
BUG=chromium:1167265
TEST=Verify unit tests pass
Change-Id: Ic20c9901963deb0e9985f4bcd57c7651cb8aeb3b
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/2691128
Commit-Queue: Michael Cheng <michael.cheng@intel.com>
Tested-by: Michael Cheng <michael.cheng@intel.com>
Reviewed-by: Manoj Gupta <manojgupta@chromium.org>
Diffstat (limited to 'compiler_wrapper')
4 files changed, 6 insertions, 16 deletions
diff --git a/compiler_wrapper/gcc_flags.go b/compiler_wrapper/gcc_flags.go index 1f4a6491..70aa2fd9 100644 --- a/compiler_wrapper/gcc_flags.go +++ b/compiler_wrapper/gcc_flags.go @@ -12,11 +12,6 @@ func processGccFlags(builder *commandBuilder) { // Conversion for flags supported by clang but not gcc. clangToGcc := map[string]string{ "-march=alderlake": "-march=skylake", - "-march=goldmont": "-march=silvermont", - "-march=goldmont-plus": "-march=silvermont", - "-march=skylake": "-march=corei7", - "-march=tigerlake": "-march=corei7", - "-march=tremont": "-march=silvermont", } builder.transformArgs(func(arg builderArg) string { diff --git a/compiler_wrapper/gcc_flags_test.go b/compiler_wrapper/gcc_flags_test.go index 856557d1..adf72018 100644 --- a/compiler_wrapper/gcc_flags_test.go +++ b/compiler_wrapper/gcc_flags_test.go @@ -35,11 +35,6 @@ func TestConvertClangToGccFlags(t *testing.T) { out string }{ {"-march=alderlake", "-march=skylake"}, - {"-march=goldmont", "-march=silvermont"}, - {"-march=goldmont-plus", "-march=silvermont"}, - {"-march=skylake", "-march=corei7"}, - {"-march=tigerlake", "-march=corei7"}, - {"-march=tremont", "-march=silvermont"}, } for _, tt := range tests { 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 787bb6dc..bade6d95 100644 --- a/compiler_wrapper/testdata/cros_hardened_golden/gcc_specific_args.json +++ b/compiler_wrapper/testdata/cros_hardened_golden/gcc_specific_args.json @@ -26,7 +26,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", - "-march=silvermont", + "-march=goldmont", "main.cc", "-mno-movbe" ], @@ -65,7 +65,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", - "-march=silvermont", + "-march=goldmont-plus", "main.cc", "-mno-movbe" ], @@ -104,7 +104,7 @@ "-pie", "-D_FORTIFY_SOURCE=2", "-fno-omit-frame-pointer", - "-march=corei7", + "-march=skylake", "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 c2f7cd07..dc9bdbe0 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_specific_args.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_specific_args.json @@ -21,7 +21,7 @@ "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wtrampolines", - "-march=silvermont", + "-march=goldmont", "main.cc", "-mno-movbe" ], @@ -55,7 +55,7 @@ "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wtrampolines", - "-march=silvermont", + "-march=goldmont-plus", "main.cc", "-mno-movbe" ], @@ -89,7 +89,7 @@ "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", "-Wtrampolines", - "-march=corei7", + "-march=skylake", "main.cc", "-mno-movbe" ], |