diff options
author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-12-30 22:59:20 +0900 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-01-03 10:17:16 +0100 |
commit | b2a09344350508f6431b19733dfe4b8cc4feeea5 (patch) | |
tree | 8cb20130e0229595b4e84edbc5290905be59b33f | |
parent | 8b91264202b60e44a2501f372802f541f0ad1cbd (diff) | |
download | barebox-b2a09344350508f6431b19733dfe4b8cc4feeea5.tar.gz barebox-b2a09344350508f6431b19733dfe4b8cc4feeea5.tar.xz |
kbuild: add .SECONDARY special target
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")
This consolidates those two commits and adjusts commit log for barebox.
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
arch/arm/crypto/Makefile marks 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.
I deleted 'SECONDARY' (no dot) from images/Makefile, which I guess
a typo.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r-- | arch/arm/crypto/Makefile | 2 | ||||
-rw-r--r-- | images/Makefile | 2 | ||||
-rw-r--r-- | scripts/Kbuild.include | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/crypto/Makefile b/arch/arm/crypto/Makefile index 372bf8d699..fda4eeafec 100644 --- a/arch/arm/crypto/Makefile +++ b/arch/arm/crypto/Makefile @@ -13,5 +13,3 @@ quiet_cmd_perl = PERL $@ $(src)/sha256-core.S_shipped: $(src)/sha256-armv4.pl $(call cmd,perl) - -.PRECIOUS: $(obj)/sha256-core.S diff --git a/images/Makefile b/images/Makefile index c4b2a483fb..ca0ee2ba49 100644 --- a/images/Makefile +++ b/images/Makefile @@ -111,8 +111,6 @@ targets += $(patsubst %,%.pbl,$(pblb-y)) targets += $(patsubst %,%.s,$(pblb-y)) targets += $(foreach m, $(image-y), $(FILE_$(m))) -SECONDARY: $(addprefix $(obj)/,$(targets)) - # Images with full paths image-y-path := $(addprefix $(obj)/,$(image-y)) # File will have a list of images generated diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include index 3b719492db..edfe27ed1b 100644 --- a/scripts/Kbuild.include +++ b/scripts/Kbuild.include @@ -282,3 +282,6 @@ endif # delete partially updated (i.e. corrupted) files on error .DELETE_ON_ERROR: + +# do not delete intermediate files automatically +.SECONDARY: |