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

Commit 84d69848 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 updates from Michal Marek:

 - EXPORT_SYMBOL for asm source by Al Viro.

   This does bring a regression, because genksyms no longer generates
   checksums for these symbols (CONFIG_MODVERSIONS). Nick Piggin is
   working on a patch to fix this.

   Plus, we are talking about functions like strcpy(), which rarely
   change prototypes.

 - Fixes for PPC fallout of the above by Stephen Rothwell and Nick
   Piggin

 - fixdep speedup by Alexey Dobriyan.

 - preparatory work by Nick Piggin to allow architectures to build with
   -ffunction-sections, -fdata-sections and --gc-sections

 - CONFIG_THIN_ARCHIVES support by Stephen Rothwell

 - fix for filenames with colons in the initramfs source by me.

* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild: (22 commits)
  initramfs: Escape colons in depfile
  ppc: there is no clear_pages to export
  powerpc/64: whitelist unresolved modversions CRCs
  kbuild: -ffunction-sections fix for archs with conflicting sections
  kbuild: add arch specific post-link Makefile
  kbuild: allow archs to select link dead code/data elimination
  kbuild: allow architectures to use thin archives instead of ld -r
  kbuild: Regenerate genksyms lexer
  kbuild: genksyms fix for typeof handling
  fixdep: faster CONFIG_ search
  ia64: move exports to definitions
  sparc32: debride memcpy.S a bit
  [sparc] unify 32bit and 64bit string.h
  sparc: move exports to definitions
  ppc: move exports to definitions
  arm: move exports to definitions
  s390: move exports to definitions
  m68k: move exports to definitions
  alpha: move exports to actual definitions
  x86: move exports to actual definitions
  ...
parents d4d24d2d 590abbdd

Documentation/kbuild/makefiles.txt

+16 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ This document describes the Linux kernel Makefiles. 
	   --- 6.8 Custom kbuild commands

	   --- 6.9 Preprocessing linker scripts

	   --- 6.10 Generic header files

	   --- 6.11 Post-link pass



	=== 7 Kbuild syntax for exported headers

		--- 7.1 header-y
@@ -1237,6 +1238,21 @@ When kbuild executes, the following steps are followed (roughly): 
	to list the file in the Kbuild file.

	See "7.4 generic-y" for further info on syntax etc.



--- 6.11 Post-link pass



	If the file arch/xxx/Makefile.postlink exists, this makefile

	will be invoked for post-link objects (vmlinux and modules.ko)

	for architectures to run post-link passes on. Must also handle

	the clean target.



	This pass runs after kallsyms generation. If the architecture

	needs to modify symbol locations, rather than manipulate the

	kallsyms, it may be easier to add another postlink target for

	.tmp_vmlinux? targets to be called from link-vmlinux.sh.



	For example, powerpc uses this to check relocation sanity of

	the linked vmlinux file.



=== 7 Kbuild syntax for exported headers



The kernel includes a set of headers that is exported to userspace.

Makefile

+16 −3
Original line number Diff line number Diff line
@@ -623,6 +623,11 @@ KBUILD_CFLAGS += $(call cc-option,-fno-delete-null-pointer-checks,) 
KBUILD_CFLAGS	+= $(call cc-disable-warning,maybe-uninitialized,)

KBUILD_CFLAGS	+= $(call cc-disable-warning,frame-address,)



ifdef CONFIG_LD_DEAD_CODE_DATA_ELIMINATION

KBUILD_CFLAGS	+= $(call cc-option,-ffunction-sections,)

KBUILD_CFLAGS	+= $(call cc-option,-fdata-sections,)

endif



ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE

KBUILD_CFLAGS	+= -Os

else
@@ -803,6 +808,10 @@ LDFLAGS_BUILD_ID = $(patsubst -Wl$(comma)%,%,\ 
KBUILD_LDFLAGS_MODULE += $(LDFLAGS_BUILD_ID)

LDFLAGS_vmlinux += $(LDFLAGS_BUILD_ID)



ifdef CONFIG_LD_DEAD_CODE_DATA_ELIMINATION

LDFLAGS_vmlinux	+= $(call ld-option, --gc-sections,)

endif



ifeq ($(CONFIG_STRIP_ASM_SYMS),y)

LDFLAGS_vmlinux	+= $(call ld-option, -X,)

endif
@@ -942,9 +951,12 @@ endif 
include/generated/autoksyms.h: FORCE

	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/adjust_autoksyms.sh true



# Final link of vmlinux

      cmd_link-vmlinux = $(CONFIG_SHELL) $< $(LD) $(LDFLAGS) $(LDFLAGS_vmlinux)

quiet_cmd_link-vmlinux = LINK    $@

ARCH_POSTLINK := $(wildcard $(srctree)/arch/$(SRCARCH)/Makefile.postlink)



# Final link of vmlinux with optional arch pass after final link

    cmd_link-vmlinux =                                                 \

	$(CONFIG_SHELL) $< $(LD) $(LDFLAGS) $(LDFLAGS_vmlinux) ;       \

	$(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) $@, true)



vmlinux: scripts/link-vmlinux.sh vmlinux_prereq $(vmlinux-deps) FORCE

	+$(call if_changed,link-vmlinux)
@@ -1271,6 +1283,7 @@ $(clean-dirs): 


vmlinuxclean:

	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/link-vmlinux.sh clean

	$(Q)$(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) clean)



clean: archclean vmlinuxclean

arch/Kconfig

+21 −0
Original line number Diff line number Diff line
@@ -450,6 +450,27 @@ config CC_STACKPROTECTOR_STRONG 


endchoice



config THIN_ARCHIVES

	bool

	help

	  Select this if the architecture wants to use thin archives

	  instead of ld -r to create the built-in.o files.



config LD_DEAD_CODE_DATA_ELIMINATION

	bool

	help

	  Select this if the architecture wants to do dead code and

	  data elimination with the linker by compiling with

	  -ffunction-sections -fdata-sections and linking with

	  --gc-sections.



	  This requires that the arch annotates or otherwise protects

	  its external entry points from being discarded. Linker scripts

	  must also merge .text.*, .data.*, and .bss.* correctly into

	  output sections. Care must be taken not to pull in unrelated

	  sections (e.g., '.text.init'). Typically '.' in section names

	  is used to distinguish them from label names / C identifiers.



config HAVE_ARCH_WITHIN_STACK_FRAMES

	bool

	help

arch/alpha/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
generic-y += clkdev.h

generic-y += cputime.h

generic-y += exec.h

generic-y += export.h

generic-y += irq_work.h

generic-y += mcs_spinlock.h

generic-y += mm-arch-hooks.h

arch/alpha/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ ccflags-y := -Wno-sign-compare 


obj-y    := entry.o traps.o process.o osf_sys.o irq.o \

	    irq_alpha.o signal.o setup.o ptrace.o time.o \

	    alpha_ksyms.o systbls.o err_common.o io.o

	    systbls.o err_common.o io.o



obj-$(CONFIG_VGA_HOSE)	+= console.o

obj-$(CONFIG_SMP)	+= smp.o