LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am fc8ba054: am 70537fd9: Merge "Fix x86_64 alignment in crtbegin"

Browse Source 
* commit 'fc8ba05448008f891833530ec75110e344ff32cd':
  Fix x86_64 alignment in crtbegin
This commit is contained in:
Andrew Hsieh
2014-03-25 21:20:01 +00:00
committed by Android Git Automerger
parent 2a137224a6 fc8ba05448
commit ab8c485447
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ndk/platforms/android-9/arch-x86/src/crtbegin.c
View File

@@ -40,7 +40,9 @@ __attribute__ ((section (".fini_array")))
void (*__FINI_ARRAY__)(void) = (void (*)(void)) -1; void (*__FINI_ARRAY__)(void) = (void (*)(void)) -1;
__LIBC_HIDDEN__ __LIBC_HIDDEN__
#ifdef __i386__
__attribute__((force_align_arg_pointer)) __attribute__((force_align_arg_pointer))
#endif
void _start() { void _start() {
structors_array_t array; structors_array_t array;
array.preinit_array = &__PREINIT_ARRAY__; array.preinit_array = &__PREINIT_ARRAY__;
@@ -48,9 +50,15 @@ void _start() {
array.fini_array = &__FINI_ARRAY__; array.fini_array = &__FINI_ARRAY__;
void* raw_args = (void*) ((uintptr_t) __builtin_frame_address(0) + sizeof(void*)); void* raw_args = (void*) ((uintptr_t) __builtin_frame_address(0) + sizeof(void*));
#ifdef __x86_64__
// 16-byte stack alignment is required by x86_64 ABI
asm("andq $~15, %rsp");
#endif
__libc_init(raw_args, NULL, &main, &array); __libc_init(raw_args, NULL, &main, &array);
} }
#include "__dso_handle.h" #include "__dso_handle.h"
#include "atexit.h" #include "atexit.h"
#include "__stack_chk_fail_local.h" #ifdef __i386__
# include "../../arch-x86/bionic/__stack_chk_fail_local.h"
#endif