Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 172caf19 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kbuild: remove redundant target cleaning on failure 



Since commit 9c2af1c7 ("kbuild: add .DELETE_ON_ERROR special
target"), the target file is automatically deleted on failure.

The boilerplate code

  ... || { rm -f $@; false; }

is unneeded.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent f5688663

arch/arm/boot/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -32,7 +32,7 @@ targets := Image zImage xipImage bootpImage uImage 
ifeq ($(CONFIG_XIP_KERNEL),y)

ifeq ($(CONFIG_XIP_KERNEL),y)





cmd_deflate_xip_data = $(CONFIG_SHELL) -c \

cmd_deflate_xip_data = $(CONFIG_SHELL) -c \

	'$(srctree)/$(src)/deflate_xip_data.sh $< $@ || { rm -f $@; false; }'

	'$(srctree)/$(src)/deflate_xip_data.sh $< $@'





ifeq ($(CONFIG_XIP_DEFLATED_DATA),y)

ifeq ($(CONFIG_XIP_DEFLATED_DATA),y)

quiet_cmd_mkxip = XIPZ    $@

quiet_cmd_mkxip = XIPZ    $@

arch/arm/boot/compressed/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -170,7 +170,7 @@ check_for_bad_syms = \ 
bad_syms=$$($(CROSS_COMPILE)nm $@ | sed -n 's/^.\{8\} [bc] \(.*\)/\1/p') && \

bad_syms=$$($(CROSS_COMPILE)nm $@ | sed -n 's/^.\{8\} [bc] \(.*\)/\1/p') && \

[ -z "$$bad_syms" ] || \

[ -z "$$bad_syms" ] || \

  ( echo "following symbols must have non local/private scope:" >&2; \

  ( echo "following symbols must have non local/private scope:" >&2; \

    echo "$$bad_syms" >&2; rm -f $@; false )

    echo "$$bad_syms" >&2; false )





check_for_multiple_zreladdr = \

check_for_multiple_zreladdr = \

if [ $(words $(ZRELADDR)) -gt 1 -a "$(CONFIG_AUTO_ZRELADDR)" = "" ]; then \

if [ $(words $(ZRELADDR)) -gt 1 -a "$(CONFIG_AUTO_ZRELADDR)" = "" ]; then \

arch/arm/tools/Makefile

+1 −2
Original line number Original line Diff line number Diff line
@@ -35,8 +35,7 @@ _dummy := $(shell [ -d '$(kapi)' ] || mkdir -p '$(kapi)') \ 




quiet_cmd_gen_mach = GEN     $@

quiet_cmd_gen_mach = GEN     $@

      cmd_gen_mach = mkdir -p $(dir $@) && \

      cmd_gen_mach = mkdir -p $(dir $@) && \

		     $(AWK) -f $(filter-out $(PHONY),$^) > $@ || \

		     $(AWK) -f $(filter-out $(PHONY),$^) > $@

		     { rm -f $@; /bin/false; }





$(kapi)/mach-types.h: $(src)/gen-mach-types $(src)/mach-types FORCE

$(kapi)/mach-types.h: $(src)/gen-mach-types $(src)/mach-types FORCE

	$(call if_changed,gen_mach)

	$(call if_changed,gen_mach)

arch/sh/tools/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -13,4 +13,4 @@ 
include/generated/machtypes.h: $(src)/gen-mach-types $(src)/mach-types

include/generated/machtypes.h: $(src)/gen-mach-types $(src)/mach-types

	@echo '  Generating $@'

	@echo '  Generating $@'

	$(Q)mkdir -p $(dir $@)

	$(Q)mkdir -p $(dir $@)

	$(Q)LC_ALL=C $(AWK) -f $^ > $@ || { rm -f $@; /bin/false; }
 
	$(Q)LC_ALL=C $(AWK) -f $^ > $@

arch/x86/boot/compressed/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -151,7 +151,7 @@ suffix-$(CONFIG_KERNEL_LZO) := lzo 
suffix-$(CONFIG_KERNEL_LZ4) 	:= lz4

suffix-$(CONFIG_KERNEL_LZ4) 	:= lz4





quiet_cmd_mkpiggy = MKPIGGY $@

quiet_cmd_mkpiggy = MKPIGGY $@

      cmd_mkpiggy = $(obj)/mkpiggy $< > $@ || ( rm -f $@ ; false )

      cmd_mkpiggy = $(obj)/mkpiggy $< > $@





targets += piggy.S

targets += piggy.S

$(obj)/piggy.S: $(obj)/vmlinux.bin.$(suffix-y) $(obj)/mkpiggy FORCE

$(obj)/piggy.S: $(obj)/vmlinux.bin.$(suffix-y) $(obj)/mkpiggy FORCE