diff options
-rw-r--r-- | compiler_wrapper/aarch64_flags.go | 11 | ||||
-rw-r--r-- | compiler_wrapper/aarch64_flags_test.go | 19 | ||||
-rw-r--r-- | compiler_wrapper/compiler_wrapper.go | 1 | ||||
-rw-r--r-- | compiler_wrapper/testutil_test.go | 1 |
4 files changed, 0 insertions, 32 deletions
diff --git a/compiler_wrapper/aarch64_flags.go b/compiler_wrapper/aarch64_flags.go deleted file mode 100644 index a0d05523..00000000 --- a/compiler_wrapper/aarch64_flags.go +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright 2020 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 - -func processAarch64Flags(builder *commandBuilder) { - if builder.target.arch == "aarch64" { - builder.addPreUserArgs("-mharden-sls=all") - } -} diff --git a/compiler_wrapper/aarch64_flags_test.go b/compiler_wrapper/aarch64_flags_test.go deleted file mode 100644 index 0cb692e2..00000000 --- a/compiler_wrapper/aarch64_flags_test.go +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright 2020 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 TestAddSlsFlagOnAarch64(t *testing.T) { - withTestContext(t, func(ctx *testContext) { - cmd := ctx.must(callCompiler(ctx, ctx.cfg, - ctx.newCommand(clangAarch64, mainCc))) - if err := verifyArgOrder(cmd, "-mharden-sls=all", mainCc); err != nil { - t.Error(err) - } - }) -} diff --git a/compiler_wrapper/compiler_wrapper.go b/compiler_wrapper/compiler_wrapper.go index 49ee0eb0..aa52dfdc 100644 --- a/compiler_wrapper/compiler_wrapper.go +++ b/compiler_wrapper/compiler_wrapper.go @@ -187,7 +187,6 @@ func prepareClangCommand(builder *commandBuilder) (err error) { } builder.addPostUserArgs(builder.cfg.clangPostFlags...) calcCommonPreUserArgs(builder) - processAarch64Flags(builder) return processClangFlags(builder) } diff --git a/compiler_wrapper/testutil_test.go b/compiler_wrapper/testutil_test.go index 8e2377e7..21b7169d 100644 --- a/compiler_wrapper/testutil_test.go +++ b/compiler_wrapper/testutil_test.go @@ -22,7 +22,6 @@ const ( clangAndroid = "./clang" clangTidyAndroid = "./clang-tidy" clangX86_64 = "./x86_64-cros-linux-gnu-clang" - clangAarch64 = "./aarch64-cros-linux-gnu-clang" gccX86_64 = "./x86_64-cros-linux-gnu-gcc" gccX86_64Eabi = "./x86_64-cros-eabi-gcc" gccArmV7 = "./armv7m-cros-linux-gnu-gcc" |