From patchwork Fri Jan 11 10:42:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 155322 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp418167jaa; Fri, 11 Jan 2019 02:43:03 -0800 (PST) X-Google-Smtp-Source: ALg8bN59mHbUtGliNM9ajH7OBTEUUjjMjiAjkpK2qY+TEsmsQz4UBS1zO1RxiFLZhsN/abgYy37u X-Received: by 2002:a50:f415:: with SMTP id r21mr13060657edm.110.1547203383751; Fri, 11 Jan 2019 02:43:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547203383; cv=none; d=google.com; s=arc-20160816; b=ZvF3H5A4p5A4MNsKR8uzQ8gTaTh1JBiLkzUy6iN54kxHLhDAiMQkBkfFY8k722zgii UHzRqLsMEvjGWBVdrKiCIc2yU5KIY6Px0w01Azz0nnK2lwysRtm/tT2OoBpkufuEQK1T mt4PSejbX8QqQ/MkQ336aDdqMZHajNtet7gr8bmSb39+bfrgpwGOFUaGRG6BCDtgWDEV cgPGkKS3J6Scl2eryty3cC0m1LuFcYAO6//7L2wK1FEEVRlIa3Ik4EUV9/bwmaz55u4Y ENbPfrRG/8G169XsAjYKlf88jajsZkrBMBZedWgHDQrHXry3cbPcK+ABO0mUkYV0Pkz3 HEAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :cc:mime-version:message-id:date:to:from:dkim-signature:dkim-filter; bh=IiCVF20mDRtgQ16k9KolbC0a5bzJYuCyNPYFajs6TqA=; b=vLzDJx9qTXXWlUL3802BauAyK0RD6wzsQxPN68pazOnSEwRU5xhu/isHLZb5DH5ePq BBFUG6tJieGmNSVHVZMflbsUhlWtfmX79I87hjNtcK+hL6xOIlmd8Pb98RNZ8aFGRdV9 SjvY6kB6Rd/J8OehQS55YjHTa8WB7S/oxFO9Q/1NmB0F9KrVpnvM3gwV3+MwxUJ459QX RKbYR1OSAaBDeTL453WnR1CcShGZ33i8afahYJYZNie1Q0G85beMOJ0FcWoTNq6UfX0n nV7b1GI78VkcihqNT3csxZYe+WQou5tkLbnfsm2spcYB+sxGywpC3UgAmxtXMP3g5FmI DyAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b="NjvVGeo/"; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id 93si142704edn.30.2019.01.11.02.43.03; Fri, 11 Jan 2019 02:43:03 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b="NjvVGeo/"; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by lists.denx.de (Postfix, from userid 105) id F4020C221ED; Fri, 11 Jan 2019 10:42:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id C32F3C220C2; Fri, 11 Jan 2019 10:42:57 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A9C5CC220C2; Fri, 11 Jan 2019 10:42:56 +0000 (UTC) Received: from conuserg-10.nifty.com (conuserg-10.nifty.com [210.131.2.77]) by lists.denx.de (Postfix) with ESMTPS id 98CBCC21C57 for ; Fri, 11 Jan 2019 10:42:55 +0000 (UTC) Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id x0BAgXPZ022031; Fri, 11 Jan 2019 19:42:33 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com x0BAgXPZ022031 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1547203353; bh=82248I9fxhGCDCRXt1Gt3IWcXp0p1THp1aH747hJijE=; h=From:To:Cc:Subject:Date:From; b=NjvVGeo/LQbDkdTUCrWpB72fpWlW0T4dEm9w0IixHzb/g8wOO1uMB2u8FJfyZeXYI Xu/iAlR+UUsKx7vQlc+/HCi9K2Saf9bOWdaA3CG1xsclksgu68B3MBqHr5s0dRyBN0 JxMFjkItKn6vUBvAFL2oWZbKFnBZeXnq+7Z5pVn8bWUBIdaC8W7tP69XGLcjJN1K9z 8oDOyomp9zioWV2RGdSgmO+KIM3ZmKqhdHApjWjROK+ArPn4vQng+kI42+g6VDx5sh gy+b2CvB5LVSfkmRgNNGE+7F3DigG2ptDIL7/k0paERr9fWOWv8bxrIL4ei9dDn8Ch /0qLTjG7EY4Wg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Fri, 11 Jan 2019 19:42:26 +0900 Message-Id: <1547203347-19601-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Cc: Rasmus Villemoes Subject: [U-Boot] [PATCH 1/2] kbuild: add .DELETE_ON_ERROR special target X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Linux commit 9c2af1c7377a8a6ef86e5cabf80978f3dbbb25c0 If Make gets a fatal signal while a shell is executing, it may delete the target file that the recipe was supposed to update. This is needed to make sure that it is remade from scratch when Make is next run; if Make is interrupted after the recipe has begun to write the target file, it results in an incomplete file whose time stamp is newer than that of the prerequisites files. Make automatically deletes the incomplete file on interrupt unless the target is marked .PRECIOUS. The situation is just the same as when the shell fails for some reasons. Usually when a recipe line fails, if it has changed the target file at all, the file is corrupted, or at least it is not completely updated. Yet the file’s time stamp says that it is now up to date, so the next time Make runs, it will not try to update that file. However, Make does not cater to delete the incomplete target file in this case. We need to add .DELETE_ON_ERROR somewhere in the Makefile to request it. scripts/Kbuild.include seems a suitable place to add it because it is included from almost all sub-makes. Signed-off-by: Masahiro Yamada --- scripts/Kbuild.include | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include index 13ebddd..460acd6 100644 --- a/scripts/Kbuild.include +++ b/scripts/Kbuild.include @@ -315,6 +315,9 @@ why = \ echo-why = $(call escsq, $(strip $(why))) endif +# delete partially updated (i.e. corrupted) files on error +.DELETE_ON_ERROR: + ifdef CONFIG_SPL_BUILD SPL_ := SPL_ ifeq ($(CONFIG_TPL_BUILD),y) From patchwork Fri Jan 11 10:42:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 155323 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp418535jaa; Fri, 11 Jan 2019 02:43:33 -0800 (PST) X-Google-Smtp-Source: ALg8bN5vjaxWC6/vX6Br00YVKhAMr/npIXwu5xZf58awV4QaSSH4qe/enXprudtx8tDZeoHYw3pL X-Received: by 2002:a50:97f3:: with SMTP id f48mr12552851edb.271.1547203413467; Fri, 11 Jan 2019 02:43:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547203413; cv=none; d=google.com; s=arc-20160816; b=xZkuXoy88PV0G9Jmtx0itbZUb3nDvIBZbgVBA8DLtWMyjlp/4LwXQZ79glpSQOXTXy YJtEPfQZvoGWvyeUG7vUqBh8J5wwKgFjsJ1aMZSIU8RqNCyQ21X4QA+pfsi6OV+i5I/g PavvsNuoGNN9oyC7Hzj4bH3VqITqVbP/2nZP0yVHHsmmQdf351xOiRgCshpsbf+/R0Rc 9VxKPfdMz7QtIoM/aRsIUSQKXLNbbqFLf+i8X6IeAeK2fiIEMuszMNgEj7W0kPCZ9cHU 5U1++rlT5ueCU5njlp7sOJBEFqW9a3bnAT2Qrdh2DGj0UdH2Egjw8mCrw66DSOJbF20A 4JZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:message-id :date:to:from:dkim-signature:dkim-filter; bh=VvizQmP9GvCBgplejlhDdMklwgv8nG845BnnY+ilAgA=; b=0hrYrS5TjC/HArmzgIPKiT62VqzD1AjKzrEGBZLa/3rU/KuJNW64WDEzynSHlsY76Q b5Vy78oaS16hHgmEikCClTjn0zXtCOYmcbF/236FqIanigCTHgcytIYmor3s5ZRc77U+ YM37IAEQN+7uxG9wj2+2jeToYTP/fjmQLyZAcHIgNp3BNF1Yi+0IQWs0cZHQ32dMz0W9 5NCTsJjRfPEaj5S332MdRaDo9y9W33hUIyRrk87GlM6NJM3dF6CiOT9AQyheDwvkwu2B X+oAdNZITO7+aD98sdgiGgI2LJDnzG2l909FIX9vXiMAG6KJh48NbUFQp1t7bWFWPfCw 5j/g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=jpNGgejo; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id d10-v6si311628ejh.247.2019.01.11.02.43.33; Fri, 11 Jan 2019 02:43:33 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=jpNGgejo; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by lists.denx.de (Postfix, from userid 105) id 0E841C22182; Fri, 11 Jan 2019 10:43:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id A76F5C221D3; Fri, 11 Jan 2019 10:43:26 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id CC370C221F4; Fri, 11 Jan 2019 10:43:16 +0000 (UTC) Received: from conuserg-10.nifty.com (conuserg-10.nifty.com [210.131.2.77]) by lists.denx.de (Postfix) with ESMTPS id 50BD9C221E4 for ; Fri, 11 Jan 2019 10:43:15 +0000 (UTC) Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id x0BAgXPa022031; Fri, 11 Jan 2019 19:42:33 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com x0BAgXPa022031 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1547203354; bh=aUZHtOTDn+NKKy2EeHRYAjpIt2TF+EBscKq1jEt43B8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jpNGgejoiuTblpT/s2jRki8fz9knaSiMOPZsIhFXRsolY6sA95uFaBCuo6BUiK0QA Yi4kPJYasgPGITCrumOx451mocOyJfeHuk3xLazFn4PCuYvDLSeX8eQqxzFkgBCpUr BEaaDnueppPFYcfrbj3CxOp+W+hHy1inbIASealDuXqDO6fobcbGmncTSlsuC/UR9M h7/qpy4ZE6/rGkbLlkkBoopzbIiNMDrQBkHhlZS00qnTzAMw/k0TfH2w5k7fUaDhmH bi+cIBnfumFxFzwoylHRUeXu6mKTn8iiJwLh5IrO/wjevgN2MXnxP5mcNGDrndlLab uiOAi0ncyo+Jg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Fri, 11 Jan 2019 19:42:27 +0900 Message-Id: <1547203347-19601-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1547203347-19601-1-git-send-email-yamada.masahiro@socionext.com> References: <1547203347-19601-1-git-send-email-yamada.masahiro@socionext.com> Cc: Eugeniu Rosca , Heinrich Schuchardt , Rasmus Villemoes , Alexander Graf Subject: [U-Boot] [PATCH 2/2] kbuild: add .SECONDARY special target to scripts/Kbuild.include X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Based on the following Linux commits: - 54a702f70589 ("kbuild: mark $(targets) as .SECONDARY and remove .PRECIOUS markers") - 8e9b61b293d9 ("kbuild: move .SECONDARY special target to Kbuild.include") GNU Make automatically deletes intermediate files that are updated in a chain of pattern rules. Example 1) %.dtb.o <- %.dtb.S <- %.dtb <- %.dts Example 2) %.o <- %.c <- %.c_shipped A couple of makefiles mark such targets as .PRECIOUS to prevent Make from deleting them, but the correct way is to use .SECONDARY. .SECONDARY Prerequisites of this special target are treated as intermediate files but are never automatically deleted. .PRECIOUS When make is interrupted during execution, it may delete the target file it is updating if the file was modified since make started. If you mark the file as precious, make will never delete the file if interrupted. Both can avoid deletion of intermediate files, but the difference is the behavior when Make is interrupted; .SECONDARY deletes the target, but .PRECIOUS does not. The use of .PRECIOUS is relatively rare since we do not want to keep partially constructed (possibly corrupted) targets. .SECONDARY with no prerequisites causes all targets to be treated as secondary. This agrees the policy of Kbuild. scripts/Kbuild.include seems a suitable place to add it because it is included from almost all sub-makes. Signed-off-by: Masahiro Yamada --- dts/Makefile | 3 --- examples/standalone/Makefile | 1 - post/lib_powerpc/fpu/Makefile | 3 --- scripts/Kbuild.include | 3 +++ scripts/Makefile.build | 2 -- scripts/Makefile.lib | 3 --- 6 files changed, 3 insertions(+), 12 deletions(-) diff --git a/dts/Makefile b/dts/Makefile index cd6e9a9..a7a6043 100644 --- a/dts/Makefile +++ b/dts/Makefile @@ -43,9 +43,6 @@ endif arch-dtbs: $(Q)$(MAKE) $(build)=$(ARCH_PATH) dtbs -.SECONDARY: $(obj)/dt.dtb.S $(obj)/dt-spl.dtb.S - - ifeq ($(CONFIG_SPL_BUILD),y) obj-$(CONFIG_OF_EMBED) := dt-spl.dtb.o # support "out-of-tree" build for dtb-spl diff --git a/examples/standalone/Makefile b/examples/standalone/Makefile index f01816f..0b17a91 100644 --- a/examples/standalone/Makefile +++ b/examples/standalone/Makefile @@ -26,7 +26,6 @@ LIB = $(obj)/libstubs.o LIBOBJS-$(CONFIG_PPC) += ppc_longjmp.o ppc_setjmp.o LIBOBJS-y += stubs.o -.SECONDARY: $(call objectify,$(COBJS)) targets += $(patsubst $(obj)/%,%,$(LIB)) $(COBJS) $(LIBOBJS-y) LIBOBJS := $(addprefix $(obj)/,$(LIBOBJS-y)) diff --git a/post/lib_powerpc/fpu/Makefile b/post/lib_powerpc/fpu/Makefile index 404eefc..9b2c1fa 100644 --- a/post/lib_powerpc/fpu/Makefile +++ b/post/lib_powerpc/fpu/Makefile @@ -11,9 +11,6 @@ targets += $(objs-before-objcopy) $(foreach m, $(objs-before-objcopy), $(eval CFLAGS_REMOVE_$m := -msoft-float)) ccflags-y := -mhard-float -fkeep-inline-functions -# Do not delete intermidiate files (*.o) -.SECONDARY: $(call objectify, $(objs-before-objcopy)) - obj-y := $(objs-before-objcopy:.o=_.o) OBJCOPYFLAGS := -R .gnu.attributes diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include index 460acd6..b8969e2 100644 --- a/scripts/Kbuild.include +++ b/scripts/Kbuild.include @@ -318,6 +318,9 @@ endif # delete partially updated (i.e. corrupted) files on error .DELETE_ON_ERROR: +# do not delete intermediate files automatically +.SECONDARY: + ifdef CONFIG_SPL_BUILD SPL_ := SPL_ ifeq ($(CONFIG_TPL_BUILD),y) diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 482ed0c..f7a0412 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -331,8 +331,6 @@ quiet_cmd_asn1_compiler = ASN.1 $@ cmd_asn1_compiler = $(objtree)/scripts/asn1_compiler $< \ $(subst .h,.c,$@) $(subst .c,.h,$@) -.PRECIOUS: $(objtree)/$(obj)/%-asn1.c $(objtree)/$(obj)/%-asn1.h - $(obj)/%-asn1.c $(obj)/%-asn1.h: $(src)/%.asn1 $(objtree)/scripts/asn1_compiler $(call cmd,asn1_compiler) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index a4f16bb..a5b57fc 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -214,7 +214,6 @@ endef quiet_cmd_flex = LEX $@ cmd_flex = $(LEX) -o$@ -L $< -.PRECIOUS: $(obj)/%.lex.c $(obj)/%.lex.c: $(src)/%.l FORCE $(call if_changed,flex) @@ -223,14 +222,12 @@ $(obj)/%.lex.c: $(src)/%.l FORCE quiet_cmd_bison = YACC $@ cmd_bison = $(YACC) -o$@ -t -l $< -.PRECIOUS: $(obj)/%.tab.c $(obj)/%.tab.c: $(src)/%.y FORCE $(call if_changed,bison) quiet_cmd_bison_h = YACC $@ cmd_bison_h = $(YACC) -o/dev/null --defines=$@ -t -l $< -.PRECIOUS: $(obj)/%.tab.h $(obj)/%.tab.h: $(src)/%.y FORCE $(call if_changed,bison_h)