Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eddecbb6 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-2.6 

* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
  kbuild: Make DEBUG_SECTION_MISMATCH selectable, but not on by default
  genksyms: Regenerate lexer and parser
  genksyms: Track changes to enum constants
  genksyms: simplify usage of find_symbol()
  genksyms: Add helpers for building string lists
  genksyms: Simplify printing of symbol types
  genksyms: Simplify lexer
  genksyms: Do not paste the bison header file to lex.c
  modpost: fix trailing comma
  KBuild: silence "'scripts/unifdef' is up to date."
  kbuild: Add extra gcc checks
  kbuild: reenable section mismatch analysis
  unifdef: update to upstream version 2.5
parents 0bf8c869 f2c23f65

Documentation/kbuild/kbuild.txt

+5 −0
Original line number Diff line number Diff line
@@ -196,3 +196,8 @@ to be included in the databases, separated by blank space. E.g.: 
To get all available archs you can also specify all. E.g.:



    $ make ALLSOURCE_ARCHS=all tags



KBUILD_ENABLE_EXTRA_GCC_CHECKS

--------------------------------------------------

If enabled over the make command line with "W=1", it turns on additional

gcc -W... options for more extensive build-time checking.

Makefile

+6 −1
Original line number Diff line number Diff line
@@ -102,6 +102,10 @@ ifeq ("$(origin O)", "command line") 
  KBUILD_OUTPUT := $(O)

endif



ifeq ("$(origin W)", "command line")

  export KBUILD_ENABLE_EXTRA_GCC_CHECKS := 1

endif



# That's our default target when none is given on the command line

PHONY := _all

_all:
@@ -1018,7 +1022,7 @@ hdr-dst = $(if $(KBUILD_HEADERS), dst=include/asm-$(hdr-arch), dst=include/asm) 


PHONY += __headers

__headers: include/linux/version.h scripts_basic FORCE

	$(Q)$(MAKE) $(build)=scripts scripts/unifdef

	$(Q)$(MAKE) $(build)=scripts build_unifdef



PHONY += headers_install_all

headers_install_all:
@@ -1263,6 +1267,7 @@ help: 
	@echo  '  make O=dir [targets] Locate all output files in "dir", including .config'

	@echo  '  make C=1   [targets] Check all c source with $$CHECK (sparse by default)'

	@echo  '  make C=2   [targets] Force check of all c source with $$CHECK'

	@echo  '  make W=1   [targets] Enable extra gcc checks'

	@echo  ''

	@echo  'Execute "make" or "make all" to build all targets marked with [*] '

	@echo  'For further info see the ./README file'

lib/Kconfig.debug

+0 −5
Original line number Diff line number Diff line
@@ -102,11 +102,6 @@ config HEADERS_CHECK 


config DEBUG_SECTION_MISMATCH

	bool "Enable full Section mismatch analysis"

	depends on UNDEFINED || (BLACKFIN)

	default y

	# This option is on purpose disabled for now.

	# It will be enabled when we are down to a reasonable number

	# of section mismatch warnings (< 10 for an allyesconfig build)

	help

	  The section mismatch analysis checks if there are illegal

	  references from one section to another section.

scripts/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -18,6 +18,11 @@ always := $(hostprogs-y) $(hostprogs-m) 
# The following hostprogs-y programs are only build on demand

hostprogs-y += unifdef



# This target is used internally to avoid "is up to date" messages

PHONY += build_unifdef

build_unifdef: scripts/unifdef FORCE

	@:



subdir-$(CONFIG_MODVERSIONS) += genksyms

subdir-y                     += mod

subdir-$(CONFIG_SECURITY_SELINUX) += selinux

scripts/Makefile.build

+34 −1
Original line number Diff line number Diff line
@@ -49,6 +49,40 @@ ifeq ($(KBUILD_NOPEDANTIC),) 
                $(error CFLAGS was changed in "$(kbuild-file)". Fix it to use EXTRA_CFLAGS)

        endif

endif



#

# make W=1 settings

#

# $(call cc-option... ) handles gcc -W.. options which

# are not supported by all versions of the compiler

ifdef KBUILD_ENABLE_EXTRA_GCC_CHECKS

KBUILD_EXTRA_WARNINGS := -Wextra

KBUILD_EXTRA_WARNINGS += -Wunused -Wno-unused-parameter

KBUILD_EXTRA_WARNINGS += -Waggregate-return

KBUILD_EXTRA_WARNINGS += -Wbad-function-cast

KBUILD_EXTRA_WARNINGS += -Wcast-qual

KBUILD_EXTRA_WARNINGS += -Wcast-align

KBUILD_EXTRA_WARNINGS += -Wconversion

KBUILD_EXTRA_WARNINGS += -Wdisabled-optimization

KBUILD_EXTRA_WARNINGS += -Wlogical-op

KBUILD_EXTRA_WARNINGS += -Wmissing-declarations

KBUILD_EXTRA_WARNINGS += -Wmissing-format-attribute

KBUILD_EXTRA_WARNINGS += $(call cc-option, -Wmissing-include-dirs,)

KBUILD_EXTRA_WARNINGS += -Wmissing-prototypes

KBUILD_EXTRA_WARNINGS += -Wnested-externs

KBUILD_EXTRA_WARNINGS += -Wold-style-definition

KBUILD_EXTRA_WARNINGS += $(call cc-option, -Woverlength-strings,)

KBUILD_EXTRA_WARNINGS += -Wpacked

KBUILD_EXTRA_WARNINGS += -Wpacked-bitfield-compat

KBUILD_EXTRA_WARNINGS += -Wpadded

KBUILD_EXTRA_WARNINGS += -Wpointer-arith

KBUILD_EXTRA_WARNINGS += -Wredundant-decls

KBUILD_EXTRA_WARNINGS += -Wshadow

KBUILD_EXTRA_WARNINGS += -Wswitch-default

KBUILD_EXTRA_WARNINGS += $(call cc-option, -Wvla,)

KBUILD_CFLAGS += $(KBUILD_EXTRA_WARNINGS)

endif



include scripts/Makefile.lib



ifdef host-progs
@@ -403,7 +437,6 @@ ifneq ($(cmd_files),) 
  include $(cmd_files)

endif





# Declare the contents of the .PHONY variable as phony.  We keep that

# information in a variable se we can use it in if_changed and friends.