From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 14 Oct 2014 07:22:26 +0000 (+0200)
Subject: Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~13576
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=f33a3faa25c569d2a7640de66bea69e15c12ecd1;p=mirror_ubuntu-focal-kernel.git

Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

Pull kbuild changes from Michal Marek:
 - fix for handling dependencies of *-objs targets by Masahiro Yamada
 - lots of cleanups in the kbuild machinery, also by Masahiro
 - fixes for the kconfig build to use an UTF-8 capable ncurses library
   if possible and to build on not-so-standard installs
 - some more minor fixes

* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  kbuild: Do not reference *-n variables in the Makefile
  kbuild: simplify build, clean, modbuiltin shorthands
  kbuild: arm: Do not define "comma" twice
  kbuild: remove obj-n and lib-n handling
  kbuild: remove unnecessary variable initializaions
  kbuild: remove unnecessary "obj- := dummy.o" trick
  kbuild: handle C=... and M=... after entering into build directory
  kbuild: use $(Q) for sub-make target
  kbuild: fake the "Entering directory ..." message more simply
  kconfig/lxdialog: get ncurses CFLAGS with pkg-config
  kconfig: nconfig: fix multi-byte UTF handling
  kconfig: lxdialog: fix spelling
  kbuild: Make scripts executable
  kbuild: remove redundant clean-files from scripts/kconfig/Makefile
  kbuild: refactor script/kconfig/Makefile
  kbuild: handle the dependency of multi-objs hostprogs appropriately
  kbuild: handle multi-objs dependency appropriately
---

f33a3faa25c569d2a7640de66bea69e15c12ecd1
diff --cc arch/arm/mach-at91/Makefile
index ac99d87ffefe,75033839fc08..1b9ae0257a6e
--- a/arch/arm/mach-at91/Makefile
+++ b/arch/arm/mach-at91/Makefile
@@@ -2,13 -2,12 +2,10 @@@
  # Makefile for the linux kernel.
  #
  
 -obj-y		:= irq.o gpio.o setup.o sysirq_mask.o
 +obj-y		:= gpio.o setup.o sysirq_mask.o
- obj-m		:=
- obj-n		:=
- obj-		:=
  
 +obj-$(CONFIG_OLD_IRQ_AT91)	+= irq.o
  obj-$(CONFIG_OLD_CLK_AT91)	+= clock.o
 -obj-$(CONFIG_AT91_SAM9_ALT_RESET) += at91sam9_alt_reset.o
 -obj-$(CONFIG_AT91_SAM9G45_RESET) += at91sam9g45_reset.o
 -obj-$(CONFIG_AT91_SAM9_TIME)	+= at91sam926x_time.o
  obj-$(CONFIG_SOC_AT91SAM9)	+= sam9_smc.o
  
  # CPU-specific support
diff --cc drivers/clk/shmobile/Makefile
index 531d4f6c7050,9aab51c8d159..960bf22d42ae
--- a/drivers/clk/shmobile/Makefile
+++ b/drivers/clk/shmobile/Makefile
@@@ -4,8 -4,5 +4,6 @@@ obj-$(CONFIG_ARCH_R8A7740)		+= clk-r8a7
  obj-$(CONFIG_ARCH_R8A7779)		+= clk-r8a7779.o
  obj-$(CONFIG_ARCH_R8A7790)		+= clk-rcar-gen2.o
  obj-$(CONFIG_ARCH_R8A7791)		+= clk-rcar-gen2.o
 +obj-$(CONFIG_ARCH_R8A7794)		+= clk-rcar-gen2.o
  obj-$(CONFIG_ARCH_SHMOBILE_MULTI)	+= clk-div6.o
  obj-$(CONFIG_ARCH_SHMOBILE_MULTI)	+= clk-mstp.o
- # for emply built-in.o
- obj-n	:= dummy
diff --cc scripts/headers_install.sh
index fdebd66f8fc1,5de5660cb708..fdebd66f8fc1
mode 100644,100755..100755
--- a/scripts/headers_install.sh
+++ b/scripts/headers_install.sh