diff options
| author | Ryan Prichard <rprichard@google.com> | 2024-04-25 19:18:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-25 19:18:08 +0000 |
| commit | 686803d2a996bc34206fc15e3d1b5b035f490201 (patch) | |
| tree | 927a69be06435e5ad19497663071ab3824be2fe0 | |
| parent | c5be8dfe7c14b4ec16960f065fc54d4ba0305b18 (diff) | |
| parent | d162eb922ac9427083d41ef93891d007f2b904b6 (diff) | |
| download | bionic-686803d2a996bc34206fc15e3d1b5b035f490201.tar.gz | |
Merge "Switch the loader to a noexcept version of libc++" into main
| -rw-r--r-- | linker/Android.bp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/linker/Android.bp b/linker/Android.bp index e1a5a91c6..1ede380de 100644 --- a/linker/Android.bp +++ b/linker/Android.bp @@ -367,7 +367,9 @@ cc_defaults { "liblinker_main", "liblinker_malloc", - "libc++_static", + // Use a version of libc++ built without exceptions, because accessing EH globals uses + // ELF TLS, which is not supported in the loader. + "libc++_static_noexcept", "libc_nomalloc", "libc_dynamic_dispatch", "libm", @@ -434,7 +436,7 @@ cc_binary { "linker_debuggerd_android.cpp", ], static_libs: [ - "libc++demangle", + "libc++demangle_noexcept", "libdebuggerd_handler_fallback", ], }, |