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

Merge tag 'kbuild-fixes-v4.16-3' of... 

Merge tag 'kbuild-fixes-v4.16-3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

Pull Kbuild fixes from Masahiro Yamada:

 - fix missed rebuild of TRIM_UNUSED_KSYMS

 - fix rpm-pkg for GNU tar >= 1.29

 - include scripts/dtc/include-prefixes/* to kernel header deb-pkg

 - add -no-integrated-as option ealier to fix building with Clang

 - fix netfilter Makefile for parallel building

* tag 'kbuild-fixes-v4.16-3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  netfilter: nf_nat_snmp_basic: add correct dependency to Makefile
  kbuild: rpm-pkg: Support GNU tar >= 1.29
  builddeb: Fix header package regarding dtc source links
  kbuild: set no-integrated-as before incl. arch Makefile
  kbuild: make scripts/adjust_autoksyms.sh robust against timestamp races
parents a44406ec 28913ee8

Makefile

+2 −2
Original line number Diff line number Diff line
@@ -487,6 +487,8 @@ CLANG_GCC_TC := --gcc-toolchain=$(GCC_TOOLCHAIN) 
endif

KBUILD_CFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC)

KBUILD_AFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC)

KBUILD_CFLAGS += $(call cc-option, -no-integrated-as)

KBUILD_AFLAGS += $(call cc-option, -no-integrated-as)

endif



RETPOLINE_CFLAGS_GCC := -mindirect-branch=thunk-extern -mindirect-branch-register
@@ -743,8 +745,6 @@ KBUILD_CFLAGS += $(call cc-disable-warning, tautological-compare) 
# See modpost pattern 2

KBUILD_CFLAGS += $(call cc-option, -mno-global-merge,)

KBUILD_CFLAGS += $(call cc-option, -fcatch-undefined-behavior)

KBUILD_CFLAGS += $(call cc-option, -no-integrated-as)

KBUILD_AFLAGS += $(call cc-option, -no-integrated-as)

else



# These warnings generated too much noise in a regular build.

net/ipv4/netfilter/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ obj-$(CONFIG_NF_NAT_H323) += nf_nat_h323.o 
obj-$(CONFIG_NF_NAT_PPTP) += nf_nat_pptp.o



nf_nat_snmp_basic-y := nf_nat_snmp_basic-asn1.o nf_nat_snmp_basic_main.o

nf_nat_snmp_basic-y : nf_nat_snmp_basic-asn1.h nf_nat_snmp_basic-asn1.c

$(obj)/nf_nat_snmp_basic_main.o: $(obj)/nf_nat_snmp_basic-asn1.h

obj-$(CONFIG_NF_NAT_SNMP_BASIC) += nf_nat_snmp_basic.o

clean-files := nf_nat_snmp_basic-asn1.c nf_nat_snmp_basic-asn1.h

scripts/adjust_autoksyms.sh

+7 −0
Original line number Diff line number Diff line
@@ -84,6 +84,13 @@ while read sympath; do 
	depfile="include/config/ksym/${sympath}.h"

	mkdir -p "$(dirname "$depfile")"

	touch "$depfile"

	# Filesystems with coarse time precision may create timestamps

	# equal to the one from a file that was very recently built and that

	# needs to be rebuild. Let's guard against that by making sure our

	# dep files are always newer than the first file we created here.

	while [ ! "$depfile" -nt "$new_ksyms_file" ]; do

		touch "$depfile"

	done

	echo $((count += 1))

done | tail -1 )

changed=${changed:-0}

scripts/package/builddeb

+1 −1
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ fi 


# Build kernel header package

(cd $srctree; find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl) > "$objtree/debian/hdrsrcfiles"

(cd $srctree; find arch/*/include include scripts -type f) >> "$objtree/debian/hdrsrcfiles"

(cd $srctree; find arch/*/include include scripts -type f -o -type l) >> "$objtree/debian/hdrsrcfiles"

(cd $srctree; find arch/$SRCARCH -name module.lds -o -name Kbuild.platforms -o -name Platform) >> "$objtree/debian/hdrsrcfiles"

(cd $srctree; find $(find arch/$SRCARCH -name include -o -name scripts -type d) -type f) >> "$objtree/debian/hdrsrcfiles"

if grep -q '^CONFIG_STACK_VALIDATION=y' $KCONFIG_CONFIG ; then

scripts/package/mkspec

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ $M make %{?_smp_mflags} INSTALL_MOD_PATH=%{buildroot} KBUILD_SRC= modules_instal 
$S$M	rm -f %{buildroot}/lib/modules/$KERNELRELEASE/build

$S$M	rm -f %{buildroot}/lib/modules/$KERNELRELEASE/source

$S$M	mkdir -p %{buildroot}/usr/src/kernels/$KERNELRELEASE

$S$M	tar cf - . $EXCLUDES | tar xf - -C %{buildroot}/usr/src/kernels/$KERNELRELEASE

$S$M	tar cf - $EXCLUDES . | tar xf - -C %{buildroot}/usr/src/kernels/$KERNELRELEASE

$S$M	cd %{buildroot}/lib/modules/$KERNELRELEASE

$S$M	ln -sf /usr/src/kernels/$KERNELRELEASE build

$S$M	ln -sf /usr/src/kernels/$KERNELRELEASE source

CRA Git | Maintained and supported by SUSTech CRA and CCSE