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

Commit ca71b3ba authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 9fb71c2f 17baab68

.gitignore

+3 −4
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#

.*

*.a

*.asn1.[ch]

*.bin

*.bz2

*.c.[012]*.*
@@ -22,6 +23,7 @@ 
*.gz

*.i

*.ko

*.lex.c

*.ll

*.lst

*.lz4
@@ -37,6 +39,7 @@ 
*.so.dbg

*.su

*.symtypes

*.tab.[ch]

*.tar

*.xz

Module.symvers
@@ -129,7 +132,3 @@ all.config 


# Kdevelop4

*.kdev4
 


#Automatically generated by ASN.1 compiler

net/ipv4/netfilter/nf_nat_snmp_basic-asn1.c

net/ipv4/netfilter/nf_nat_snmp_basic-asn1.h

Makefile

+5 −0
Original line number Diff line number Diff line
@@ -846,6 +846,9 @@ KBUILD_CFLAGS += $(call cc-option,-Werror=incompatible-pointer-types) 
# Require designated initializers for all marked structures

KBUILD_CFLAGS   += $(call cc-option,-Werror=designated-init)



# change __FILE__ to the relative path from the srctree

KBUILD_CFLAGS	+= $(call cc-option,-fmacro-prefix-map=$(srctree)/=)



# use the deterministic mode of AR if available

KBUILD_ARFLAGS := $(call ar-option,D)
@@ -1615,6 +1618,8 @@ clean: $(clean-dirs) 
		-o -name '*.dwo' -o -name '*.lst' \

		-o -name '*.su'  \

		-o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \

		-o -name '*.lex.c' -o -name '*.tab.[ch]' \

		-o -name '*.asn1.[ch]' \

		-o -name '*.symtypes' -o -name 'modules.order' \

		-o -name modules.builtin -o -name '.tmp_*.o.*' \

		-o -name .cache.mk \

arch/arc/boot/dts/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -9,8 +9,6 @@ endif 
obj-y   += $(builtindtb-y).dtb.o

dtb-y := $(builtindtb-y).dtb



.SECONDARY: $(obj)/$(builtindtb-y).dtb.S



# for CONFIG_OF_ALL_DTBS test

dtstree	:= $(srctree)/$(src)

dtb-	:= $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts))

arch/arm/crypto/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -67,4 +67,4 @@ $(src)/sha512-core.S_shipped: $(src)/sha512-armv4.pl 
	$(call cmd,perl)

endif



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

arch/arm64/crypto/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -78,4 +78,4 @@ $(src)/sha512-core.S_shipped: $(src)/sha512-armv8.pl 
	$(call cmd,perlasm)

endif



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