commit 646e058136d59671d5d32d93bedbb71004a9ce73
author Elliott Hughes <enh@google.com> Thu Feb 07 12:16:10 2013 -0800
committer Elliott Hughes <enh@google.com> Thu Feb 07 12:16:10 2013 -0800
tree 354d30a60436bb8a093faf72b56ad2b96abb55b6
parent 2f41531ff9f48dbdaf2ba711e14c669031728e99

Fix x86 build, remove void* arithmetic.

Change-Id: Idc7f14af2e094ac33de315e808176237af063bb8

libc/arch-arm/bionic/crtbegin.c

diff --git a/libc/arch-arm/bionic/crtbegin.c b/libc/arch-arm/bionic/crtbegin.c
index cc58797..1bcb335 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 <stddef.h>
+#include <stdint.h>
 
 __attribute__ ((section (".preinit_array")))
 void (*__PREINIT_ARRAY__)(void) = (void (*)(void)) -1;
@@ -44,7 +45,7 @@
   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);
 }
 

libc/arch-x86/bionic/crtbegin.c

diff --git a/libc/arch-x86/bionic/crtbegin.c b/libc/arch-x86/bionic/crtbegin.c
index 63e58a6..43e9306 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 <stddef.h>
+#include <stdint.h>
 
 __attribute__ ((section (".preinit_array")))
 void (*__PREINIT_ARRAY__)(void) = (void (*)(void)) -1;
@@ -46,7 +47,7 @@
   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);
 }
 

linker/arch/x86/begin.c

diff --git a/linker/arch/x86/begin.c b/linker/arch/x86/begin.c
index cdc98e0..051a16a 100755
--- a/linker/arch/x86/begin.c
+++ b/linker/arch/x86/begin.c
@@ -26,6 +26,7 @@
  * SUCH DAMAGE.
  */
 
+#include <stdint.h>
 #include <sys/cdefs.h>
 
 extern unsigned __linker_init(void* raw_args);