Skip to content

Commit ca71b3b

Browse files
committed
Merge tag 'kbuild-v4.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull more Kbuild updates from Masahiro Yamada: - pass HOSTLDFLAGS when compiling single .c host programs - build genksyms lexer and parser files instead of using shipped versions - rename *-asn1.[ch] to *.asn1.[ch] for suffix consistency - let the top .gitignore globally ignore artifacts generated by flex, bison, and asn1_compiler - let the top Makefile globally clean artifacts generated by flex, bison, and asn1_compiler - use safer .SECONDARY marker instead of .PRECIOUS to prevent intermediate files from being removed - support -fmacro-prefix-map option to make __FILE__ a relative path - fix # escaping to prepare for the future GNU Make release - clean up deb-pkg by using debian tools instead of handrolled source/changes generation - improve rpm-pkg portability by supporting kernel-install as a fallback of new-kernel-pkg - extend Kconfig listnewconfig target to provide more information * tag 'kbuild-v4.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: kconfig: extend output of 'listnewconfig' kbuild: rpm-pkg: use kernel-install as a fallback for new-kernel-pkg Kbuild: fix # escaping in .cmd files for future Make kbuild: deb-pkg: split generating packaging and build kbuild: use -fmacro-prefix-map to make __FILE__ a relative path kbuild: mark $(targets) as .SECONDARY and remove .PRECIOUS markers kbuild: rename *-asn1.[ch] to *.asn1.[ch] kbuild: clean up *-asn1.[ch] patterns from top-level Makefile .gitignore: move *-asn1.[ch] patterns to the top-level .gitignore kbuild: add %.dtb.S and %.dtb to 'targets' automatically kbuild: add %.lex.c and %.tab.[ch] to 'targets' automatically genksyms: generate lexer and parser during build instead of shipping kbuild: clean up *.lex.c and *.tab.[ch] patterns from top-level Makefile .gitignore: move *.lex.c *.tab.[ch] patterns to the top-level .gitignore kbuild: use HOSTLDFLAGS for single .c executables
2 parents 9fb71c2 + 17baab6 commit ca71b3b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+316
-5164
lines changed

.gitignore

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#
1212
.*
1313
*.a
14+
*.asn1.[ch]
1415
*.bin
1516
*.bz2
1617
*.c.[012]*.*
@@ -22,6 +23,7 @@
2223
*.gz
2324
*.i
2425
*.ko
26+
*.lex.c
2527
*.ll
2628
*.lst
2729
*.lz4
@@ -37,6 +39,7 @@
3739
*.so.dbg
3840
*.su
3941
*.symtypes
42+
*.tab.[ch]
4043
*.tar
4144
*.xz
4245
Module.symvers
@@ -129,7 +132,3 @@ all.config
129132

130133
# Kdevelop4
131134
*.kdev4
132-
133-
#Automatically generated by ASN.1 compiler
134-
net/ipv4/netfilter/nf_nat_snmp_basic-asn1.c
135-
net/ipv4/netfilter/nf_nat_snmp_basic-asn1.h

Makefile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -846,6 +846,9 @@ KBUILD_CFLAGS += $(call cc-option,-Werror=incompatible-pointer-types)
846846
# Require designated initializers for all marked structures
847847
KBUILD_CFLAGS += $(call cc-option,-Werror=designated-init)
848848

849+
# change __FILE__ to the relative path from the srctree
850+
KBUILD_CFLAGS += $(call cc-option,-fmacro-prefix-map=$(srctree)/=)
851+
849852
# use the deterministic mode of AR if available
850853
KBUILD_ARFLAGS := $(call ar-option,D)
851854

@@ -1615,6 +1618,8 @@ clean: $(clean-dirs)
16151618
-o -name '*.dwo' -o -name '*.lst' \
16161619
-o -name '*.su' \
16171620
-o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \
1621+
-o -name '*.lex.c' -o -name '*.tab.[ch]' \
1622+
-o -name '*.asn1.[ch]' \
16181623
-o -name '*.symtypes' -o -name 'modules.order' \
16191624
-o -name modules.builtin -o -name '.tmp_*.o.*' \
16201625
-o -name .cache.mk \

arch/arc/boot/dts/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ endif
99
obj-y += $(builtindtb-y).dtb.o
1010
dtb-y := $(builtindtb-y).dtb
1111

