From e76fee59fcc53934f5690466dd1cd3b847ec3836 Mon Sep 17 00:00:00 2001 From: Ben Cheng Date: Fri, 18 Apr 2014 18:34:35 +0000 Subject: [PATCH] Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)" This reverts commit 084a7f83875d030c2e4819bed386c4a16168e731. GCC 4.9 still has stability issues (b/14160872) Change-Id: I4d40829dbbfac0e7b6cd7eaf9924744bc5714271 --- core/combo/TARGET_linux-arm64.mk | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/core/combo/TARGET_linux-arm64.mk b/core/combo/TARGET_linux-arm64.mk index 7860f4dcf..6bb3754fc 100644 --- a/core/combo/TARGET_linux-arm64.mk +++ b/core/combo/TARGET_linux-arm64.mk @@ -38,7 +38,7 @@ endif TARGET_NDK_GCC_VERSION := 4.8 ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),) -TARGET_GCC_VERSION := 4.9 +TARGET_GCC_VERSION := 4.8 else TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP) endif @@ -73,9 +73,13 @@ TARGET_GLOBAL_CFLAGS += \ android_config_h := $(call select-android-config-h,linux-arm64) +# HACK: globally disable -fstack-protector until the toolchain supports it +TARGET_GLOBAL_UNSUPPORTED_CFLAGS := \ + -fstack-protector \ + -fstack-protector-all \ + TARGET_GLOBAL_CFLAGS += \ -fpic -fPIE \ - -fstack-protector \ -ffunction-sections \ -fdata-sections \ -funwind-tables \ @@ -159,7 +163,6 @@ TARGET_CUSTOM_LD_COMMAND := true define transform-o-to-shared-lib-inner $(hide) $(PRIVATE_CXX) \ -nostdlib -Wl,-soname,$(notdir $@) \ - -Wl,--gc-sections \ -Wl,-shared,-Bsymbolic \ $(PRIVATE_TARGET_GLOBAL_LD_DIRS) \ $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_SO_O)) \ @@ -183,7 +186,6 @@ endef define transform-o-to-executable-inner $(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -fPIE -pie \ -Wl,-dynamic-linker,/system/bin/linker64 \ - -Wl,--gc-sections \ -Wl,-z,nocopyreloc \ $(PRIVATE_TARGET_GLOBAL_LD_DIRS) \ -Wl,-rpath-link=$(PRIVATE_TARGET_OUT_INTERMEDIATE_LIBRARIES) \ @@ -207,7 +209,6 @@ endef define transform-o-to-static-executable-inner $(hide) $(PRIVATE_CXX) -nostdlib -Bstatic \ - -Wl,--gc-sections \ -o $@ \ $(PRIVATE_TARGET_GLOBAL_LD_DIRS) \ $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_STATIC_O)) \ -- 2.11.0