Merge "Enable safe ICF for all devices"

2021-03-25 08:59:00 +00:00 · 2021-03-25 08:59:00 +00:00 · f7e79a591c
parent 8b086655cd 5818b9344f
commit f7e79a591c
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),