diff options
| author | Ben Cheng <bccheng@android.com> | 2014-04-11 23:47:51 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-11 23:47:51 +0000 |
| commit | bdcb4bcd7b2384cc77744232e352b38e003e733e (patch) | |
| tree | 47d823e3eae189c6371a907a53ef117373744026 /core/combo | |
| parent | 2b240a7bd2754576f3e48332d90310f0685b4660 (diff) | |
| parent | e921da9def56e6f70de3df18f0582a69826d9787 (diff) | |
| download | build-bdcb4bcd7b2384cc77744232e352b38e003e733e.zip build-bdcb4bcd7b2384cc77744232e352b38e003e733e.tar.gz build-bdcb4bcd7b2384cc77744232e352b38e003e733e.tar.bz2 | |
am e921da9d: am bddce34c: am 065c4180: Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #2)""
* commit 'e921da9def56e6f70de3df18f0582a69826d9787':
Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #2)"
Diffstat (limited to 'core/combo')
| -rw-r--r-- | core/combo/TARGET_linux-arm64.mk | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/core/combo/TARGET_linux-arm64.mk b/core/combo/TARGET_linux-arm64.mk index 070c920..e894f6d 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 \ @@ -158,7 +162,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)) \ @@ -182,7 +185,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) \ @@ -206,7 +208,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)) \ |