From 41b4504f4833adf65613457101fbbe4662a4c892 Mon Sep 17 00:00:00 2001 From: Haitao Feng Date: Mon, 21 May 2012 01:18:37 -0400 Subject: Change the -Ttext value in hexadecimal for ld.gold ld.gold could not parse 7C00 as the parameter is treated as a decimal number. The ld.bfd expects a hexadecimal number while ld.gold expects a uint64 by using strtoull. So unify the value in hexadecimal for both ld.bfd and ld.gold. Change-Id: I65fff5947b93fcd47bbc787fd782cc684aa7473f --- Android.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Android.mk b/Android.mk index 50034ba..3f57042 100644 --- a/Android.mk +++ b/Android.mk @@ -46,7 +46,7 @@ include $(BUILD_RAW_EXECUTABLE) $(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 @@ include $(BUILD_RAW_EXECUTABLE) $(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 @@ $(all_objects): $(STAGE2_SIZE_OBJ) $(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) -- cgit v1.2.3