Commit 597690cd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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]
parents 53d8ab29 bf705ad0

Makefile

+7 −1
Original line number Diff line number Diff line
@@ -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

arch/arc/include/asm/linkage.h

+2 −0
Original line number Diff line number Diff line
@@ -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

 */

arch/frv/Makefile

+0 −7
Original line number Diff line number Diff line
@@ -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/

arch/mn10300/Makefile

+0 −8
Original line number Diff line number Diff line
@@ -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

#

include/linux/linkage.h

+12 −7
Original line number Diff line number Diff line
@@ -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,15 +80,15 @@ 


#ifndef ENTRY

#define ENTRY(name) \

  .globl name; \

  ALIGN; \

	.globl name ASM_NL \

	ALIGN ASM_NL \

	name:

#endif

#endif /* LINKER_SCRIPT */



#ifndef WEAK

#define WEAK(name)	   \

	.weak name;	   \

	.weak name ASM_NL   \

	name:

#endif
@@ -98,7 +103,7 @@ 
 */

#ifndef ENDPROC

#define ENDPROC(name) \

  .type name, @function; \

	.type name, @function ASM_NL \

	END(name)

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE