diff options
| author | Ben Cheng <bccheng@android.com> | 2014-04-10 17:24:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-10 17:24:46 +0000 |
| commit | 335c76d886b7e4ea241f3c02bab2cf38074fe9e4 (patch) | |
| tree | 9812b003c54a15f86bf0a1068d87739f40184d6f /core | |
| parent | c760ecbd2204200c55d0be585c113ae0dbfb7286 (diff) | |
| parent | c77ffa8923d95f8bd4639bf9e810b0c981481e54 (diff) | |
| download | build-335c76d886b7e4ea241f3c02bab2cf38074fe9e4.zip build-335c76d886b7e4ea241f3c02bab2cf38074fe9e4.tar.gz build-335c76d886b7e4ea241f3c02bab2cf38074fe9e4.tar.bz2 | |
am c77ffa89: am add6c037: am 13eaf184: Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build.""
* commit 'c77ffa8923d95f8bd4639bf9e810b0c981481e54':
Revert "Use aarch64-linux-android-4.9 for arm64 build."
Diffstat (limited to 'core')
| -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 6a7409e..08603b8 100644 --- a/core/combo/TARGET_linux-arm64.mk +++ b/core/combo/TARGET_linux-arm64.mk @@ -35,7 +35,7 @@ TARGET_ARCH_VARIANT := armv8 endif 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 @@ -70,9 +70,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 \ @@ -155,7 +159,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)) \ @@ -179,7 +182,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) \ @@ -203,7 +205,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)) \ |