Commit ae3e4628 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:
 "The main part of kbuild for v3.7 contains:
   - Fix for scripts/Makefile.modpost to not choke on a '.ko' substring
     in the build directory path
   - Two warning fixes (modpost and main Makefile)
   - __compiletime_error works also with gcc 4.3
   - make tar{gz,bz2,xz}-pkg uses default compression settings instead
     of saving as many bytes as possible (this should actually be in the
     misc branch, I don't know why I applied it here)."

* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  compiler-gcc4.h: correct verion check for __compiletime_error
  modpost: Permit .GCC.command.line sections
  Kbuild: use normal compression settings for tar*-pkg
  scripts/Makefile.modpost: error in finding modules from .mod files.
  kbuild: Remove useless warning while appending KCFLAGS
parents 5f76945a 415c2c52

Makefile

+3 −16
Original line number Diff line number Diff line
@@ -664,22 +664,9 @@ ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC)), y) 
endif



# Add user supplied CPPFLAGS, AFLAGS and CFLAGS as the last assignments

# But warn user when we do so

warn-assign = \

$(warning "WARNING: Appending $$K$(1) ($(K$(1))) from $(origin K$(1)) to kernel $$$(1)")



ifneq ($(KCPPFLAGS),)

        $(call warn-assign,CPPFLAGS)

KBUILD_CPPFLAGS += $(KCPPFLAGS)

endif

ifneq ($(KAFLAGS),)

        $(call warn-assign,AFLAGS)

KBUILD_AFLAGS += $(KAFLAGS)

endif

ifneq ($(KCFLAGS),)

        $(call warn-assign,CFLAGS)

KBUILD_CFLAGS += $(KCFLAGS)

endif



# Use --build-id when available.

LDFLAGS_BUILD_ID = $(patsubst -Wl$(comma)%,%,\

include/linux/compiler-gcc4.h

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ 
#if __GNUC_MINOR__ > 0

#define __compiletime_object_size(obj) __builtin_object_size(obj, 0)

#endif

#if __GNUC_MINOR__ >= 4 && !defined(__CHECKER__)

#if __GNUC_MINOR__ >= 3 && !defined(__CHECKER__)

#define __compiletime_warning(message) __attribute__((warning(message)))

#define __compiletime_error(message) __attribute__((error(message)))

#endif

scripts/Makefile.modinst

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ include scripts/Kbuild.include 


#



__modules := $(sort $(shell grep -h '\.ko' /dev/null $(wildcard $(MODVERDIR)/*.mod)))

__modules := $(sort $(shell grep -h '\.ko$$' /dev/null $(wildcard $(MODVERDIR)/*.mod)))

modules := $(patsubst %.o,%.ko,$(wildcard $(__modules:.ko=.o)))



PHONY += $(modules)

scripts/Makefile.modpost

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ kernelsymfile := $(objtree)/Module.symvers 
modulesymfile := $(firstword $(KBUILD_EXTMOD))/Module.symvers



# Step 1), find all modules listed in $(MODVERDIR)/

__modules := $(sort $(shell grep -h '\.ko' /dev/null $(wildcard $(MODVERDIR)/*.mod)))

__modules := $(sort $(shell grep -h '\.ko$$' /dev/null $(wildcard $(MODVERDIR)/*.mod)))

modules   := $(patsubst %.o,%.ko, $(wildcard $(__modules:.ko=.o)))



# Stop after building .o files if NOFINAL is set. Makes compile tests quicker

scripts/mod/modpost.c

+1 −0
Original line number Diff line number Diff line
@@ -821,6 +821,7 @@ static const char *section_white_list[] = 
	".debug*",

	".zdebug*",		/* Compressed debug sections. */

	".GCC-command-line",	/* mn10300 */

	".GCC.command.line",	/* record-gcc-switches, non mn10300 */

	".mdebug*",        /* alpha, score, mips etc. */

	".pdr",            /* alpha, score, mips etc. */

	".stab*",

CRA Git | Maintained and supported by SUSTech CRA and CCSE