From: Bruno Martins <bgcngm@gmail.com>
Date: Fri, 20 Oct 2023 22:29:59 +0000 (+0100)
Subject: arm64: vdso32: Allow building with LLVM integrated AS
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6096e30a589828b515d67f130f56e3cc56a2e352;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

arm64: vdso32: Allow building with LLVM integrated AS

Change-Id: I8bfc0e53b4bd347adaa298594402a2210aed3b49
---

diff --git a/arch/arm64/kernel/vdso32/Makefile b/arch/arm64/kernel/vdso32/Makefile
index b75c2fda6236..4bd7ec32989f 100644
--- a/arch/arm64/kernel/vdso32/Makefile
+++ b/arch/arm64/kernel/vdso32/Makefile
@@ -5,7 +5,10 @@
 # A mix between the arm64 and arm vDSO Makefiles.
 
 ifeq ($(cc-name),clang)
-  CC_ARM32 := $(CC) $(CLANG_TARGET_ARM32) -no-integrated-as $(CLANG_GCC32_TC) $(CLANG_PREFIX32)
+  CC_ARM32 := $(CC) $(CLANG_TARGET_ARM32) $(CLANG_GCC32_TC) $(CLANG_PREFIX32)
+  ifneq ($(LLVM_IAS),1)
+    CC_ARM32 += -no-integrated-as
+  endif
 else
   CC_ARM32 := $(CROSS_COMPILE_ARM32)$(cc-name)
 endif