12-
.SECONDARY: $(obj)/$(builtindtb-y).dtb.S
13-
1412
# for CONFIG_OF_ALL_DTBS test
1513
dtstree := $(srctree)/$(src)
1614
dtb- := $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts))

arch/arm/crypto/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,4 +67,4 @@ $(src)/sha512-core.S_shipped: $(src)/sha512-armv4.pl
6767
$(call cmd,perl)
6868
endif
6969

70-
.PRECIOUS: $(obj)/sha256-core.S $(obj)/sha512-core.S
70+
targets += sha256-core.S sha512-core.S

arch/arm64/crypto/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,4 +78,4 @@ $(src)/sha512-core.S_shipped: $(src)/sha512-armv8.pl
7878
$(call cmd,perlasm)
7979
endif
8080

81-
.PRECIOUS: $(obj)/sha256-core.S $(obj)/sha512-core.S
81+
targets += sha256-core.S sha512-core.S

arch/sparc/vdso/Makefile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@ vdso_img_cfiles := $(vdso_img-y:%=vdso-image-%.c)
2929
vdso_img_sodbg := $(vdso_img-y:%=vdso%.so.dbg)
3030
obj-y += $(vdso_img_objs)
3131
targets += $(vdso_img_cfiles)
32-
targets += $(vdso_img_sodbg)
33-
.SECONDARY: $(vdso_img-y:%=$(obj)/vdso-image-%.c) \
34-
$(vdso_img-y:%=$(obj)/vdso%.so)
32+
targets += $(vdso_img_sodbg) $(vdso_img-y:%=vdso%.so)
3533

3634
export CPPFLAGS_vdso.lds += -P -C
3735

arch/x86/entry/vdso/Makefile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,7 @@ vdso_img_cfiles := $(vdso_img-y:%=vdso-image-%.c)
4242
vdso_img_sodbg := $(vdso_img-y:%=vdso%.so.dbg)
4343
obj-y += $(vdso_img_objs)
4444
targets += $(vdso_img_cfiles)
45-
targets += $(vdso_img_sodbg)
46-
.SECONDARY: $(vdso_img-y:%=$(obj)/vdso-image-%.c) \
47-
$(vdso_img-y:%=$(obj)/vdso%.so)
45+
targets += $(vdso_img_sodbg) $(vdso_img-y:%=vdso%.so)
4846

4947
export CPPFLAGS_vdso.lds += -P -C
5048

crypto/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

crypto/Makefile

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,12 @@ dh_generic-y := dh.o
3535
dh_generic-y += dh_helper.o
3636
obj-$(CONFIG_CRYPTO_DH) += dh_generic.o
3737

38-
$(obj)/rsapubkey-asn1.o: $(obj)/rsapubkey-asn1.c $(obj)/rsapubkey-asn1.h
39-
$(obj)/rsaprivkey-asn1.o: $(obj)/rsaprivkey-asn1.c $(obj)/rsaprivkey-asn1.h
40-
$(obj)/rsa_helper.o: $(obj)/rsapubkey-asn1.h $(obj)/rsaprivkey-asn1.h
41-
clean-files += rsapubkey-asn1.c rsapubkey-asn1.h
42-
clean-files += rsaprivkey-asn1.c rsaprivkey-asn1.h
43-
44-
rsa_generic-y := rsapubkey-asn1.o
45-
rsa_generic-y += rsaprivkey-asn1.o
38+
$(obj)/rsapubkey.asn1.o: $(obj)/rsapubkey.asn1.c $(obj)/rsapubkey.asn1.h
39+
$(obj)/rsaprivkey.asn1.o: $(obj)/rsaprivkey.asn1.c $(obj)/rsaprivkey.asn1.h
40+
$(obj)/rsa_helper.o: $(obj)/rsapubkey.asn1.h $(obj)/rsaprivkey.asn1.h
41+
42+
rsa_generic-y := rsapubkey.asn1.o
43+
rsa_generic-y += rsaprivkey.asn1.o
4644
rsa_generic-y += rsa.o
4745
rsa_generic-y += rsa_helper.o
4846
rsa_generic-y += rsa-pkcs1pad.o

crypto/asymmetric_keys/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)