Skip to content

Commit

Permalink
Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)"
Browse files Browse the repository at this point in the history
This reverts commit 084a7f8.

GCC 4.9 still has stability issues (b/14160872)

Change-Id: I4d40829dbbfac0e7b6cd7eaf9924744bc5714271
  • Loading branch information
Ben Cheng committed Apr 18, 2014
1 parent 084a7f8 commit e76fee5
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions core/combo/TARGET_linux-arm64.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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)) \
Expand All @@ -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) \
Expand All @@ -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)) \
Expand Down

0 comments on commit e76fee5

Please sign in to comment.