diff options
| author | Ryan Prichard <rprichard@google.com> | 2021-02-02 00:30:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-02-02 00:30:03 +0000 |
| commit | 15ade069b10f7f5291e48c01db2da4852dae04b7 (patch) | |
| tree | ede166a4daad75b9d7ee778a9657a984d8447aae | |
| parent | bfa368860619279b606c316487f7d40e99e18601 (diff) | |
| parent | c22562ce6f40ece50c4c0de4a455d6690540e844 (diff) | |
| download | bionic-15ade069b10f7f5291e48c01db2da4852dae04b7.tar.gz | |
Merge changes from topic "builtins-exported"
* changes:
Use exported variants of arm32/x86 builtins
Fix -Wl,--exclude-libs typo: x86->i686
| -rw-r--r-- | libc/Android.bp | 9 | ||||
| -rw-r--r-- | libdl/Android.bp | 4 | ||||
| -rw-r--r-- | libm/Android.bp | 5 | ||||
| -rw-r--r-- | linker/Android.bp | 2 |
4 files changed, 17 insertions, 3 deletions
diff --git a/libc/Android.bp b/libc/Android.bp index 8a5b2d997..1bced2e76 100644 --- a/libc/Android.bp +++ b/libc/Android.bp @@ -1668,11 +1668,14 @@ cc_library { ldflags: ["-Wl,--hash-style=both"], version_script: ":libc.arm.map", + no_libcrt: true, shared: { srcs: [":libc_sources_shared_arm"], // special for arm cflags: ["-DCRT_LEGACY_WORKAROUND"], + // For backwards-compatibility, some arm32 builtins are exported from libc.so. + static_libs: ["libclang_rt.builtins-arm-android-exported"], }, // Arm 32 bit does not produce complete exidx unwind information @@ -1698,6 +1701,12 @@ cc_library { ldflags: ["-Wl,--hash-style=both"], version_script: ":libc.x86.map", + no_libcrt: true, + + shared: { + // For backwards-compatibility, some x86 builtins are exported from libc.so. + static_libs: ["libclang_rt.builtins-i686-android-exported"], + }, // Leave the symbols in the shared library so that stack unwinders can produce // meaningful name resolution. diff --git a/libdl/Android.bp b/libdl/Android.bp index 91f85f916..5c9fc9ca0 100644 --- a/libdl/Android.bp +++ b/libdl/Android.bp @@ -59,7 +59,7 @@ cc_library { "-Wl,--exclude-libs=libgcc_stripped.a", "-Wl,--exclude-libs=libclang_rt.builtins-arm-android.a", "-Wl,--exclude-libs=libclang_rt.builtins-aarch64-android.a", - "-Wl,--exclude-libs=libclang_rt.builtins-x86-android.a", + "-Wl,--exclude-libs=libclang_rt.builtins-i686-android.a", "-Wl,--exclude-libs=libclang_rt.builtins-x86_64-android.a", ], @@ -156,7 +156,7 @@ cc_library { "-Wl,--exclude-libs=libgcc_stripped.a", "-Wl,--exclude-libs=libclang_rt.builtins-arm-android.a", "-Wl,--exclude-libs=libclang_rt.builtins-aarch64-android.a", - "-Wl,--exclude-libs=libclang_rt.builtins-x86-android.a", + "-Wl,--exclude-libs=libclang_rt.builtins-i686-android.a", "-Wl,--exclude-libs=libclang_rt.builtins-x86_64-android.a", ], diff --git a/libm/Android.bp b/libm/Android.bp index 21be51ba0..735b1cf71 100644 --- a/libm/Android.bp +++ b/libm/Android.bp @@ -287,6 +287,11 @@ cc_library { pack_relocations: false, ldflags: ["-Wl,--hash-style=both"], version_script: ":libm.arm.map", + no_libcrt: true, + shared: { + // For backwards-compatibility, some arm32 builtins are exported from libm.so. + static_libs: ["libclang_rt.builtins-arm-android-exported"], + }, }, arm64: { diff --git a/linker/Android.bp b/linker/Android.bp index efda312e7..6f5d46535 100644 --- a/linker/Android.bp +++ b/linker/Android.bp @@ -409,7 +409,7 @@ cc_library { "-Wl,--exclude-libs=libgcc_stripped.a", "-Wl,--exclude-libs=libclang_rt.builtins-arm-android.a", "-Wl,--exclude-libs=libclang_rt.builtins-aarch64-android.a", - "-Wl,--exclude-libs=libclang_rt.builtins-x86-android.a", + "-Wl,--exclude-libs=libclang_rt.builtins-i686-android.a", "-Wl,--exclude-libs=libclang_rt.builtins-x86_64-android.a", ], |