tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Work around b/24465209, do not pack relocation table.

Browse source 
Global flag --pack-dyn-relocs=android is used with clang lld.
For b/24465209, we need to override that with --pack-dyn-relocs=none.

Bug: 80093890
Bug: 24465209
Test: build with USE_CLANG_LLD=true and run dlext.compat_elf_hash_and_relocation_tables
Change-Id: Ic3837446ff0deccf4e66425b39d3b062abcacc5e
This commit is contained in:
Chih-Hung Hsieh 2018-05-23 18:45:53 -07:00
parent 778a84f75b
commit ecbff8382d
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libc/Android.bp
View file

@ -1772,8 +1772,8 @@ cc_library {
arch: {
arm: {
//TODO: This is to work around b/24465209. Remove after root cause is fixed
pack_relocations: false,
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,8 +1806,8 @@ cc_library {
},
x86: {
//TODO: This is to work around b/24465209. Remove after root cause is fixed
pack_relocations: false,
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",
@ -1838,8 +1838,8 @@ cc_library {
//TODO (dimitry): This is to work around b/24465209. Remove after root cause is fixed
arch: {
arm: {
pack_relocations: false,
ldflags: ["-Wl,--hash-style=both"],
use_clang_lld: false,
version_script: "libstdc++.arm.map",
},
arm64: {
@ -1852,8 +1852,8 @@ cc_library {
version_script: "libstdc++.mips64.map",
},
x86: {
pack_relocations: false,
ldflags: ["-Wl,--hash-style=both"],
use_clang_lld: false,
version_script: "libstdc++.x86.map",
},
x86_64: {

4
libdl/Android.bp
View file

@ -49,8 +49,8 @@ cc_library {
arch: {
arm: {
version_script: "libdl.arm.map",
pack_relocations: false,
ldflags: ["-Wl,--hash-style=both"],
use_clang_lld: false,
},
arm64: {
version_script: "libdl.arm64.map",
@ -62,11 +62,11 @@ cc_library {
version_script: "libdl.mips64.map",
},
x86: {
pack_relocations: false,
ldflags: [
"-Wl,--exclude-libs=libgcc_eh.a",
"-Wl,--hash-style=both",
],
use_clang_lld: false,
version_script: "libdl.x86.map",
},
x86_64: {

4
libm/Android.bp
View file

@ -293,8 +293,8 @@ cc_library {
],
},
instruction_set: "arm",
pack_relocations: false,
ldflags: ["-Wl,--hash-style=both"],
use_clang_lld: false,
version_script: "libm.arm.map",
},
@ -421,8 +421,8 @@ cc_library {
],
},
local_include_dirs: ["i387"],
pack_relocations: false,
ldflags: ["-Wl,--hash-style=both"],
use_clang_lld: false,
version_script: "libm.x86.map",
},