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

Pull kbuild updates from Michal Marek:
 "Just a few kbuild core commits this time:

   - kallsyms fix for CONFIG_XIP_KERNEL

   - bashisms in scripts/link-vmlinux.sh fixed

   - workaround to make DEBUG_INFO_REDUCED more useful yet still space
     efficient

   - clang is not wrongly detected when cross-compiling"

* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  kbuild: include core debug info when DEBUG_INFO_REDUCED
  scripts: link-vmlinux: Don't pass page offset to kallsyms if XIP Kernel
  scripts: fix link-vmlinux.sh bash-ism
  Makefile: Fix detection of clang when cross-compiling

diff --combined Makefile
index 6c6f14628f329d0ba10f5632fb362c818c437ff5,2d225aa4d7e33690b84b4053e7cff3a8b77c5270..26ac0281bc74e9bd8a4a4aab1c7c7a0c19d4436c
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,7 -1,7 +1,7 @@@
  VERSION = 4
  PATCHLEVEL = 1
  SUBLEVEL = 0
 -EXTRAVERSION = -rc1
 +EXTRAVERSION =
  NAME = Hurr durr I'ma sheep
  
  # *DOCUMENTATION*
@@@ -215,6 -215,7 +215,6 @@@ VPATH              := $(srctree)$(if $(KBUILD_EXTMO
  
  export srctree objtree VPATH
  
 -
  # SUBARCH tells the usermode build what the underlying arch is.  That is set
  # first, and if a usermode build is happening, the "ARCH=um" on the command
  # line overrides the setting of ARCH below.  If a native build is happening,
@@@ -335,15 -336,6 +335,6 @@@ endi
  export KBUILD_MODULES KBUILD_BUILTIN
  export KBUILD_CHECKSRC KBUILD_SRC KBUILD_EXTMOD
  
- ifneq ($(CC),)
- ifeq ($(shell $(CC) -v 2>&1 | grep -c "clang version"), 1)
- COMPILER := clang
- else
- COMPILER := gcc
- endif
- export COMPILER
- endif
- 
  # We need some generic definitions (do not try to remake the file).
  scripts/Kbuild.include: ;
  include scripts/Kbuild.include
@@@ -670,6 -662,13 +661,13 @@@ endi
  endif
  KBUILD_CFLAGS += $(stackp-flag)
  
+ ifeq ($(shell $(CC) -v 2>&1 | grep -c "clang version"), 1)
+ COMPILER := clang
+ else
+ COMPILER := gcc
+ endif
+ export COMPILER
+ 
  ifeq ($(COMPILER),clang)
  KBUILD_CPPFLAGS += $(call cc-option,-Qunused-arguments,)
  KBUILD_CPPFLAGS += $(call cc-option,-Wno-unknown-warning-option,)
@@@ -1496,11 -1495,11 +1494,11 @@@ image_name
  # Clear a bunch of variables before executing the submake
  tools/: FORCE
        $(Q)mkdir -p $(objtree)/tools
 -      $(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(filter --j% -j,$(MAKEFLAGS))" O=$(objtree) subdir=tools -C $(src)/tools/
 +      $(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(filter --j% -j,$(MAKEFLAGS))" O=$(O) subdir=tools -C $(src)/tools/
  
  tools/%: FORCE
        $(Q)mkdir -p $(objtree)/tools
 -      $(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(filter --j% -j,$(MAKEFLAGS))" O=$(objtree) subdir=tools -C $(src)/tools/ $*
 +      $(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(filter --j% -j,$(MAKEFLAGS))" O=$(O) subdir=tools -C $(src)/tools/ $*
  
  # Single targets
  # ---------------------------------------------------------------------------

diff --combined lib/Makefile
index ff37c8c2f7b24fbaa0bb6e04faa8aef5edd3dbbc,c918538110ed4e832d3364afad66357b010b705c..6897b527581a8d9fcb65b4a2e01815d3d34498ed
--- 1/lib/Makefile
--- 2/lib/Makefile
+++ b/lib/Makefile
@@@ -45,6 -45,9 +45,9 @@@ CFLAGS_kobject.o += -DDEBU
  CFLAGS_kobject_uevent.o += -DDEBUG
  endif
  
+ obj-$(CONFIG_DEBUG_INFO_REDUCED) += debug_info.o
+ CFLAGS_debug_info.o += $(call cc-option, -femit-struct-debug-detailed=any)
+ 
  obj-$(CONFIG_GENERIC_IOMAP) += iomap.o
  obj-$(CONFIG_GENERIC_PCI_IOMAP) += pci_iomap.o
  obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o
@@@ -78,8 -81,6 +81,8 @@@ obj-$(CONFIG_LIBCRC32C)       += libcrc32c.
  obj-$(CONFIG_CRC8)    += crc8.o
  obj-$(CONFIG_GENERIC_ALLOCATOR) += genalloc.o
  
 +obj-$(CONFIG_842_COMPRESS) += 842/
 +obj-$(CONFIG_842_DECOMPRESS) += 842/
  obj-$(CONFIG_ZLIB_INFLATE) += zlib_inflate/
  obj-$(CONFIG_ZLIB_DEFLATE) += zlib_deflate/
  obj-$(CONFIG_REED_SOLOMON) += reed_solomon/