From: Will Deacon <will@kernel.org>
Date: Fri, 4 Oct 2019 14:43:53 +0000 (+0100)
Subject: arm64: vdso32: Move definition of COMPATCC into vdso32/Makefile
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=bcaf9b57e4884e86717c1f4cee8157fd68189aa7;p=linux.git

arm64: vdso32: Move definition of COMPATCC into vdso32/Makefile

There's no need to export COMPATCC, so just define it locally in the
vdso32/Makefile, which is the only place where it is used.

Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Will Deacon <will@kernel.org>
---

diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile
index 12229cc5d9089..34f53eb11878c 100644
--- a/arch/arm64/Makefile
+++ b/arch/arm64/Makefile
@@ -53,13 +53,6 @@ $(warning Detected assembler with broken .inst; disassembly will be unreliable)
   endif
 endif
 
-ifeq ($(CONFIG_CC_IS_CLANG), y)
-COMPATCC ?= $(CC) --target=$(notdir $(CROSS_COMPILE_COMPAT:%-=%))
-else
-COMPATCC ?= $(CROSS_COMPILE_COMPAT)gcc
-endif
-export COMPATCC
-
 ifeq ($(CONFIG_GENERIC_COMPAT_VDSO), y)
   export CONFIG_COMPAT_VDSO := y
   compat_vdso := -DCONFIG_COMPAT_VDSO=1
diff --git a/arch/arm64/kernel/vdso32/Makefile b/arch/arm64/kernel/vdso32/Makefile
index 038357a1e8356..f52d29027d8d7 100644
--- a/arch/arm64/kernel/vdso32/Makefile
+++ b/arch/arm64/kernel/vdso32/Makefile
@@ -9,6 +9,12 @@ ARCH_REL_TYPE_ABS := R_ARM_JUMP_SLOT|R_ARM_GLOB_DAT|R_ARM_ABS32
 include $(srctree)/lib/vdso/Makefile
 
 # Same as cc-*option, but using COMPATCC instead of CC
+ifeq ($(CONFIG_CC_IS_CLANG), y)
+COMPATCC ?= $(CC) --target=$(notdir $(CROSS_COMPILE_COMPAT:%-=%))
+else
+COMPATCC ?= $(CROSS_COMPILE_COMPAT)gcc
+endif
+
 cc32-option = $(call try-run,\
         $(COMPATCC) $(1) -c -x c /dev/null -o "$$TMP",$(1),$(2))
 cc32-disable-warning = $(call try-run,\