From 646e058136d59671d5d32d93bedbb71004a9ce73 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Thu, 7 Feb 2013 12:16:10 -0800 Subject: Fix x86 build, remove void* arithmetic. Change-Id: Idc7f14af2e094ac33de315e808176237af063bb8 --- libc/arch-arm/bionic/crtbegin.c | 3 ++- libc/arch-x86/bionic/crtbegin.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'libc') diff --git a/libc/arch-arm/bionic/crtbegin.c b/libc/arch-arm/bionic/crtbegin.c index cc587975d..1bcb335a3 100644 --- a/libc/arch-arm/bionic/crtbegin.c +++ b/libc/arch-arm/bionic/crtbegin.c @@ -28,6 +28,7 @@ #include "../../bionic/libc_init_common.h" #include +#include __attribute__ ((section (".preinit_array"))) void (*__PREINIT_ARRAY__)(void) = (void (*)(void)) -1; @@ -44,7 +45,7 @@ __LIBC_HIDDEN__ void _start() { array.init_array = &__INIT_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); } diff --git a/libc/arch-x86/bionic/crtbegin.c b/libc/arch-x86/bionic/crtbegin.c index 63e58a6d2..43e9306ba 100755 --- a/libc/arch-x86/bionic/crtbegin.c +++ b/libc/arch-x86/bionic/crtbegin.c @@ -28,6 +28,7 @@ #include "../../bionic/libc_init_common.h" #include +#include __attribute__ ((section (".preinit_array"))) void (*__PREINIT_ARRAY__)(void) = (void (*)(void)) -1; @@ -46,7 +47,7 @@ void _start() { array.init_array = &__INIT_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); } -- cgit v1.2.3