kbuild: remove TMPO from try-run
authorMasahiro Yamada <masahiroy@kernel.org>
Thu, 15 Apr 2021 07:26:59 +0000 (16:26 +0900)
committerMasahiro Yamada <masahiroy@kernel.org>
Sat, 24 Apr 2021 20:25:56 +0000 (05:25 +0900)
TMPO is only used by arch/x86/Makefile.

Change arch/x86/Makefile to use $$TMPO.o and remove TMPO from
scripts/Makefile.compiler.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
arch/x86/Makefile
scripts/Makefile.compiler

index 2d6d5a2..c55da28 100644 (file)
@@ -129,8 +129,8 @@ ifdef CONFIG_X86_X32
        x32_ld_ok := $(call try-run,\
                        /bin/echo -e '1: .quad 1b' | \
                        $(CC) $(KBUILD_AFLAGS) -c -x assembler -o "$$TMP" - && \
-                       $(OBJCOPY) -O elf32-x86-64 "$$TMP" "$$TMPO" && \
-                       $(LD) -m elf32_x86_64 "$$TMPO" -o "$$TMP",y,n)
+                       $(OBJCOPY) -O elf32-x86-64 "$$TMP" "$$TMP.o" && \
+                       $(LD) -m elf32_x86_64 "$$TMP.o" -o "$$TMP",y,n)
         ifeq ($(x32_ld_ok),y)
                 CONFIG_X86_X32_ABI := y
                 KBUILD_AFLAGS += -DCONFIG_X86_X32_ABI
index 3f2f366..86ecd2a 100644 (file)
@@ -21,7 +21,6 @@ TMPOUT = $(if $(KBUILD_EXTMOD),$(firstword $(KBUILD_EXTMOD))/).tmp_$$$$
 # automatically cleaned up.
 try-run = $(shell set -e;              \
        TMP=$(TMPOUT)/tmp;              \
-       TMPO=$(TMPOUT)/tmp.o;           \
        mkdir -p $(TMPOUT);             \
        trap "rm -rf $(TMPOUT)" EXIT;   \
        if ($(1)) >/dev/null 2>&1;      \