Merge "Enable safe ICF with LLD."

This commit is contained in:
Peter Collingbourne 2018-10-27 00:59:55 +00:00 committed by Gerrit Code Review
commit 63c6361f91
2 changed files with 4 additions and 1 deletions

View file

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

View file

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