Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54bea362 authored by Ben Cheng's avatar Ben Cheng Committed by Gerrit Code Review
Browse files

Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #4)"

parents 64f3a191 d0331214

core/combo/TARGET_linux-arm64.mk

+5 −6
Original line number Original line Diff line number Diff line
@@ -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.8

TARGET_GCC_VERSION := 4.9

else

else

TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP)

TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP)

endif

endif
@@ -73,13 +73,9 @@ 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 \
@@ -165,6 +161,7 @@ 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)) \
@@ -189,6 +186,7 @@ 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) \
@@ -213,6 +211,7 @@ 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)) \