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

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1649333 Change-Id: Iedd890db0c4d5c65e3eb5b5d94808efa23208ea1
2021-03-25 10:02:54 +00:00
parent 8729dfc636 660e778db6
commit ef42232afb
3 changed files with 4 additions and 5 deletions
--- a/cc/config/arm64_device.go
+++ b/cc/config/arm64_device.go
@@ -46,7 +46,6 @@ var (
 	arm64Ldflags = []string{
 		"-Wl,--hash-style=gnu",
 		"-Wl,-z,separate-code",
-		"-Wl,--icf=safe",
 	}

 	arm64Lldflags = append(ClangFilterUnknownLldflags(arm64Ldflags),
--- a/cc/config/arm_device.go
+++ b/cc/config/arm_device.go
@@ -34,7 +34,6 @@ var (
 	armCppflags = []string{}

 	armLdflags = []string{
-		"-Wl,--icf=safe",
 		"-Wl,--hash-style=gnu",
 		"-Wl,-m,armelf",
 	}
--- a/cc/config/global.go
+++ b/cc/config/global.go
@@ -97,6 +97,7 @@ var (
 		"-Wl,--exclude-libs,libgcc_stripped.a",
 		"-Wl,--exclude-libs,libunwind_llvm.a",
 		"-Wl,--exclude-libs,libunwind.a",
+		"-Wl,--icf=safe",
 	}

 	deviceGlobalLldflags = append(ClangFilterUnknownLldflags(deviceGlobalLdflags),