diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2012-05-20 23:59:05 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-05-20 23:59:06 -0700 |
| commit | d413626b7ee75da998d8366af576b75071fb5d74 (patch) | |
| tree | 8d7fa9b5c49e3e7921177eae0d449fa840cb7e94 | |
| parent | cd484b7fcd18d5f967cadbaeb6d27b62f015a5e2 (diff) | |
| parent | 41b4504f4833adf65613457101fbbe4662a4c892 (diff) | |
| download | grub-d413626b7ee75da998d8366af576b75071fb5d74.tar.gz | |
Merge "Change the -Ttext value in hexadecimal for ld.gold"
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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) |