diff options
| author | Ben Cheng <bccheng@google.com> | 2014-04-10 16:43:08 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-10 16:43:08 +0000 |
| commit | c760ecbd2204200c55d0be585c113ae0dbfb7286 (patch) | |
| tree | 36006e476ad03a82f6bc791d51da04ffc511feaf /core/combo | |
| parent | 26e1a28e7f9aa22b37ec7d98dab0de5c93202ab0 (diff) | |
| parent | 9cbf732fa345a1ef8d540b8934a59502d7fdd627 (diff) | |
| download | build-c760ecbd2204200c55d0be585c113ae0dbfb7286.zip build-c760ecbd2204200c55d0be585c113ae0dbfb7286.tar.gz build-c760ecbd2204200c55d0be585c113ae0dbfb7286.tar.bz2 | |
am 9cbf732f: am 98bb9d6c: am d957d6bb: Merge "Use aarch64-linux-android-4.9 for arm64 build."
* commit '9cbf732fa345a1ef8d540b8934a59502d7fdd627':
Use aarch64-linux-android-4.9 for arm64 build.
Diffstat (limited to 'core/combo')
| -rw-r--r-- | core/combo/TARGET_linux-arm64.mk | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/core/combo/TARGET_linux-arm64.mk b/core/combo/TARGET_linux-arm64.mk index 08603b8..6a7409e 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.8 +TARGET_GCC_VERSION := 4.9 else TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP) endif @@ -70,13 +70,9 @@ 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,6 +155,7 @@ 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,6 +179,7 @@ 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) \ @@ -205,6 +203,7 @@ 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)) \ |