| Message ID | 20190806062316.30784-1-ice_yangxiao@163.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | kbuild: Remove unused variable TMPO of ld-option | expand |
On Tue, Aug 6, 2019 at 3:23 PM Xiao Yang <ice_yangxiao@163.com> wrote: > > ld-option implementation has been simplified so variable TMPO > is no longer needed. > > Fixes: Commit 0294e6f4a000 ("kbuild: simplify ld-option implementation") > Signed-off-by: Xiao Yang <ice_yangxiao@163.com> > --- > scripts/Kbuild.include | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include > index 4b0432e095ae..13a6f627351d 100644 > --- a/scripts/Kbuild.include > +++ b/scripts/Kbuild.include > @@ -91,12 +91,11 @@ TMPOUT := $(if $(KBUILD_EXTMOD),$(firstword $(KBUILD_EXTMOD))/) > # automatically cleaned up. > try-run = $(shell set -e; \ > TMP="$(TMPOUT).$$$$.tmp"; \ > - TMPO="$(TMPOUT).$$$$.o"; \ > if ($(1)) >/dev/null 2>&1; \ > then echo "$(2)"; \ > else echo "$(3)"; \ > fi; \ > - rm -f "$$TMP" "$$TMPO") > + rm -f "$$TMP") > > # as-option > # Usage: cflags-y += $(call as-option,-Wa$(comma)-isa=foo,) > -- > 2.21.0 > > Unfortunately, there is a user in arch/x86/Makefile. masahiro@pug:~/ref/linux$ git grep TMPO arch/x86/Makefile: $(OBJCOPY) -O elf32-x86-64 "$$TMP" "$$TMPO" && \ arch/x86/Makefile: $(LD) -m elf32_x86_64 "$$TMPO" -o "$$TMP",y,n) scripts/Kbuild.include:TMPOUT := $(if $(KBUILD_EXTMOD),$(firstword $(KBUILD_EXTMOD))/) scripts/Kbuild.include: TMP="$(TMPOUT).$$$$.tmp"; \ scripts/Kbuild.include: TMPO="$(TMPOUT).$$$$.o"; \ scripts/Kbuild.include: rm -f "$$TMP" "$$TMPO")
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include index 4b0432e095ae..13a6f627351d 100644 --- a/scripts/Kbuild.include +++ b/scripts/Kbuild.include @@ -91,12 +91,11 @@ TMPOUT := $(if $(KBUILD_EXTMOD),$(firstword $(KBUILD_EXTMOD))/) # automatically cleaned up. try-run = $(shell set -e; \ TMP="$(TMPOUT).$$$$.tmp"; \ - TMPO="$(TMPOUT).$$$$.o"; \ if ($(1)) >/dev/null 2>&1; \ then echo "$(2)"; \ else echo "$(3)"; \ fi; \ - rm -f "$$TMP" "$$TMPO") + rm -f "$$TMP") # as-option # Usage: cflags-y += $(call as-option,-Wa$(comma)-isa=foo,)
ld-option implementation has been simplified so variable TMPO is no longer needed. Fixes: Commit 0294e6f4a000 ("kbuild: simplify ld-option implementation") Signed-off-by: Xiao Yang <ice_yangxiao@163.com> --- scripts/Kbuild.include | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)