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

Delete definitions of __aeabi_unwind_cpp_pr0.

Browse source 
These are no longer necessary now that LLVM no longer emits references to
this symbol on Android.

Bug: 144430859
Change-Id: I6c43338f755ce5a79e2df36bd3f2006a748fab27
This commit is contained in:
Peter Collingbourne 2020-01-10 10:40:11 -08:00
parent 9c5c87ed05
commit 27c1e22036
3 changed files with 0 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libdl/libdl.cpp
View file

@ -138,16 +138,4 @@ int android_get_application_target_sdk_version() {
return __loader_android_get_application_target_sdk_version(); return __loader_android_get_application_target_sdk_version();
} }
#if defined(__arm__)
// An arm32 unwinding table has an R_ARM_NONE relocation to
// __aeabi_unwind_cpp_pr0. This shared library will never invoke the unwinder,
// so it doesn't actually need the routine. Define a dummy version here,
// because the real version calls libc functions (e.g. memcpy, abort), which
// would create a dependency cycle with libc.so.
__attribute__((visibility("hidden")))
void __aeabi_unwind_cpp_pr0() {
__builtin_trap();
}
#endif
} // extern "C" } // extern "C"

12
libdl/libdl_android.cpp
View file

@ -115,16 +115,4 @@ struct android_namespace_t* android_get_exported_namespace(const char* name) {
return __loader_android_get_exported_namespace(name); return __loader_android_get_exported_namespace(name);
} }
#if defined(__arm__)
// An arm32 unwinding table has an R_ARM_NONE relocation to
// __aeabi_unwind_cpp_pr0. This shared library will never invoke the unwinder,
// so it doesn't actually need the routine. Define a dummy version here,
// because the real version calls libc functions (e.g. memcpy, abort), which
// would create a dependency cycle with libc.so.
__attribute__((visibility("hidden")))
void __aeabi_unwind_cpp_pr0() {
__builtin_trap();
}
#endif
} // extern "C" } // extern "C"

12
linker/ld_android.cpp
View file

@ -58,15 +58,3 @@ __strong_alias(__loader_shared_globals, __internal_linker_error);
__strong_alias(__loader_dl_unwind_find_exidx, __internal_linker_error); __strong_alias(__loader_dl_unwind_find_exidx, __internal_linker_error);
#endif #endif
__strong_alias(rtld_db_dlactivity, __internal_linker_error); __strong_alias(rtld_db_dlactivity, __internal_linker_error);
#if defined(__arm__)
// An arm32 unwinding table has an R_ARM_NONE relocation to
// __aeabi_unwind_cpp_pr0. This shared library will never invoke the unwinder,
// so it doesn't actually need the routine. Define a dummy version here,
// because the real version calls libc functions (e.g. memcpy, abort), which
// would create a dependency cycle with libc.so.
__attribute__((visibility("hidden")))
extern "C" void __aeabi_unwind_cpp_pr0() {
__builtin_trap();
}
#endif