Work around b/24465209, do not use clang lld
See longer explanation in b/80093890. Clang lld does not generate expected DT_REL and DT_RELA tags with --hash-style=both and --pack-dyn-relocs=android. I am not sure about the extent of b/24465209, so I would rather not to use lld for these .so files for now. Bug: 80093890 Bug: 24465209 Test: build with USE_CLANG_LLD=true and run dlext.compat_elf_hash_and_relocation_tables Change-Id: I94e9fe8d687daeadb0182ae26596ca11d3f8bd9b
This commit is contained in:
parent
a6a56784e0
commit
0fc5df0fde
|
@ -1773,6 +1773,7 @@ cc_library {
|
|||
arm: {
|
||||
//TODO: This is to work around b/24465209. Remove after root cause is fixed
|
||||
ldflags: ["-Wl,--hash-style=both"],
|
||||
use_clang_lld: false,
|
||||
|
||||
// Don't re-export new/delete and friends, even if the compiler really wants to.
|
||||
version_script: "libc.arm.map",
|
||||
|
@ -1806,6 +1807,7 @@ cc_library {
|
|||
x86: {
|
||||
//TODO: This is to work around b/24465209. Remove after root cause is fixed
|
||||
ldflags: ["-Wl,--hash-style=both"],
|
||||
use_clang_lld: false,
|
||||
|
||||
// Don't re-export new/delete and friends, even if the compiler really wants to.
|
||||
version_script: "libc.x86.map",
|
||||
|
@ -1837,6 +1839,7 @@ cc_library {
|
|||
arch: {
|
||||
arm: {
|
||||
ldflags: ["-Wl,--hash-style=both"],
|
||||
use_clang_lld: false,
|
||||
version_script: "libstdc++.arm.map",
|
||||
},
|
||||
arm64: {
|
||||
|
@ -1850,6 +1853,7 @@ cc_library {
|
|||
},
|
||||
x86: {
|
||||
ldflags: ["-Wl,--hash-style=both"],
|
||||
use_clang_lld: false,
|
||||
version_script: "libstdc++.x86.map",
|
||||
},
|
||||
x86_64: {
|
||||
|
|
|
@ -50,6 +50,7 @@ cc_library {
|
|||
arm: {
|
||||
version_script: "libdl.arm.map",
|
||||
ldflags: ["-Wl,--hash-style=both"],
|
||||
use_clang_lld: false,
|
||||
},
|
||||
arm64: {
|
||||
version_script: "libdl.arm64.map",
|
||||
|
@ -65,6 +66,7 @@ cc_library {
|
|||
"-Wl,--exclude-libs=libgcc_eh.a",
|
||||
"-Wl,--hash-style=both",
|
||||
],
|
||||
use_clang_lld: false,
|
||||
version_script: "libdl.x86.map",
|
||||
},
|
||||
x86_64: {
|
||||
|
|
|
@ -294,6 +294,7 @@ cc_library {
|
|||
},
|
||||
instruction_set: "arm",
|
||||
ldflags: ["-Wl,--hash-style=both"],
|
||||
use_clang_lld: false,
|
||||
version_script: "libm.arm.map",
|
||||
},
|
||||
|
||||
|
@ -421,6 +422,7 @@ cc_library {
|
|||
},
|
||||
local_include_dirs: ["i387"],
|
||||
ldflags: ["-Wl,--hash-style=both"],
|
||||
use_clang_lld: false,
|
||||
version_script: "libm.x86.map",
|
||||
},
|
||||
|
||||
|
|
Loading…
Reference in New Issue