From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 31 Mar 2018 04:53:57 +0000 (-1000)
Subject: Merge tag 'kbuild-fixes-v4.16-3' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.16~4
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/b5dbc28762fd3fd40ba76303be0c7f707826f982?hp=-c

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
---

b5dbc28762fd3fd40ba76303be0c7f707826f982
diff --combined Makefile
index 7ba478ab8c82,9e7f69c26aba..9f77440dcdfe
--- a/Makefile
+++ b/Makefile
@@@ -2,7 -2,7 +2,7 @@@
  VERSION = 4
  PATCHLEVEL = 16
  SUBLEVEL = 0
 -EXTRAVERSION = -rc5
 +EXTRAVERSION = -rc7
  NAME = Fearless Coyote
  
  # *DOCUMENTATION*
@@@ -487,6 -487,8 +487,8 @@@ CLANG_GCC_TC	:= --gcc-toolchain=$(GCC_T
  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 +745,6 @@@ KBUILD_CFLAGS += $(call cc-disable-warn
  # 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.
@@@ -826,15 -826,6 +826,15 @@@ KBUILD_CFLAGS += $(call cc-disable-warn
  # disable invalid "can't wrap" optimizations for signed / pointers
  KBUILD_CFLAGS	+= $(call cc-option,-fno-strict-overflow)
  
 +# clang sets -fmerge-all-constants by default as optimization, but this
 +# is non-conforming behavior for C and in fact breaks the kernel, so we
 +# need to disable it here generally.
 +KBUILD_CFLAGS	+= $(call cc-option,-fno-merge-all-constants)
 +
 +# for gcc -fno-merge-all-constants disables everything, but it is fine
 +# to have actual conforming behavior enabled.
 +KBUILD_CFLAGS	+= $(call cc-option,-fmerge-constants)
 +
  # Make sure -fstack-check isn't enabled (like gentoo apparently did)
  KBUILD_CFLAGS  += $(call cc-option,-fno-stack-check,)