pa-fazil
/
android_bionic
mirror of https://github.com/fazilsheik96/android_bionic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pre-M and GCC compatibility for crtbegin. 

We're going to start using the bionic sources for the NDK CRT
objects, so we need to avoid using symbols that weren't around in
early versions of Android. The NDK is currently building the CRT
objects with GCC as well (there were some segfaults that have yet to
be diagnosed), so move `__used` to the GCC compatible location.

Test: treehugger
Bug: None
Change-Id: I1f5c23eafadc2e3bc0b84bc3305f79a04d35c7d8
This commit is contained in:
Dan Albert 2018-01-24 13:19:08 -08:00
parent 73871ad09b
commit 2e2c72d61f
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libc/arch-common/bionic/crtbegin.c
View File

@ -36,7 +36,7 @@ SECTION(".init_array") void (*__INIT_ARRAY__)(void) = (void (*)(void)) -1;
SECTION(".fini_array") void (*__FINI_ARRAY__)(void) = (void (*)(void)) -1;
#undef SECTION
static void _start_main(void* raw_args) __used {
__used static void _start_main(void* raw_args) {
structors_array_t array;
array.preinit_array = &__PREINIT_ARRAY__;
array.init_array = &__INIT_ARRAY__;

7
libc/arch-common/bionic/pthread_atfork.h
View File

@ -14,6 +14,12 @@
* limitations under the License.
*/
#include <android/api-level.h>
// __register_atfork wasn't available until android-23. We need to build a
// pre-23 and 23+ version of crtbegin.
#if __ANDROID_API__ >= __ANDROID_API_M__
extern void* __dso_handle;
extern int __register_atfork(void (*prepare)(void), void (*parent)(void), void (*child)(void), void* dso);
@ -27,3 +33,4 @@ int pthread_atfork(void (*prepare)(void), void (*parent)(void), void (*child)(vo
return __register_atfork(prepare, parent, child, &__dso_handle);
}
#endif /* __ANDROID_API__ >= __ANDROID_API_M__ */