tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am bdcb4bcd: am e921da9d: am bddce34c: am 065c4180: Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #2)""

Browse source 
* commit 'bdcb4bcd7b2384cc77744232e352b38e003e733e':
  Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #2)"
This commit is contained in:
Ben Cheng 2014-04-11 23:53:36 +00:00 committed by Android Git Automerger
commit c8801755db
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
core/combo/TARGET_linux-arm64.mk
View file

@ -38,7 +38,7 @@ endif
TARGET_NDK_GCC_VERSION := 4.8 TARGET_NDK_GCC_VERSION := 4.8
ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),) ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),)
TARGET_GCC_VERSION := 4.9 TARGET_GCC_VERSION := 4.8
else else
TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP) TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP)
endif endif
@ -73,9 +73,13 @@ TARGET_GLOBAL_CFLAGS += \
android_config_h := $(call select-android-config-h,linux-arm64) 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 += \ TARGET_GLOBAL_CFLAGS += \
-fpic -fPIE \ -fpic -fPIE \
-fstack-protector \
-ffunction-sections \ -ffunction-sections \
-fdata-sections \ -fdata-sections \
-funwind-tables \ -funwind-tables \
@ -158,7 +162,6 @@ TARGET_CUSTOM_LD_COMMAND := true
define transform-o-to-shared-lib-inner define transform-o-to-shared-lib-inner
$(hide) $(PRIVATE_CXX) \ $(hide) $(PRIVATE_CXX) \
-nostdlib -Wl,-soname,$(notdir $@) \ -nostdlib -Wl,-soname,$(notdir $@) \
-Wl,--gc-sections \
-Wl,-shared,-Bsymbolic \ -Wl,-shared,-Bsymbolic \
$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \ $(PRIVATE_TARGET_GLOBAL_LD_DIRS) \
$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_SO_O)) \ $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_SO_O)) \
@ -182,7 +185,6 @@ endef
define transform-o-to-executable-inner define transform-o-to-executable-inner
$(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -fPIE -pie \ $(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -fPIE -pie \
-Wl,-dynamic-linker,/system/bin/linker64 \ -Wl,-dynamic-linker,/system/bin/linker64 \
-Wl,--gc-sections \
-Wl,-z,nocopyreloc \ -Wl,-z,nocopyreloc \
$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \ $(PRIVATE_TARGET_GLOBAL_LD_DIRS) \
-Wl,-rpath-link=$(PRIVATE_TARGET_OUT_INTERMEDIATE_LIBRARIES) \ -Wl,-rpath-link=$(PRIVATE_TARGET_OUT_INTERMEDIATE_LIBRARIES) \
@ -206,7 +208,6 @@ endef
define transform-o-to-static-executable-inner define transform-o-to-static-executable-inner
$(hide) $(PRIVATE_CXX) -nostdlib -Bstatic \ $(hide) $(PRIVATE_CXX) -nostdlib -Bstatic \
-Wl,--gc-sections \
-o $@ \ -o $@ \
$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \ $(PRIVATE_TARGET_GLOBAL_LD_DIRS) \
$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_STATIC_O)) \ $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_STATIC_O)) \