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

Commit efffbeee authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild 

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: (33 commits)
  xtensa: use DATA_DATA in xtensa
  powerpc: add missing DATA_DATA to powerpc
  cris: use DATA_DATA in cris
  kallsyms: remove usage of memmem and _GNU_SOURCE from scripts/kallsyms.c
  kbuild: use -fno-optimize-sibling-calls unconditionally
  kconfig: reset generated values only if Kconfig and .config agree.
  kbuild: fix the warning when running make tags
  kconfig: strip 'CONFIG_' automatically in kernel configuration search
  kbuild: use POSIX BRE in headers install target
  Whitelist references from __dbe_table to .init
  modpost white list pattern adjustment
  kbuild: do section mismatch check on full vmlinux
  kbuild: whitelist references from variables named _timer to .init.text
  kbuild: remove hardcoded _logo names from modpost
  kbuild: remove hardcoded apic_es7000 from modpost
  kbuild: warn about references from .init.text to .exit.text
  kbuild: consolidate section checks
  kbuild: refactor code in modpost to improve maintainability
  kbuild: ignore section mismatch warnings originating from .note section
  kbuild: .paravirtprobe section is obsolete, so modpost doesn't need to handle it
  ...
parents 40b42f1e b8243254

Documentation/kbuild/makefiles.txt

+14 −0
Original line number Diff line number Diff line
@@ -501,6 +501,20 @@ more details, with real examples. 
	The third parameter may be a text as in this example, but it may also

	be an expanded variable or a macro.



    cc-fullversion

	cc-fullversion is useful when the exact version of gcc is needed.

	One typical use-case is when a specific GCC version is broken.

	cc-fullversion points out a more specific version than cc-version does.



	Example:

		#arch/powerpc/Makefile

		$(Q)if test "$(call cc-fullversion)" = "040200" ; then \

			echo -n '*** GCC-4.2.0 cannot compile the 64-bit powerpc ' ; \

			false ; \

		fi



	In this example for a specific GCC version the build will error out explaining

	to the user why it stops.



=== 4 Host Program support

Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ offsets-file := include/asm-$(ARCH)/asm-offsets.h 
always  := $(offsets-file)

targets := $(offsets-file)

targets += arch/$(ARCH)/kernel/asm-offsets.s

clean-files := $(addprefix $(objtree)/,$(targets))



# Default sed regexp - multiline due to syntax constraints

define sed-y

Makefile

+21 −5
Original line number Diff line number Diff line
@@ -492,7 +492,7 @@ endif 
include $(srctree)/arch/$(ARCH)/Makefile



ifdef CONFIG_FRAME_POINTER

CFLAGS		+= -fno-omit-frame-pointer $(call cc-option,-fno-optimize-sibling-calls,)

CFLAGS		+= -fno-omit-frame-pointer -fno-optimize-sibling-calls

else

CFLAGS		+= -fomit-frame-pointer

endif
@@ -618,7 +618,7 @@ quiet_cmd_vmlinux__ ?= LD $@ 
      cmd_vmlinux__ ?= $(LD) $(LDFLAGS) $(LDFLAGS_vmlinux) -o $@ \

      -T $(vmlinux-lds) $(vmlinux-init)                          \

      --start-group $(vmlinux-main) --end-group                  \

      $(filter-out $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) FORCE ,$^)

      $(filter-out $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) vmlinux.o FORCE ,$^)



# Generate new vmlinux version

quiet_cmd_vmlinux_version = GEN     .version
@@ -742,15 +742,31 @@ debug_kallsyms: .tmp_map$(last_kallsyms) 


endif # ifdef CONFIG_KALLSYMS



# Do modpost on a prelinked vmlinux. The finally linked vmlinux has

# relevant sections renamed as per the linker script.

quiet_cmd_vmlinux-modpost = LD      $@

      cmd_vmlinux-modpost = $(LD) $(LDFLAGS) -r -o $@                          \

	 $(vmlinux-init) --start-group $(vmlinux-main) --end-group             \

	 $(filter-out $(vmlinux-init) $(vmlinux-main) $(vmlinux-lds) FORCE ,$^)

define rule_vmlinux-modpost

	:

	+$(call cmd,vmlinux-modpost)

	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost $@

	$(Q)echo 'cmd_$@ := $(cmd_vmlinux-modpost)' > $(dot-target).cmd

endef



# vmlinux image - including updated kernel symbols

vmlinux: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) $(kallsyms.o) FORCE

vmlinux: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) $(kallsyms.o) vmlinux.o FORCE

ifdef CONFIG_HEADERS_CHECK

	$(Q)$(MAKE) -f $(srctree)/Makefile headers_check

endif

	$(call vmlinux-modpost)

	$(call if_changed_rule,vmlinux__)

	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost $@

	$(Q)rm -f .old_version



vmlinux.o: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) $(kallsyms.o) FORCE

	$(call if_changed_rule,vmlinux-modpost)



# The actual objects are generated when descending, 

# make sure no implicit rule kicks in

$(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): $(vmlinux-dirs) ;
@@ -1323,7 +1339,7 @@ define xtags 
		-I __initdata,__exitdata,__acquires,__releases \

		-I EXPORT_SYMBOL,EXPORT_SYMBOL_GPL \

		--extra=+f --c-kinds=+px \

		--regex-asm='/ENTRY\(([^)]*)\).*/\1/'; \

		--regex-asm='/^ENTRY\(([^)]*)\).*/\1/'; \

	    $(all-kconfigs) | xargs $1 -a \

		--langdef=kconfig \

		--language-force=kconfig \

arch/cris/arch-v10/vmlinux.lds.S

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ SECTIONS 
	___data_start = . ;

	__Sdata = . ;

	.data : {                     /* Data */

		*(.data)

		DATA_DATA

	}

	__edata = . ;                 /* End of data section */

	_edata = . ;

arch/cris/arch-v32/vmlinux.lds.S

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ SECTIONS 
	___data_start = . ;

	__Sdata = . ;

	.data : {                     /* Data */

		*(.data)

		DATA_DATA

	}

	__edata = . ;		/* End of data section. */

	_edata = . ;