summaryrefslogtreecommitdiff
path: root/linker
diff options
context:
space:
mode:
authorRyan Prichard <rprichard@google.com>2020-12-16 03:37:22 -0800
committerRyan Prichard <rprichard@google.com>2021-01-14 17:35:05 -0800
commitcdf7175fa5a5e684c3ba23082a313f394f61ef72 (patch)
tree6cae1402e4fff658478271c21781ae822c0de686 /linker
parent315969a67eb09607f278cd17ae1637bbf661a559 (diff)
Switch libc.so and linker to prebuilt LLVM libunwind
For libc.so, use a special build of libunwind.a whose symbols aren't hidden ("libunwind-exported"), because libc.so exports the _Unwind_* APIs. Bug: http://b/153025717 Test: bionic unit tests Change-Id: I7435e076ec8cc4410e3e6086d3cf5d2c6011c80c
Diffstat (limited to 'linker')
-rw-r--r--linker/Android.bp5
1 files changed, 1 insertions, 4 deletions
diff --git a/linker/Android.bp b/linker/Android.bp
index 3ebae59d9..efda312e7 100644
--- a/linker/Android.bp
+++ b/linker/Android.bp
@@ -232,19 +232,15 @@ cc_defaults {
arch: {
arm: {
srcs: [":linker_sources_arm"],
- static_libs: ["libunwind_llvm"],
},
arm64: {
srcs: [":linker_sources_arm64"],
- static_libs: ["libgcc_stripped"],
},
x86: {
srcs: [":linker_sources_x86"],
- static_libs: ["libgcc_stripped"],
},
x86_64: {
srcs: [":linker_sources_x86_64"],
- static_libs: ["libgcc_stripped"],
},
},
@@ -292,6 +288,7 @@ cc_defaults {
"libc_nomalloc",
"libc_dynamic_dispatch",
"libm",
+ "libunwind",
],
// Ensure that if the linker needs __gnu_Unwind_Find_exidx, then the linker will have a