generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am f6afd3b6: Merge "Fix x86 build, remove void* arithmetic."

Browse Source 
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'f6afd3b670e23f56bf341d12136416aee17ea249':
  Fix x86 build, remove void* arithmetic.
This commit is contained in:
Elliott Hughes
2013-02-07 12:34:24 -08:00
committed by Android Git Automerger
parent 8ddef40dad f6afd3b670
commit 5bb67760f0
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libc/arch-arm/bionic/crtbegin.c
View File

@@ -28,6 +28,7 @@
#include "../../bionic/libc_init_common.h" #include "../../bionic/libc_init_common.h"
#include <stddef.h> #include <stddef.h>
#include <stdint.h>
__attribute__ ((section (".preinit_array"))) __attribute__ ((section (".preinit_array")))
void (*__PREINIT_ARRAY__)(void) = (void (*)(void)) -1; void (*__PREINIT_ARRAY__)(void) = (void (*)(void)) -1;
@@ -44,7 +45,7 @@ __LIBC_HIDDEN__ void _start() {
array.init_array = &__INIT_ARRAY__; array.init_array = &__INIT_ARRAY__;
array.fini_array = &__FINI_ARRAY__; array.fini_array = &__FINI_ARRAY__;
void* raw_args = __builtin_frame_address(0) + sizeof(void*); void* raw_args = (void*) ((uintptr_t) __builtin_frame_address(0) + sizeof(void*));
__libc_init(raw_args, NULL, &main, &array); __libc_init(raw_args, NULL, &main, &array);
} }

3
libc/arch-x86/bionic/crtbegin.c
View File

@@ -28,6 +28,7 @@
#include "../../bionic/libc_init_common.h" #include "../../bionic/libc_init_common.h"
#include <stddef.h> #include <stddef.h>
#include <stdint.h>
__attribute__ ((section (".preinit_array"))) __attribute__ ((section (".preinit_array")))
void (*__PREINIT_ARRAY__)(void) = (void (*)(void)) -1; void (*__PREINIT_ARRAY__)(void) = (void (*)(void)) -1;
@@ -46,7 +47,7 @@ void _start() {
array.init_array = &__INIT_ARRAY__; array.init_array = &__INIT_ARRAY__;
array.fini_array = &__FINI_ARRAY__; array.fini_array = &__FINI_ARRAY__;
void* raw_args = __builtin_frame_address(0) + sizeof(void*); void* raw_args = (void*) ((uintptr_t) __builtin_frame_address(0) + sizeof(void*));
__libc_init(raw_args, NULL, &main, &array); __libc_init(raw_args, NULL, &main, &array);
} }

1
linker/arch/x86/begin.c
View File

@@ -26,6 +26,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#include <stdint.h>
#include <sys/cdefs.h> #include <sys/cdefs.h>
extern unsigned __linker_init(void* raw_args); extern unsigned __linker_init(void* raw_args);