am c0cd9ce5: Merge "Revert "Fix arm64 build""

* commit 'c0cd9ce5df753161aabb393420a8ada8f369b551':
  Revert "Fix arm64 build"
This commit is contained in:
Dmitriy Ivanov 2014-09-04 23:22:37 +00:00 committed by Android Git Automerger
commit 24d40f2df0

View File

@ -36,10 +36,15 @@ void (*__PREINIT_ARRAY__)(void) = (void (*)(void)) -1;
__attribute__ ((section (".init_array"))) __attribute__ ((section (".init_array")))
void (*__INIT_ARRAY__)(void) = (void (*)(void)) -1; void (*__INIT_ARRAY__)(void) = (void (*)(void)) -1;
__attribute__ ((section (".fini_array")))
void (*__FINI_ARRAY__)(void) = (void (*)(void)) -1;
__LIBC_HIDDEN__ void do_arm64_start(void* raw_args) { __LIBC_HIDDEN__ void do_arm64_start(void* raw_args) {
structors_array_t array; structors_array_t array;
array.preinit_array = &__PREINIT_ARRAY__; array.preinit_array = &__PREINIT_ARRAY__;
array.init_array = &__INIT_ARRAY__; array.init_array = &__INIT_ARRAY__;
array.fini_array = &__FINI_ARRAY__;
__libc_init(raw_args, NULL, &main, &array); __libc_init(raw_args, NULL, &main, &array);
} }