commit d413626b7ee75da998d8366af576b75071fb5d74
author Andrew Hsieh <andrewhsieh@google.com> Sun May 20 23:59:05 2012 -0700
committer android code review <noreply-gerritcodereview@google.com> Sun May 20 23:59:06 2012 -0700
tree 8d7fa9b5c49e3e7921177eae0d449fa840cb7e94
parent cd484b7fcd18d5f967cadbaeb6d27b62f015a5e2
parent 41b4504f4833adf65613457101fbbe4662a4c892

Merge "Change the -Ttext value in hexadecimal for ld.gold"

Android.mk

diff --git a/Android.mk b/Android.mk
index 50034ba..3f57042 100644
--- a/Android.mk
+++ b/Android.mk
@@ -46,7 +46,7 @@
 $(LOCAL_BUILT_MODULE) : PRIVATE_LINK_SCRIPT :=
 $(LOCAL_BUILT_MODULE) : PRIVATE_LIBS :=
 $(LOCAL_BUILT_MODULE) : PRIVATE_RAW_EXECUTABLE_LDFLAGS := \
-	-nostdlib -N -Ttext=7C00 -melf_i386
+	-nostdlib -N -Ttext=0x7C00 -melf_i386
 
 ###################################################################
 ###################################################################
@@ -109,7 +109,7 @@
 $(LOCAL_BUILT_MODULE) : PRIVATE_LINK_SCRIPT :=
 $(LOCAL_BUILT_MODULE) : PRIVATE_LIBS :=
 $(LOCAL_BUILT_MODULE) : PRIVATE_RAW_EXECUTABLE_LDFLAGS := \
-	-nostdlib -N -Ttext=8200 -melf_i386
+	-nostdlib -N -Ttext=0x8200 -melf_i386
 
 #############################################
 ## Generate the stage2 start file  (2) + (3)
@@ -159,7 +159,7 @@
 $(LOCAL_BUILT_MODULE) : PRIVATE_LINK_SCRIPT :=
 $(LOCAL_BUILT_MODULE) : PRIVATE_LIBS :=
 $(LOCAL_BUILT_MODULE) : PRIVATE_RAW_EXECUTABLE_LDFLAGS := \
-	-nostdlib -N -Ttext=8200 -melf_i386
+	-nostdlib -N -Ttext=0x8200 -melf_i386
 
 #############################################
 ## Generate the real deal stage2  (4)