Merge "Enable safe ICF with LLD." am: 63c6361f91

am: e77fe6ac08

Change-Id: I4b7d33a3273a9965c9e1bd72fc770f5f63b889c0

cc/config/clang.go

@@ -86,7 +86,6 @@ var ClangUnknownCflags = sorted([]string{
 // Ldflags that should be filtered out when linking with clang lld
 var ClangUnknownLldflags = sorted([]string{
 	"-fuse-ld=gold",
-	"-Wl,--icf=safe",
 	"-Wl,--fix-cortex-a8",
 	"-Wl,--no-fix-cortex-a8",
 	"-Wl,-m,aarch64_elf64_le_vec",

cc/object.go

@@ -39,6 +39,10 @@ func ObjectFactory() android.Module {
 		baseLinker: NewBaseLinker(nil),
 	}
 	module.compiler = NewBaseCompiler()
+
+	// Clang's address-significance tables are incompatible with ld -r.
+	module.compiler.appendCflags([]string{"-fno-addrsig"})
+
 	module.stl = &stl{}
 	return module.Init()
 }