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

Pull kbuild changes from Michal Marek:
 - fix make -s detection with make-4.0
 - fix for scripts/setlocalversion when the kernel repository is a
   submodule
 - do not hardcode ';' in macros that expand to assembler code, as some
   architectures' assemblers use a different character for newline
 - Fix passing --gdwarf-2 to the assembler

* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  frv: Remove redundant debugging info flag
  mn10300: Remove redundant debugging info flag
  kbuild: Fix debugging info generation for .S files
  arch: use ASM_NL instead of ';' for assembler new line character in the macro
  kbuild: Fix silent builds with make-4
  Fix detectition of kernel git repository in setlocalversion script [take #2]

diff --combined Makefile
index 455fd484b20edb92a0c916c1be3cc7adffc6cfa4,98becb20a79de95bd406143a47435c365d899338..df81a4c34a22df6ba83dd3d1738e870333c42bc4
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,7 -1,7 +1,7 @@@
  VERSION = 3
  PATCHLEVEL = 13
  SUBLEVEL = 0
 -EXTRAVERSION = -rc1
 +EXTRAVERSION =
  NAME = One Giant Leap for Frogkind
  
  # *DOCUMENTATION*
@@@ -311,9 -311,15 +311,15 @@@ endi
  # If the user is running make -s (silent mode), suppress echoing of
  # commands
  
+ ifneq ($(filter 4.%,$(MAKE_VERSION)),)        # make-4
+ ifneq ($(filter %s ,$(firstword x$(MAKEFLAGS))),)
+   quiet=silent_
+ endif
+ else                                  # make-3.8x
  ifneq ($(filter s% -s%,$(MAKEFLAGS)),)
    quiet=silent_
  endif
+ endif
  
  export quiet Q KBUILD_VERBOSE
  
@@@ -595,24 -601,10 +601,24 @@@ ifneq ($(CONFIG_FRAME_WARN),0
  KBUILD_CFLAGS += $(call cc-option,-Wframe-larger-than=${CONFIG_FRAME_WARN})
  endif
  
 -# Force gcc to behave correct even for buggy distributions
 -ifndef CONFIG_CC_STACKPROTECTOR
 -KBUILD_CFLAGS += $(call cc-option, -fno-stack-protector)
 +# Handle stack protector mode.
 +ifdef CONFIG_CC_STACKPROTECTOR_REGULAR
 +  stackp-flag := -fstack-protector
 +  ifeq ($(call cc-option, $(stackp-flag)),)
 +    $(warning Cannot use CONFIG_CC_STACKPROTECTOR: \
 +            -fstack-protector not supported by compiler))
 +  endif
 +else ifdef CONFIG_CC_STACKPROTECTOR_STRONG
 +  stackp-flag := -fstack-protector-strong
 +  ifeq ($(call cc-option, $(stackp-flag)),)
 +    $(warning Cannot use CONFIG_CC_STACKPROTECTOR_STRONG: \
 +            -fstack-protector-strong not supported by compiler)
 +  endif
 +else
 +  # Force off for distro compilers that enable stack protector by default.
 +  stackp-flag := $(call cc-option, -fno-stack-protector)
  endif
 +KBUILD_CFLAGS += $(stackp-flag)
  
  # This warning generated too much noise in a regular build.
  # Use make W=1 to enable this warning (see scripts/Makefile.build)
@@@ -633,7 -625,7 +639,7 @@@ endi
  
  ifdef CONFIG_DEBUG_INFO
  KBUILD_CFLAGS += -g
- KBUILD_AFLAGS += -gdwarf-2
+ KBUILD_AFLAGS += -Wa,--gdwarf-2
  endif
  
  ifdef CONFIG_DEBUG_INFO_REDUCED
@@@ -746,15 -738,19 +752,15 @@@ export mod_strip_cm
  # Select initial ramdisk compression format, default is gzip(1).
  # This shall be used by the dracut(8) tool while creating an initramfs image.
  #
 -INITRD_COMPRESS=gzip
 -ifeq ($(CONFIG_RD_BZIP2), y)
 -        INITRD_COMPRESS=bzip2
 -else ifeq ($(CONFIG_RD_LZMA), y)
 -        INITRD_COMPRESS=lzma
 -else ifeq ($(CONFIG_RD_XZ), y)
 -        INITRD_COMPRESS=xz
 -else ifeq ($(CONFIG_RD_LZO), y)
 -        INITRD_COMPRESS=lzo
 -else ifeq ($(CONFIG_RD_LZ4), y)
 -        INITRD_COMPRESS=lz4
 -endif
 -export INITRD_COMPRESS
 +INITRD_COMPRESS-y                  := gzip
 +INITRD_COMPRESS-$(CONFIG_RD_BZIP2) := bzip2
 +INITRD_COMPRESS-$(CONFIG_RD_LZMA)  := lzma
 +INITRD_COMPRESS-$(CONFIG_RD_XZ)    := xz
 +INITRD_COMPRESS-$(CONFIG_RD_LZO)   := lzo
 +INITRD_COMPRESS-$(CONFIG_RD_LZ4)   := lz4
 +# do not export INITRD_COMPRESS, since we didn't actually
 +# choose a sane default compression above.
 +# export INITRD_COMPRESS := $(INITRD_COMPRESS-y)
  
  ifdef CONFIG_MODULE_SIG_ALL
  MODSECKEY = ./signing_key.priv