Commit e3456056 authored by Masahiro Yamada's avatar Masahiro Yamada

kbuild: remove TMPO from try-run

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: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent 35f93a09
...@@ -129,8 +129,8 @@ ifdef CONFIG_X86_X32 ...@@ -129,8 +129,8 @@ ifdef CONFIG_X86_X32
x32_ld_ok := $(call try-run,\ x32_ld_ok := $(call try-run,\
/bin/echo -e '1: .quad 1b' | \ /bin/echo -e '1: .quad 1b' | \
$(CC) $(KBUILD_AFLAGS) -c -x assembler -o "$$TMP" - && \ $(CC) $(KBUILD_AFLAGS) -c -x assembler -o "$$TMP" - && \
$(OBJCOPY) -O elf32-x86-64 "$$TMP" "$$TMPO" && \ $(OBJCOPY) -O elf32-x86-64 "$$TMP" "$$TMP.o" && \
$(LD) -m elf32_x86_64 "$$TMPO" -o "$$TMP",y,n) $(LD) -m elf32_x86_64 "$$TMP.o" -o "$$TMP",y,n)
ifeq ($(x32_ld_ok),y) ifeq ($(x32_ld_ok),y)
CONFIG_X86_X32_ABI := y CONFIG_X86_X32_ABI := y
KBUILD_AFLAGS += -DCONFIG_X86_X32_ABI KBUILD_AFLAGS += -DCONFIG_X86_X32_ABI
......
...@@ -21,7 +21,6 @@ TMPOUT = $(if $(KBUILD_EXTMOD),$(firstword $(KBUILD_EXTMOD))/).tmp_$$$$ ...@@ -21,7 +21,6 @@ TMPOUT = $(if $(KBUILD_EXTMOD),$(firstword $(KBUILD_EXTMOD))/).tmp_$$$$
# automatically cleaned up. # automatically cleaned up.
try-run = $(shell set -e; \ try-run = $(shell set -e; \
TMP=$(TMPOUT)/tmp; \ TMP=$(TMPOUT)/tmp; \
TMPO=$(TMPOUT)/tmp.o; \
mkdir -p $(TMPOUT); \ mkdir -p $(TMPOUT); \
trap "rm -rf $(TMPOUT)" EXIT; \ trap "rm -rf $(TMPOUT)" EXIT; \
if ($(1)) >/dev/null 2>&1; \ if ($(1)) >/dev/null 2>&1; \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment