StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Enable safe ICF for all devices" am: f7e79a591c am: 660e778db6

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1649333

Change-Id: Iedd890db0c4d5c65e3eb5b5d94808efa23208ea1
This commit is contained in:
Treehugger Robot
2021-03-25 10:02:54 +00:00
committed by Automerger Merge Worker
parent 8729dfc636 660e778db6
commit ef42232afb
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cc/config/arm64_device.go
View File

@@ -46,7 +46,6 @@ var (
arm64Ldflags = []string{ arm64Ldflags = []string{
"-Wl,--hash-style=gnu", "-Wl,--hash-style=gnu",
"-Wl,-z,separate-code", "-Wl,-z,separate-code",
"-Wl,--icf=safe",
} }
arm64Lldflags = append(ClangFilterUnknownLldflags(arm64Ldflags), arm64Lldflags = append(ClangFilterUnknownLldflags(arm64Ldflags),
@@ -128,10 +127,10 @@ func init() {
var ( var (
arm64ClangArchVariantCflagsVar = map[string]string{ arm64ClangArchVariantCflagsVar = map[string]string{
"armv8-a": "${config.Arm64ClangArmv8ACflags}", "armv8-a": "${config.Arm64ClangArmv8ACflags}",
"armv8-a-branchprot": "${config.Arm64ClangArmv8ABranchProtCflags}", "armv8-a-branchprot": "${config.Arm64ClangArmv8ABranchProtCflags}",
"armv8-2a": "${config.Arm64ClangArmv82ACflags}", "armv8-2a": "${config.Arm64ClangArmv82ACflags}",
"armv8-2a-dotprod": "${config.Arm64ClangArmv82ADotprodCflags}", "armv8-2a-dotprod": "${config.Arm64ClangArmv82ADotprodCflags}",
} }
arm64ClangCpuVariantCflagsVar = map[string]string{ arm64ClangCpuVariantCflagsVar = map[string]string{

1
cc/config/arm_device.go
View File

@@ -34,7 +34,6 @@ var (
armCppflags = []string{} armCppflags = []string{}
armLdflags = []string{ armLdflags = []string{
"-Wl,--icf=safe",
"-Wl,--hash-style=gnu", "-Wl,--hash-style=gnu",
"-Wl,-m,armelf", "-Wl,-m,armelf",
} }

1
cc/config/global.go
View File

@@ -97,6 +97,7 @@ var (
"-Wl,--exclude-libs,libgcc_stripped.a", "-Wl,--exclude-libs,libgcc_stripped.a",
"-Wl,--exclude-libs,libunwind_llvm.a", "-Wl,--exclude-libs,libunwind_llvm.a",
"-Wl,--exclude-libs,libunwind.a", "-Wl,--exclude-libs,libunwind.a",
"-Wl,--icf=safe",
} }
deviceGlobalLldflags = append(ClangFilterUnknownLldflags(deviceGlobalLdflags), deviceGlobalLldflags = append(ClangFilterUnknownLldflags(deviceGlobalLdflags),