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

Commit 7096fe30 authored by nickdesaulniers's avatar nickdesaulniers Committed by Taher Hakim
Browse files

arm64: vdso32: require CROSS_COMPILE_COMPAT for gcc+bfd 

Based on LineageOS/android_kernel_motorola_sm7250@c9ddc84
parent fb4b4374

arch/arm64/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -1157,7 +1157,8 @@ config ARM64_TAGGED_ADDR_ABI 


config COMPAT_VDSO

	bool "Enable vDSO for 32-bit applications"

	depends on !CPU_BIG_ENDIAN && "$(CROSS_COMPILE_COMPAT)" != ""

	depends on !CPU_BIG_ENDIAN

	depends on (CC_IS_CLANG && LD_IS_LLD) || "$(CROSS_COMPILE_COMPAT)" != ""

	select GENERIC_COMPAT_VDSO

	default y

	help

arch/arm64/kernel/vdso32/Makefile

+5 −12
Original line number Diff line number Diff line
@@ -10,18 +10,15 @@ include $(srctree)/lib/vdso/Makefile 


# Same as cc-*option, but using CC_COMPAT instead of CC

ifeq ($(CONFIG_CC_IS_CLANG), y)

CC_COMPAT_CLANG_FLAGS := --target=$(notdir $(CROSS_COMPILE_COMPAT:%-=%))



CC_COMPAT ?= $(CC)

CC_COMPAT += $(CC_COMPAT_CLANG_FLAGS)



ifeq ($(LLVM),1)

LD_COMPAT ?= $(LD)

CC_COMPAT += --target=arm-linux-gnueabi

else

LD_COMPAT ?= $(CROSS_COMPILE_COMPAT)ld

CC_COMPAT ?= $(CROSS_COMPILE_COMPAT)gcc

endif



ifeq ($(CONFIG_LD_IS_LLD), y)

LD_COMPAT ?= $(LD)

else

CC_COMPAT ?= $(CROSS_COMPILE_COMPAT)gcc

LD_COMPAT ?= $(CROSS_COMPILE_COMPAT)ld

endif
@@ -47,10 +44,6 @@ VDSO_CPPFLAGS += $(LINUXINCLUDE) 
# Common C and assembly flags

# From top-level Makefile

VDSO_CAFLAGS := $(VDSO_CPPFLAGS)

ifneq ($(shell $(CC_COMPAT) --version 2>&1 | head -n 1 | grep clang),)

VDSO_CAFLAGS += --target=$(notdir $(CROSS_COMPILE_COMPAT:%-=%))

endif



VDSO_CAFLAGS += $(call cc32-option,-fno-PIE)

ifdef CONFIG_DEBUG_INFO

VDSO_CAFLAGS += -g