diff options
| author | Ben Cheng <bccheng@google.com> | 2014-04-11 22:44:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-11 22:44:05 +0000 |
| commit | 2b240a7bd2754576f3e48332d90310f0685b4660 (patch) | |
| tree | 94b97ec2649c8c8d3523d28d811fe58be20b5c9c /core/combo | |
| parent | 19b7c4d5c906523954e157a0efebf8197fdb1964 (diff) | |
| parent | c9f9decdcaa6c3314c11edba0bf9703edf09615e (diff) | |
| download | build-2b240a7bd2754576f3e48332d90310f0685b4660.zip build-2b240a7bd2754576f3e48332d90310f0685b4660.tar.gz build-2b240a7bd2754576f3e48332d90310f0685b4660.tar.bz2 | |
am c9f9decd: am 4eea070c: am f702d6d1: Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #2)"
* commit 'c9f9decdcaa6c3314c11edba0bf9703edf09615e':
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, 5 insertions, 6 deletions
diff --git a/core/combo/TARGET_linux-arm64.mk b/core/combo/TARGET_linux-arm64.mk index e894f6d..070c920 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.8 +TARGET_GCC_VERSION := 4.9 else TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP) endif @@ -73,13 +73,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 \ @@ -162,6 +158,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)) \ @@ -185,6 +182,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) \ @@ -208,6 +206,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)) \ |