Skip to content

Commit 29fc527

Browse files
luk1337palaych
authored andcommitted
kernel: Add 32-bit GCC to PATH for vdso32
Change-Id: Ifff495069ab33d9b1346971a21f380f0c23ebf48
1 parent 50b27e0 commit 29fc527

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

config/BoardConfigKernel.mk

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,16 @@ ifneq ($(TARGET_KERNEL_ADDITIONAL_FLAGS),)
125125
endif
126126

127127
TOOLS_PATH_OVERRIDE := \
128-
PATH=$(BUILD_TOP)/prebuilts/tools-extras/$(HOST_PREBUILT_TAG)/bin:$$PATH \
129128
LD_LIBRARY_PATH=$(BUILD_TOP)/prebuilts/tools-extras/$(HOST_PREBUILT_TAG)/lib:$$LD_LIBRARY_PATH \
130129
PERL5LIB=$(BUILD_TOP)/prebuilts/tools-extras/common/perl-base
131130

131+
ifeq ($(KERNEL_ARCH),arm64)
132+
# Add 32-bit GCC to PATH so that arm-linux-androidkernel-as is available for CONFIG_COMPAT_VDSO
133+
TOOLS_PATH_OVERRIDE += PATH=$(BUILD_TOP)/prebuilts/tools-extras/$(HOST_PREBUILT_TAG)/bin:$(KERNEL_TOOLCHAIN_arm):$$PATH
134+
else
135+
TOOLS_PATH_OVERRIDE += PATH=$(BUILD_TOP)/prebuilts/tools-extras/$(HOST_PREBUILT_TAG)/bin:$$PATH
136+
endif
137+
132138
# Set DTBO image locations so the build system knows to build them
133139
ifeq (true,$(filter true, $(TARGET_NEEDS_DTBOIMAGE) $(BOARD_KERNEL_SEPARATED_DTBO)))
134140
BOARD_PREBUILT_DTBOIMAGE ?= $(TARGET_OUT_INTERMEDIATES)/DTBO_OBJ/arch/$(KERNEL_ARCH)/boot/dtbo.img

0 commit comments

Comments
 (0)