Skip to content

Commit e345605

Browse files
committed
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: Masahiro Yamada <[email protected]>
1 parent 35f93a0 commit e345605

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

arch/x86/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@ ifdef CONFIG_X86_X32
129129
x32_ld_ok := $(call try-run,\
130130
/bin/echo -e '1: .quad 1b' | \
131131
$(CC) $(KBUILD_AFLAGS) -c -x assembler -o "$$TMP" - && \
132-
$(OBJCOPY) -O elf32-x86-64 "$$TMP" "$$TMPO" && \
133-
$(LD) -m elf32_x86_64 "$$TMPO" -o "$$TMP",y,n)
132+
$(OBJCOPY) -O elf32-x86-64 "$$TMP" "$$TMP.o" && \
133+
$(LD) -m elf32_x86_64 "$$TMP.o" -o "$$TMP",y,n)
134134
ifeq ($(x32_ld_ok),y)
135135
CONFIG_X86_X32_ABI := y
136136
KBUILD_AFLAGS += -DCONFIG_X86_X32_ABI

scripts/Makefile.compiler

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ TMPOUT = $(if $(KBUILD_EXTMOD),$(firstword $(KBUILD_EXTMOD))/).tmp_$$$$
2121
# automatically cleaned up.
2222
try-run = $(shell set -e; \
2323
TMP=$(TMPOUT)/tmp; \
24-
TMPO=$(TMPOUT)/tmp.o; \
2524
mkdir -p $(TMPOUT); \
2625
trap "rm -rf $(TMPOUT)" EXIT; \
2726
if ($(1)) >/dev/null 2>&1; \

0 commit comments

Comments
 (0)