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

Merge "Enable safe ICF with LLD."

Browse Source 
am: 63c6361f91

Change-Id: I3aef8c5b647870e1d2e9b4aed538f2f117955198
This commit is contained in:
Peter Collingbourne
2018-10-26 18:14:17 -07:00
committed by android-build-merger
parent a6847014f2 63c6361f91
commit e77fe6ac08
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cc/config/clang.go
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",

4
cc/object.go
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()
} }