Stop exporting certain deprecated unwinder symbols from libc.so and libm.so.
We have data that indicates that we no longer need to export the libgcc
unwinder's implementation detail symbols from libc.so, as well as the entire
unwinder interface from libm.so, so stop exporting them.
Bug: 144430859
Change-Id: Iebb591c4a121abe6368d9854ec96819abe70a006
diff --git a/libc/libc.map.txt b/libc/libc.map.txt
index 8e843af..01c9b0c 100644
--- a/libc/libc.map.txt
+++ b/libc/libc.map.txt
@@ -1521,11 +1521,6 @@
LIBC_PRIVATE {
global:
- ___Unwind_Backtrace; # arm
- ___Unwind_ForcedUnwind; # arm
- ___Unwind_RaiseException; # arm
- ___Unwind_Resume; # arm
- ___Unwind_Resume_or_Rethrow; # arm
__accept4; # arm x86 mips
__adddf3; # arm
__addsf3; # arm
@@ -1635,24 +1630,8 @@
__getdents64; # arm x86 mips
__gnu_ldivmod_helper; # arm
__gnu_uldivmod_helper; # arm
- __gnu_Unwind_Backtrace; # arm
- __gnu_unwind_execute; # arm
__gnu_Unwind_Find_exidx; # arm
- __gnu_Unwind_ForcedUnwind; # arm
__gnu_unwind_frame; # arm
- __gnu_Unwind_RaiseException; # arm
- __gnu_Unwind_Restore_VFP; # arm
- __gnu_Unwind_Restore_VFP_D; # arm
- __gnu_Unwind_Restore_VFP_D_16_to_31; # arm
- __gnu_Unwind_Restore_WMMXC; # arm
- __gnu_Unwind_Restore_WMMXD; # arm
- __gnu_Unwind_Resume; # arm
- __gnu_Unwind_Resume_or_Rethrow; # arm
- __gnu_Unwind_Save_VFP; # arm
- __gnu_Unwind_Save_VFP_D; # arm
- __gnu_Unwind_Save_VFP_D_16_to_31; # arm
- __gnu_Unwind_Save_WMMXC; # arm
- __gnu_Unwind_Save_WMMXD; # arm
__gtdf2; # arm
__gtsf2; # arm
__ledf2; # arm
@@ -1671,7 +1650,6 @@
__popcount_tab; # arm
__popcountsi2; # arm x86 mips
__pthread_gettid; # arm x86 mips
- __restore_core_regs; # arm
__sclose; # arm x86 mips
__sdidinit; # arm x86 mips
__set_errno; # arm x86 mips
@@ -1701,8 +1679,6 @@
_Unwind_Backtrace; # arm
_Unwind_Complete; # arm
_Unwind_DeleteException; # arm
- _Unwind_ForcedUnwind; # arm
- _Unwind_GetCFA; # arm
_Unwind_GetDataRelBase; # arm
_Unwind_GetLanguageSpecificData; # arm
_Unwind_GetRegionStart; # arm
@@ -1711,7 +1687,6 @@
_Unwind_Resume; # arm
_Unwind_Resume_or_Rethrow; # arm
_Unwind_VRS_Get; # arm
- _Unwind_VRS_Pop; # arm
_Unwind_VRS_Set; # arm
android_getaddrinfofornetcontext;
android_gethostbyaddrfornet;
@@ -1735,7 +1710,6 @@
memswap; # arm x86 mips
pthread_attr_getstackaddr; # arm x86 mips
pthread_attr_setstackaddr; # arm x86 mips
- restore_core_regs; # arm
SHA1Final; # arm x86 mips
SHA1Init; # arm x86 mips
SHA1Transform; # arm x86 mips
diff --git a/libm/Android.bp b/libm/Android.bp
index de32185..bf05b17 100644
--- a/libm/Android.bp
+++ b/libm/Android.bp
@@ -286,7 +286,6 @@
pack_relocations: false,
ldflags: ["-Wl,--hash-style=both"],
version_script: ":libm.arm.map",
- whole_static_libs: [ "libgcc_stripped" ],
},
arm64: {
diff --git a/libm/libm.map.txt b/libm/libm.map.txt
index 00ea7ee..24ae50b 100644
--- a/libm/libm.map.txt
+++ b/libm/libm.map.txt
@@ -296,56 +296,14 @@
LIBC_DEPRECATED { # arm mips platform-only
global: # arm mips
- ___Unwind_Backtrace; # arm
- ___Unwind_ForcedUnwind; # arm
- ___Unwind_RaiseException; # arm
- ___Unwind_Resume; # arm
- ___Unwind_Resume_or_Rethrow; # arm
__aeabi_d2lz; # arm
__aeabi_d2ulz; # arm
__aeabi_f2lz; # arm
__aeabi_f2ulz; # arm
__aeabi_l2d; # arm
- __aeabi_unwind_cpp_pr0; # arm
- __aeabi_unwind_cpp_pr1; # arm
- __aeabi_unwind_cpp_pr2; # arm
__fixdfdi; # arm mips
__fixsfdi; # arm mips
__fixunsdfdi; # arm mips
__fixunssfdi; # arm mips
__floatdidf; # arm
- __gnu_Unwind_Backtrace; # arm
- __gnu_unwind_execute; # arm
- __gnu_Unwind_ForcedUnwind; # arm
- __gnu_unwind_frame; # arm
- __gnu_Unwind_RaiseException; # arm
- __gnu_Unwind_Restore_VFP; # arm
- __gnu_Unwind_Restore_VFP_D; # arm
- __gnu_Unwind_Restore_VFP_D_16_to_31; # arm
- __gnu_Unwind_Restore_WMMXC; # arm
- __gnu_Unwind_Restore_WMMXD; # arm
- __gnu_Unwind_Resume; # arm
- __gnu_Unwind_Resume_or_Rethrow; # arm
- __gnu_Unwind_Save_VFP; # arm
- __gnu_Unwind_Save_VFP_D; # arm
- __gnu_Unwind_Save_VFP_D_16_to_31; # arm
- __gnu_Unwind_Save_WMMXC; # arm
- __gnu_Unwind_Save_WMMXD; # arm
- __restore_core_regs; # arm
- _Unwind_Backtrace; # arm
- _Unwind_Complete; # arm
- _Unwind_DeleteException; # arm
- _Unwind_ForcedUnwind; # arm
- _Unwind_GetCFA; # arm
- _Unwind_GetDataRelBase; # arm
- _Unwind_GetLanguageSpecificData; # arm
- _Unwind_GetRegionStart; # arm
- _Unwind_GetTextRelBase; # arm
- _Unwind_RaiseException; # arm
- _Unwind_Resume; # arm
- _Unwind_Resume_or_Rethrow; # arm
- _Unwind_VRS_Get; # arm
- _Unwind_VRS_Pop; # arm
- _Unwind_VRS_Set; # arm
- restore_core_regs; # arm
} LIBC_O; # arm mips