aboutsummaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorBen Cheng <bccheng@google.com>2013-02-13 17:17:02 -0800
committerBen Cheng <bccheng@google.com>2013-02-13 17:17:02 -0800
commit255095fedaaee9420e710b71a5b684b672f78c63 (patch)
tree7eef3a08305e4a43e86e947c92cd48bd7fb74c1b /main
parent9841c3b690f25bb3c7a6e0e1d228a91d815209ce (diff)
downloadvalgrind-255095fedaaee9420e710b71a5b684b672f78c63.tar.gz
Fix full_x86-eng build.
Change-Id: I9e521f2baaeb139d85a1b70ecd81a04064db3627
Diffstat (limited to 'main')
-rw-r--r--main/Android.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/main/Android.mk b/main/Android.mk
index fc261d1bb..b783fa6d9 100644
--- a/main/Android.mk
+++ b/main/Android.mk
@@ -45,12 +45,13 @@ tool_ldflags := -static -Wl,--build-id=none,-Ttext=0x38000000 -nodefaultlibs -no
ifeq ($(TARGET_BOOTLOADER_BOARD_NAME),manta)
ANDROID_HARDWARE := ANDROID_HARDWARE_nexus_10
endif
-common_cflags += -D$(ANDROID_HARDWARE)
else
tool_ldflags := -static -Wl,-Ttext=0x38000000 -nodefaultlibs -nostartfiles -u _start -e_start
endif
+common_cflags += -D$(ANDROID_HARDWARE)
+
preload_ldflags := -nodefaultlibs -Wl,-z,interpose,-z,initfirst
# Remove this when the all toolchains are GCC 4.4
ifeq ($(TARGET_ARCH),arm)