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]
author: Linus Torvalds <torvalds@linux-foundation.org> 2014-01-30 19:58:05 -0500
committer: Linus Torvalds <torvalds@linux-foundation.org> 2014-01-30 19:58:05 -0500
commit: 597690cd02684b7e4904288e4b85797123a5093f (patch)
tree: f5d2a84771b9d532f2fe99a9cf4e0b51f5432e26
parent: 53d8ab29f8f6d67e37857b68189b38fa3d87dd8e (diff)
parent: bf705ad0c364ea375b3a5e89fa8a0e1c1fde994c (diff)
6 files changed, 23 insertions, 24 deletions
diff --git a/Makefile b/Makefile
index 455fd484b20e..df81a4c34a22 100644
--- a/Makefile
+++ b/Makefile
@@ -311,9 +311,15 @@ endif
 # 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
@@ -633,7 +639,7 @@ endif
 ifdef CONFIG_DEBUG_INFO
 KBUILD_CFLAGS   += -g
-KBUILD_AFLAGS   += -gdwarf-2
+KBUILD_AFLAGS   += -Wa,--gdwarf-2
 endif
 ifdef CONFIG_DEBUG_INFO_REDUCED
diff --git a/arch/arc/include/asm/linkage.h b/arch/arc/include/asm/linkage.h
index 0283e9e44e0d..66ee5527aefc 100644
--- a/arch/arc/include/asm/linkage.h
+++ b/arch/arc/include/asm/linkage.h
@@ -11,6 +11,8 @@
 #ifdef __ASSEMBLY__
+#define ASM_NL           `      /* use '`' to mark new line in macro */
 /* Can't use the ENTRY macro in linux/linkage.h
 * gas considers ';' as comment vs. newline
 */
diff --git a/arch/frv/Makefile b/arch/frv/Makefile
index 4d1b1e9baef1..2a8fb730d1ca 100644
--- a/arch/frv/Makefile
+++ b/arch/frv/Makefile
@@ -74,13 +74,6 @@ KBUILD_CFLAGS	+= -mno-fdpic -mgpr-32 -msoft-float -mno-media
 KBUILD_CFLAGS   += -ffixed-fcc3 -ffixed-cc3 -ffixed-gr15 -ffixed-icc2
 KBUILD_AFLAGS   += -mno-fdpic
-# make sure the .S files get compiled with debug info
-# and disable optimisations that are unhelpful whilst debugging
-ifdef CONFIG_DEBUG_INFO
-#KBUILD_CFLAGS  += -O1
-KBUILD_AFLAGS   += -Wa,--gdwarf2
-endif
 head-y          := arch/frv/kernel/head.o
 core-y          += arch/frv/kernel/ arch/frv/mm/
diff --git a/arch/mn10300/Makefile b/arch/mn10300/Makefile
index a3d0fef3b126..3f1ea5ddc402 100644
--- a/arch/mn10300/Makefile
+++ b/arch/mn10300/Makefile
@@ -92,14 +92,6 @@ define archhelp
  echo  '* zImage        - Compressed kernel image (arch/$(ARCH)/boot/zImage)'
 endef
-# If you make sure the .S files get compiled with debug info,
-# uncomment the following to disable optimisations
-# that are unhelpful whilst debugging.
-ifdef CONFIG_DEBUG_INFO
-#KBUILD_CFLAGS  += -O1
-KBUILD_AFLAGS   += -Wa,--gdwarf2
-endif
 #
 # include the appropriate processor- and unit-specific headers
 #
diff --git a/include/linux/linkage.h b/include/linux/linkage.h
index d3e8ad23a8e0..a6a42dd02466 100644
--- a/include/linux/linkage.h
+++ b/include/linux/linkage.h
@@ -6,6 +6,11 @@
 #include <linux/export.h>
 #include <asm/linkage.h>
+/* Some toolchains use other characters (e.g. '`') to mark new line in macro */
+#ifndef ASM_NL
+#define ASM_NL           ;
+#endif
 #ifdef __cplusplus
 #define CPP_ASMLINKAGE extern "C"
 #else
@@ -75,21 +80,21 @@
 #ifndef ENTRY
 #define ENTRY(name) \
-  .globl name; \
+        .globl name ASM_NL \
-  ALIGN; \
+        ALIGN ASM_NL \
-  name:
+        name:
 #endif
 #endif /* LINKER_SCRIPT */
 #ifndef WEAK
 #define WEAK(name)         \
-        .weak name;        \
+        .weak name ASM_NL   \
        name:
 #endif
 #ifndef END
 #define END(name) \
-  .size name, .-name
+        .size name, .-name
 #endif
 /* If symbol 'name' is treated as a subroutine (gets called, and returns)
@@ -98,8 +103,8 @@
 */
 #ifndef ENDPROC
 #define ENDPROC(name) \
-  .type name, @function; \
+        .type name, @function ASM_NL \
-  END(name)
+        END(name)
 #endif
 #endif
diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index d105a44b68f6..63d91e22ed7c 100755
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -43,7 +43,8 @@ scm_version()
        fi
        # Check for git and a git repo.
-        if test -d .git && head=`git rev-parse --verify --short HEAD 2>/dev/null`; then
+        if test -z "$(git rev-parse --show-cdup 2>/dev/null)" &&
+           head=`git rev-parse --verify --short HEAD 2>/dev/null`; then
                # If we are at a tagged commit (like "v2.6.30-rc6"), we ignore
                # it, because this version is defined in the top level Makefile.
author	Linus Torvalds <torvalds@linux-foundation.org>	2014-01-30 19:58:05 -0500
committer	Linus Torvalds <torvalds@linux-foundation.org>	2014-01-30 19:58:05 -0500
commit	597690cd02684b7e4904288e4b85797123a5093f (patch)
tree	f5d2a84771b9d532f2fe99a9cf4e0b51f5432e26
parent	53d8ab29f8f6d67e37857b68189b38fa3d87dd8e (diff)
parent	bf705ad0c364ea375b3a5e89fa8a0e1c1fde994c (diff)