From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 25 Aug 2018 20:40:38 +0000 (-0700)
Subject: Merge tag 'kbuild-v4.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1bc276775d93faf42a3bb1c684cdb838ded8be56;p=linux.git

Merge tag 'kbuild-v4.19-2' of git://git./linux/kernel/git/masahiroy/linux-kbuild

Pull more Kbuild updates from Masahiro Yamada:

 - add build_{menu,n,g,x}config targets for compile-testing Kconfig

 - fix and improve recursive dependency detection in Kconfig

 - fix parallel building of menuconfig/nconfig

 - fix syntax error in clang-version.sh

 - suppress distracting log from syncconfig

 - remove obsolete "rpm" target

 - remove VMLINUX_SYMBOL(_STR) macro entirely

 - fix microblaze build with CONFIG_DYNAMIC_FTRACE

 - move compiler test for dead code/data elimination to Kconfig

 - rename well-known LDFLAGS variable to KBUILD_LDFLAGS

 - misc fixes and cleanups

* tag 'kbuild-v4.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  kbuild: rename LDFLAGS to KBUILD_LDFLAGS
  kbuild: pass LDFLAGS to recordmcount.pl
  kbuild: test dead code/data elimination support in Kconfig
  initramfs: move gen_initramfs_list.sh from scripts/ to usr/
  vmlinux.lds.h: remove stale <linux/export.h> include
  export.h: remove VMLINUX_SYMBOL() and VMLINUX_SYMBOL_STR()
  Coccinelle: remove pci_alloc_consistent semantic to detect in zalloc-simple.cocci
  kbuild: make sorting initramfs contents independent of locale
  kbuild: remove "rpm" target, which is alias of "rpm-pkg"
  kbuild: Fix LOADLIBES rename in Documentation/kbuild/makefiles.txt
  kconfig: suppress "configuration written to .config" for syncconfig
  kconfig: fix "Can't open ..." in parallel build
  kbuild: Add a space after `!` to prevent parsing as file pattern
  scripts: modpost: check memory allocation results
  kconfig: improve the recursive dependency report
  kconfig: report recursive dependency involving 'imply'
  kconfig: error out when seeing recursive dependency
  kconfig: add build-only configurator targets
  scripts/dtc: consolidate include path options in Makefile
---

1bc276775d93faf42a3bb1c684cdb838ded8be56
diff --cc arch/h8300/Makefile
index cc12b162c2228,f9cbbb13853f2..58634e6bae928
--- a/arch/h8300/Makefile
+++ b/arch/h8300/Makefile
@@@ -22,10 -20,8 +22,10 @@@ KBUILD_CFLAGS += -mint32 -fno-builti
  KBUILD_CFLAGS += -D__linux__
  KBUILD_CFLAGS += -DUTS_SYSNAME=\"uClinux\"
  KBUILD_AFLAGS += $(aflags-y)
- LDFLAGS += $(ldflags-y)
+ KBUILD_LDFLAGS += $(ldflags-y)
  
 +CHECKFLAGS += -msize-long
 +
  ifeq ($(CROSS_COMPILE),)
  CROSS_COMPILE := h8300-unknown-linux-
  endif
diff --cc include/linux/export.h
index ae072bc5aacf8,c363bde21bbe6..ce764a5d2ee45
--- a/include/linux/export.h
+++ b/include/linux/export.h
@@@ -10,14 -10,13 +10,7 @@@
   * hackers place grumpy comments in header files.
   */
  
- #define __VMLINUX_SYMBOL(x) x
- #define __VMLINUX_SYMBOL_STR(x) #x
- 
- /* Indirect, so macros are expanded before pasting. */
- #define VMLINUX_SYMBOL(x) __VMLINUX_SYMBOL(x)
- #define VMLINUX_SYMBOL_STR(x) __VMLINUX_SYMBOL_STR(x)
- 
  #ifndef __ASSEMBLY__
 -struct kernel_symbol
 -{
 -	unsigned long value;
 -	const char *name;
 -};
 -
  #ifdef MODULE
  extern struct module __this_module;
  #define THIS_MODULE (&__this_module)