Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #2)"
This reverts commit 1ae9b213eb
.
Sigh... new warnings found by 4.9 break checkbuild.
Change-Id: I46ad622fa9c8ac4fb1e15e29bb400634abc5914c
This commit is contained in:
parent
1ae9b213eb
commit
38fef38c40
|
@ -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)) \
|
||||
|
|
Loading…
Reference in New Issue