Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

84d69848 · Linus Torvalds <[email protected]> · 2016-10-14 14:26:58 -07:00

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
  ...

Commit: 84d69848c97faab0c25aa2667b273404d2e2a64a
Parents: d4d24d2d · 590abbdd

Merge commit. Changes below are compared with the first parent: d4d24d2d.

Changes

262 files changed · +1094 −1403

File	Status	Add	Del	Content
Documentation/kbuild/makefiles.txt	modified	+16	−0	View file
Makefile	modified	+16	−3	View file
arch/Kconfig	modified	+21	−0	View file
arch/alpha/include/asm/Kbuild	modified	+1	−0	View file
arch/alpha/kernel/Makefile	modified	+1	−1	View file
arch/alpha/kernel/alpha_ksyms.c	deleted	+0	−102	View before deletion
arch/alpha/kernel/machvec_impl.h	modified	+4	−2	View file
arch/alpha/kernel/setup.c	modified	+1	−0	View file
arch/alpha/lib/callback_srm.S	modified	+5	−0	View file
arch/alpha/lib/checksum.c	modified	+3	−0	View file
arch/alpha/lib/clear_page.S	modified	+2	−1	View file
arch/alpha/lib/clear_user.S	modified	+2	−0	View file
arch/alpha/lib/copy_page.S	modified	+2	−1	View file
arch/alpha/lib/copy_user.S	modified	+3	−0	View file
arch/alpha/lib/csum_ipv6_magic.S	modified	+2	−0	View file
arch/alpha/lib/csum_partial_copy.c	modified	+2	−0	View file
arch/alpha/lib/dec_and_lock.c	modified	+2	−0	View file
arch/alpha/lib/divide.S	modified	+3	−0	View file
arch/alpha/lib/ev6-clear_page.S	modified	+2	−1	View file
arch/alpha/lib/ev6-clear_user.S	modified	+2	−1	View file
arch/alpha/lib/ev6-copy_page.S	modified	+2	−1	View file
arch/alpha/lib/ev6-copy_user.S	modified	+2	−1	View file
arch/alpha/lib/ev6-csum_ipv6_magic.S	modified	+2	−0	View file
arch/alpha/lib/ev6-divide.S	modified	+3	−0	View file
arch/alpha/lib/ev6-memchr.S	modified	+2	−1	View file
arch/alpha/lib/ev6-memcpy.S	modified	+2	−1	View file
arch/alpha/lib/ev6-memset.S	modified	+6	−1	View file
arch/alpha/lib/ev67-strcat.S	modified	+2	−1	View file
arch/alpha/lib/ev67-strchr.S	modified	+2	−1	View file
arch/alpha/lib/ev67-strlen.S	modified	+2	−1	View file
arch/alpha/lib/ev67-strncat.S	modified	+2	−1	View file
arch/alpha/lib/ev67-strrchr.S	modified	+2	−1	View file
arch/alpha/lib/fpreg.c	modified	+7	−0	View file
arch/alpha/lib/memchr.S	modified	+2	−1	View file
arch/alpha/lib/memcpy.c	modified	+2	−3	View file
arch/alpha/lib/memmove.S	modified	+2	−1	View file
arch/alpha/lib/memset.S	modified	+6	−1	View file
arch/alpha/lib/strcat.S	modified	+2	−0	View file
arch/alpha/lib/strchr.S	modified	+2	−1	View file
arch/alpha/lib/strcpy.S	modified	+2	−1	View file
arch/alpha/lib/strlen.S	modified	+2	−1	View file
arch/alpha/lib/strncat.S	modified	+2	−1	View file
arch/alpha/lib/strncpy.S	modified	+2	−1	View file
arch/alpha/lib/strrchr.S	modified	+2	−1	View file
arch/arm/include/asm/Kbuild	modified	+1	−0	View file
arch/arm/kernel/Makefile	modified	+1	−1	View file
arch/arm/kernel/armksyms.c	deleted	+0	−183	View before deletion
arch/arm/kernel/entry-ftrace.S	modified	+3	−0	View file
arch/arm/kernel/head.S	modified	+3	−0	View file
arch/arm/kernel/smccc-call.S	modified	+3	−0	View file
arch/arm/lib/ashldi3.S	modified	+3	−0	View file
arch/arm/lib/ashrdi3.S	modified	+3	−0	View file
arch/arm/lib/bitops.h	modified	+5	−0	View file
arch/arm/lib/bswapsdi2.S	modified	+3	−0	View file
arch/arm/lib/clear_user.S	modified	+4	−0	View file
arch/arm/lib/copy_from_user.S	modified	+2	−0	View file
arch/arm/lib/copy_page.S	modified	+2	−0	View file
arch/arm/lib/copy_to_user.S	modified	+4	−0	View file
arch/arm/lib/csumipv6.S	modified	+2	−1	View file
arch/arm/lib/csumpartial.S	modified	+2	−0	View file
arch/arm/lib/csumpartialcopy.S	modified	+1	−0	View file
arch/arm/lib/csumpartialcopygeneric.S	modified	+2	−0	View file
arch/arm/lib/csumpartialcopyuser.S	modified	+1	−0	View file
arch/arm/lib/delay.c	modified	+2	−0	View file
arch/arm/lib/div64.S	modified	+2	−0	View file
arch/arm/lib/findbit.S	modified	+9	−0	View file
arch/arm/lib/getuser.S	modified	+9	−0	View file
arch/arm/lib/io-readsb.S	modified	+2	−0	View file
arch/arm/lib/io-readsl.S	modified	+2	−0	View file
arch/arm/lib/io-readsw-armv3.S	modified	+2	−1	View file
arch/arm/lib/io-readsw-armv4.S	modified	+2	−0	View file
arch/arm/lib/io-writesb.S	modified	+2	−0	View file
arch/arm/lib/io-writesl.S	modified	+2	−0	View file
arch/arm/lib/io-writesw-armv3.S	modified	+2	−0	View file
arch/arm/lib/io-writesw-armv4.S	modified	+2	−0	View file
arch/arm/lib/lib1funcs.S	modified	+9	−0	View file
arch/arm/lib/lshrdi3.S	modified	+3	−0	View file
arch/arm/lib/memchr.S	modified	+2	−0	View file
arch/arm/lib/memcpy.S	modified	+3	−0	View file
arch/arm/lib/memmove.S	modified	+2	−0	View file
arch/arm/lib/memset.S	modified	+3	−0	View file
arch/arm/lib/memzero.S	modified	+2	−0	View file
arch/arm/lib/muldi3.S	modified	+3	−0	View file
arch/arm/lib/putuser.S	modified	+5	−0	View file
arch/arm/lib/strchr.S	modified	+2	−0	View file
arch/arm/lib/strrchr.S	modified	+2	−0	View file
arch/arm/lib/uaccess_with_memcpy.c	modified	+3	−0	View file
arch/arm/lib/ucmpdi2.S	modified	+3	−0	View file
arch/arm/mach-imx/Makefile	modified	+0	−1	View file
arch/arm/mach-imx/ssi-fiq-ksym.c	deleted	+0	−20	View before deletion
arch/arm/mach-imx/ssi-fiq.S	modified	+6	−1	View file
arch/ia64/hp/sim/boot/Makefile	modified	+1	−1	View file
arch/ia64/include/asm/export.h	added	+3	−0	View file
arch/ia64/kernel/entry.S	modified	+3	−0	View file
arch/ia64/kernel/esi_stub.S	modified	+2	−0	View file
arch/ia64/kernel/head.S	modified	+2	−0	View file
arch/ia64/kernel/ia64_ksyms.c	modified	+2	−92	View file
arch/ia64/kernel/ivt.S	modified	+2	−0	View file
arch/ia64/kernel/pal.S	modified	+7	−0	View file
arch/ia64/kernel/setup.c	modified	+4	−0	View file
arch/ia64/lib/Makefile	modified	+3	−5	View file
arch/ia64/lib/clear_page.S	modified	+2	−0	View file
arch/ia64/lib/clear_user.S	modified	+2	−0	View file
arch/ia64/lib/copy_page.S	modified	+2	−0	View file
arch/ia64/lib/copy_page_mck.S	modified	+2	−0	View file
arch/ia64/lib/copy_user.S	modified	+2	−0	View file
arch/ia64/lib/flush.S	modified	+2	−0	View file
arch/ia64/lib/idiv32.S	modified	+2	−0	View file
arch/ia64/lib/idiv64.S	modified	+2	−0	View file
arch/ia64/lib/ip_fast_csum.S	modified	+3	−0	View file
arch/ia64/lib/memcpy.S	modified	+2	−0	View file
arch/ia64/lib/memcpy_mck.S	modified	+3	−0	View file
arch/ia64/lib/memset.S	modified	+2	−0	View file
arch/ia64/lib/strlen.S	modified	+2	−0	View file
arch/ia64/lib/strlen_user.S	modified	+2	−0	View file
arch/ia64/lib/strncpy_from_user.S	modified	+2	−0	View file
arch/ia64/lib/strnlen_user.S	modified	+2	−0	View file
arch/ia64/lib/xor.S	modified	+5	−0	View file
arch/m68k/include/asm/export.h	added	+3	−0	View file
arch/m68k/kernel/Makefile	modified	+1	−1	View file
arch/m68k/kernel/m68k_ksyms.c	deleted	+0	−32	View before deletion
arch/m68k/lib/ashldi3.c	modified	+4	−0	View file
arch/m68k/lib/ashrdi3.c	modified	+4	−0	View file
arch/m68k/lib/divsi3.S	modified	+3	−0	View file
arch/m68k/lib/lshrdi3.c	modified	+4	−0	View file
arch/m68k/lib/modsi3.S	modified	+3	−0	View file
arch/m68k/lib/muldi3.c	modified	+4	−0	View file
arch/m68k/lib/mulsi3.S	modified	+2	−2	View file
arch/m68k/lib/udivsi3.S	modified	+2	−2	View file
arch/m68k/lib/umodsi3.S	modified	+2	−2	View file
arch/powerpc/include/asm/Kbuild	modified	+1	−0	View file
arch/powerpc/kernel/Makefile	modified	+0	−4	View file
arch/powerpc/kernel/entry_32.S	modified	+2	−0	View file
arch/powerpc/kernel/entry_64.S	modified	+3	−0	View file
arch/powerpc/kernel/epapr_hcalls.S	modified	+2	−0	View file
arch/powerpc/kernel/fpu.S	modified	+3	−0	View file
arch/powerpc/kernel/head_32.S	modified	+5	−0	View file
arch/powerpc/kernel/head_40x.S	modified	+2	−0	View file
arch/powerpc/kernel/head_44x.S	modified	+2	−0	View file
arch/powerpc/kernel/head_64.S	modified	+2	−0	View file
arch/powerpc/kernel/head_8xx.S	modified	+2	−0	View file
arch/powerpc/kernel/head_fsl_booke.S	modified	+2	−0	View file
arch/powerpc/kernel/misc.S	modified	+2	−0	View file
arch/powerpc/kernel/misc_32.S	modified	+10	−0	View file
arch/powerpc/kernel/misc_64.S	modified	+4	−0	View file
arch/powerpc/kernel/pci-common.c	modified	+1	−0	View file
arch/powerpc/kernel/pci_32.c	modified	+2	−0	View file
arch/powerpc/kernel/ppc_ksyms.c	deleted	+0	−37	View before deletion
arch/powerpc/kernel/ppc_ksyms_32.c	deleted	+0	−60	View before deletion
arch/powerpc/kernel/setup_32.c	modified	+6	−0	View file
arch/powerpc/kernel/time.c	modified	+1	−0	View file
arch/powerpc/kernel/vector.S	modified	+3	−0	View file
arch/powerpc/lib/Makefile	modified	+1	−1	View file
arch/powerpc/lib/checksum_32.S	modified	+3	−0	View file
arch/powerpc/lib/checksum_64.S	modified	+3	−0	View file
arch/powerpc/lib/copy_32.S	modified	+5	−0	View file
arch/powerpc/lib/copypage_64.S	modified	+2	−0	View file
arch/powerpc/lib/copyuser_64.S	modified	+2	−0	View file
arch/powerpc/lib/hweight_64.S	modified	+5	−0	View file
arch/powerpc/lib/mem_64.S	modified	+3	−0	View file
arch/powerpc/lib/memcmp_64.S	modified	+2	−0	View file
arch/powerpc/lib/memcpy_64.S	modified	+2	−0	View file
arch/powerpc/lib/ppc_ksyms.c	deleted	+0	−29	View before deletion
arch/powerpc/lib/string.S	modified	+6	−0	View file
arch/powerpc/lib/string_64.S	modified	+2	−0	View file
arch/powerpc/mm/hash_low_32.S	modified	+3	−0	View file
arch/powerpc/relocs_check.sh	modified	+3	−1	View file
arch/powerpc/sysdev/dcr-low.S	modified	+3	−0	View file
arch/s390/include/asm/Kbuild	modified	+1	−0	View file
arch/s390/kernel/Makefile	modified	+1	−1	View file
arch/s390/kernel/entry.S	modified	+6	−0	View file
arch/s390/kernel/mcount.S	modified	+3	−0	View file
arch/s390/kernel/s390_ksyms.c	deleted	+0	−15	View before deletion
arch/s390/lib/mem.S	modified	+3	−0	View file
arch/sparc/include/asm/Kbuild	modified	+1	−0	View file
arch/sparc/include/asm/string.h	modified	+34	−0	View file
arch/sparc/include/asm/string_32.h	modified	+0	−56	View file
arch/sparc/include/asm/string_64.h	modified	+0	−44	View file
arch/sparc/kernel/Makefile	modified	+1	−1	View file
arch/sparc/kernel/entry.S	modified	+3	−0	View file
arch/sparc/kernel/head_32.S	modified	+3	−0	View file
arch/sparc/kernel/head_64.S	modified	+6	−1	View file
arch/sparc/kernel/helpers.S	modified	+2	−0	View file
arch/sparc/kernel/hvcalls.S	modified	+5	−0	View file
arch/sparc/kernel/sparc_ksyms.c	added	+12	−0	View file
arch/sparc/kernel/sparc_ksyms_32.c	deleted	+0	−31	View before deletion
arch/sparc/kernel/sparc_ksyms_64.c	deleted	+0	−53	View before deletion
arch/sparc/lib/Makefile	modified	+0	−1	View file
arch/sparc/lib/U1memcpy.S	modified	+2	−0	View file
arch/sparc/lib/VISsave.S	modified	+2	−0	View file
arch/sparc/lib/ashldi3.S	modified	+2	−0	View file
arch/sparc/lib/ashrdi3.S	modified	+2	−0	View file
arch/sparc/lib/atomic_64.S	modified	+12	−4	View file
arch/sparc/lib/bitops.S	modified	+7	−0	View file
arch/sparc/lib/blockops.S	modified	+3	−0	View file
arch/sparc/lib/bzero.S	modified	+4	−0	View file
arch/sparc/lib/checksum_32.S	modified	+3	−0	View file
arch/sparc/lib/checksum_64.S	modified	+2	−0	View file
arch/sparc/lib/clear_page.S	modified	+3	−0	View file
arch/sparc/lib/copy_in_user.S	modified	+2	−0	View file
arch/sparc/lib/copy_page.S	modified	+2	−0	View file
arch/sparc/lib/copy_user.S	modified	+2	−0	View file
arch/sparc/lib/csum_copy.S	modified	+3	−0	View file
arch/sparc/lib/divdi3.S	modified	+2	−0	View file
arch/sparc/lib/ffs.S	modified	+3	−0	View file
arch/sparc/lib/hweight.S	modified	+5	−0	View file
arch/sparc/lib/ipcsum.S	modified	+2	−0	View file
arch/sparc/lib/ksyms.c	deleted	+0	−174	View before deletion
arch/sparc/lib/locks.S	modified	+5	−0	View file
arch/sparc/lib/lshrdi3.S	modified	+2	−0	View file
arch/sparc/lib/mcount.S	modified	+2	−0	View file
arch/sparc/lib/memcmp.S	modified	+2	−0	View file
arch/sparc/lib/memcpy.S	modified	+3	−83	View file
arch/sparc/lib/memmove.S	modified	+2	−0	View file
arch/sparc/lib/memscan_32.S	modified	+4	−0	View file
arch/sparc/lib/memscan_64.S	modified	+4	−0	View file
arch/sparc/lib/memset.S	modified	+3	−0	View file
arch/sparc/lib/muldi3.S	modified	+2	−0	View file
arch/sparc/lib/strlen.S	modified	+2	−0	View file
arch/sparc/lib/strncmp_32.S	modified	+2	−0	View file
arch/sparc/lib/strncmp_64.S	modified	+2	−0	View file
arch/sparc/lib/xor.S	modified	+9	−0	View file
arch/x86/entry/entry_32.S	modified	+2	−0	View file
arch/x86/entry/entry_64.S	modified	+2	−0	View file
arch/x86/entry/thunk_32.S	modified	+3	−0	View file
arch/x86/entry/thunk_64.S	modified	+3	−0	View file
arch/x86/include/asm/export.h	added	+4	−0	View file
arch/x86/kernel/Makefile	modified	+1	−3	View file
arch/x86/kernel/head_32.S	modified	+2	−0	View file
arch/x86/kernel/head_64.S	modified	+3	−0	View file
arch/x86/kernel/i386_ksyms_32.c	deleted	+0	−47	View before deletion
arch/x86/kernel/mcount_64.S	modified	+2	−0	View file
arch/x86/kernel/x8664_ksyms_64.c	deleted	+0	−85	View before deletion
arch/x86/lib/checksum_32.S	modified	+3	−0	View file
arch/x86/lib/clear_page_64.S	modified	+2	−0	View file
arch/x86/lib/cmpxchg8b_emu.S	modified	+2	−0	View file
arch/x86/lib/copy_page_64.S	modified	+2	−0	View file
arch/x86/lib/copy_user_64.S	modified	+8	−0	View file
arch/x86/lib/csum-partial_64.c	modified	+1	−0	View file
arch/x86/lib/getuser.S	modified	+5	−0	View file
arch/x86/lib/hweight.S	modified	+3	−0	View file
arch/x86/lib/memcpy_64.S	modified	+4	−0	View file
arch/x86/lib/memmove_64.S	modified	+3	−0	View file
arch/x86/lib/memset_64.S	modified	+3	−0	View file
arch/x86/lib/putuser.S	modified	+5	−0	View file
arch/x86/lib/strstr_32.c	modified	+2	−1	View file
arch/x86/um/Makefile	modified	+1	−1	View file
arch/x86/um/checksum_32.S	modified	+2	−0	View file
arch/x86/um/ksyms.c	deleted	+0	−13	View before deletion
include/asm-generic/export.h	added	+94	−0	View file
include/asm-generic/vmlinux.lds.h	modified	+34	−23	View file
include/linux/compiler.h	modified	+23	−0	View file
include/linux/export.h	modified	+15	−15	View file
include/linux/init.h	modified	+13	−25	View file
init/Makefile	modified	+2	−0	View file
scripts/Makefile.build	modified	+39	−4	View file
scripts/Makefile.modpost	modified	+9	−5	View file
scripts/basic/fixdep.c	modified	+28	−58	View file
scripts/gen_initramfs_list.sh	modified	+4	−1	View file
scripts/genksyms/lex.l	modified	+17	−18	View file
scripts/genksyms/lex.lex.c_shipped	modified	+17	−18	View file
scripts/link-vmlinux.sh	modified	+60	−11	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/kbuild/makefiles.txt

View file

diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt
index 385a5ef..9b9c479 100644
--- a/Documentation/kbuild/makefiles.txt
+++ b/Documentation/kbuild/makefiles.txt
@@ -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

View file

diff --git a/Makefile b/Makefile
index 27f97b5..fa2c3bd 100644
--- a/Makefile
+++ b/Makefile
@@ -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

View file

diff --git a/arch/Kconfig b/arch/Kconfig
index 180ea33..11d3495 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -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

View file

diff --git a/arch/alpha/include/asm/Kbuild b/arch/alpha/include/asm/Kbuild
index ffd9cf5..bf8475c 100644
--- a/arch/alpha/include/asm/Kbuild
+++ b/arch/alpha/include/asm/Kbuild
@@ -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

View file

diff --git a/arch/alpha/kernel/Makefile b/arch/alpha/kernel/Makefile
index 3ecac01..8ce13d7 100644
--- a/arch/alpha/kernel/Makefile
+++ b/arch/alpha/kernel/Makefile
@@ -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

arch/alpha/kernel/alpha_ksyms.c

View before deletion

diff --git a/arch/alpha/kernel/alpha_ksyms.c b/arch/alpha/kernel/alpha_ksyms.c
deleted file mode 100644
index f4c7ab6..0000000
--- a/arch/alpha/kernel/alpha_ksyms.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * linux/arch/alpha/kernel/alpha_ksyms.c
- *
- * Export the alpha-specific functions that are needed for loadable
- * modules.
- */
-
-#include <linux/module.h>
-#include <asm/console.h>
-#include <asm/uaccess.h>
-#include <asm/checksum.h>
-#include <asm/fpu.h>
-#include <asm/machvec.h>
-
-#include <linux/syscalls.h>
-
-/* these are C runtime functions with special calling conventions: */
-extern void __divl (void);
-extern void __reml (void);
-extern void __divq (void);
-extern void __remq (void);
-extern void __divlu (void);
-extern void __remlu (void);
-extern void __divqu (void);
-extern void __remqu (void);
-
-EXPORT_SYMBOL(alpha_mv);
-EXPORT_SYMBOL(callback_getenv);
-EXPORT_SYMBOL(callback_setenv);
-EXPORT_SYMBOL(callback_save_env);
-
-/* platform dependent support */
-EXPORT_SYMBOL(strcat);
-EXPORT_SYMBOL(strcpy);
-EXPORT_SYMBOL(strlen);
-EXPORT_SYMBOL(strncpy);
-EXPORT_SYMBOL(strncat);
-EXPORT_SYMBOL(strchr);
-EXPORT_SYMBOL(strrchr);
-EXPORT_SYMBOL(memmove);
-EXPORT_SYMBOL(__memcpy);
-EXPORT_SYMBOL(__memset);
-EXPORT_SYMBOL(___memset);
-EXPORT_SYMBOL(__memsetw);
-EXPORT_SYMBOL(__constant_c_memset);
-EXPORT_SYMBOL(copy_page);
-EXPORT_SYMBOL(clear_page);
-
-EXPORT_SYMBOL(alpha_read_fp_reg);
-EXPORT_SYMBOL(alpha_read_fp_reg_s);
-EXPORT_SYMBOL(alpha_write_fp_reg);
-EXPORT_SYMBOL(alpha_write_fp_reg_s);
-
-/* Networking helper routines. */
-EXPORT_SYMBOL(csum_tcpudp_magic);
-EXPORT_SYMBOL(ip_compute_csum);
-EXPORT_SYMBOL(ip_fast_csum);
-EXPORT_SYMBOL(csum_partial_copy_nocheck);
-EXPORT_SYMBOL(csum_partial_copy_from_user);
-EXPORT_SYMBOL(csum_ipv6_magic);
-
-#ifdef CONFIG_MATHEMU_MODULE
-extern long (*alpha_fp_emul_imprecise)(struct pt_regs *, unsigned long);
-extern long (*alpha_fp_emul) (unsigned long pc);
-EXPORT_SYMBOL(alpha_fp_emul_imprecise);
-EXPORT_SYMBOL(alpha_fp_emul);
-#endif
-
-/*
- * The following are specially called from the uaccess assembly stubs.
- */
-EXPORT_SYMBOL(__copy_user);
-EXPORT_SYMBOL(__do_clear_user);
-
-/* 
- * SMP-specific symbols.
- */
-
-#ifdef CONFIG_SMP
-EXPORT_SYMBOL(_atomic_dec_and_lock);
-#endif /* CONFIG_SMP */
-
-/*
- * The following are special because they're not called
- * explicitly (the C compiler or assembler generates them in
- * response to division operations).  Fortunately, their
- * interface isn't gonna change any time soon now, so it's OK
- * to leave it out of version control.
- */
-# undef memcpy
-# undef memset
-EXPORT_SYMBOL(__divl);
-EXPORT_SYMBOL(__divlu);
-EXPORT_SYMBOL(__divq);
-EXPORT_SYMBOL(__divqu);
-EXPORT_SYMBOL(__reml);
-EXPORT_SYMBOL(__remlu);
-EXPORT_SYMBOL(__remq);
-EXPORT_SYMBOL(__remqu);
-EXPORT_SYMBOL(memcpy);
-EXPORT_SYMBOL(memset);
-EXPORT_SYMBOL(memchr);

arch/alpha/kernel/machvec_impl.h

View file

diff --git a/arch/alpha/kernel/machvec_impl.h b/arch/alpha/kernel/machvec_impl.h
index d3398f6..b7d6960 100644
--- a/arch/alpha/kernel/machvec_impl.h
+++ b/arch/alpha/kernel/machvec_impl.h
@@ -144,9 +144,11 @@
    else beforehand.  Fine.  We'll do it ourselves.  */
 #if 0
 #define ALIAS_MV(system) \
-  struct alpha_machine_vector alpha_mv __attribute__((alias(#system "_mv")));
+  struct alpha_machine_vector alpha_mv __attribute__((alias(#system "_mv"))); \
+  EXPORT_SYMBOL(alpha_mv);
 #else
 #define ALIAS_MV(system) \
-  asm(".global alpha_mv\nalpha_mv = " #system "_mv");
+  asm(".global alpha_mv\nalpha_mv = " #system "_mv"); \
+  EXPORT_SYMBOL(alpha_mv);
 #endif
 #endif /* GENERIC */

arch/alpha/kernel/setup.c

View file

diff --git a/arch/alpha/kernel/setup.c b/arch/alpha/kernel/setup.c
index b20af76..4811e54 100644
--- a/arch/alpha/kernel/setup.c
+++ b/arch/alpha/kernel/setup.c
@@ -115,6 +115,7 @@ unsigned long alpha_agpgart_size = DEFAULT_AGP_APER_SIZE;
 
 #ifdef CONFIG_ALPHA_GENERIC
 struct alpha_machine_vector alpha_mv;
+EXPORT_SYMBOL(alpha_mv);
 #endif
 
 #ifndef alpha_using_srm

arch/alpha/lib/callback_srm.S

View file

diff --git a/arch/alpha/lib/callback_srm.S b/arch/alpha/lib/callback_srm.S
index 8804bec..6093add 100644
--- a/arch/alpha/lib/callback_srm.S
+++ b/arch/alpha/lib/callback_srm.S
@@ -3,6 +3,7 @@
  */
 
 #include <asm/console.h>
+#include <asm/export.h>
 
 .text
 #define HWRPB_CRB_OFFSET 0xc0
@@ -92,6 +93,10 @@ CALLBACK(reset_env, CCB_RESET_ENV, 4)
 CALLBACK(save_env, CCB_SAVE_ENV, 1)
 CALLBACK(pswitch, CCB_PSWITCH, 3)
 CALLBACK(bios_emul, CCB_BIOS_EMUL, 5)
+
+EXPORT_SYMBOL(callback_getenv)
+EXPORT_SYMBOL(callback_setenv)
+EXPORT_SYMBOL(callback_save_env)
 	
 .data
 __alpha_using_srm:		# For use by bootpheader

arch/alpha/lib/checksum.c

View file

diff --git a/arch/alpha/lib/checksum.c b/arch/alpha/lib/checksum.c
index 377f9e3..b57f800 100644
--- a/arch/alpha/lib/checksum.c
+++ b/arch/alpha/lib/checksum.c
@@ -48,6 +48,7 @@ __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr,
 		(__force u64)saddr + (__force u64)daddr +
 		(__force u64)sum + ((len + proto) << 8));
 }
+EXPORT_SYMBOL(csum_tcpudp_magic);
 
 __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
 			  __u32 len, __u8 proto, __wsum sum)
@@ -144,6 +145,7 @@ __sum16 ip_fast_csum(const void *iph, unsigned int ihl)
 {
 	return (__force __sum16)~do_csum(iph,ihl*4);
 }
+EXPORT_SYMBOL(ip_fast_csum);
 
 /*
  * computes the checksum of a memory block at buff, length len,
@@ -178,3 +180,4 @@ __sum16 ip_compute_csum(const void *buff, int len)
 {
 	return (__force __sum16)~from64to16(do_csum(buff,len));
 }
+EXPORT_SYMBOL(ip_compute_csum);

arch/alpha/lib/clear_page.S

View file

diff --git a/arch/alpha/lib/clear_page.S b/arch/alpha/lib/clear_page.S
index a221ae2..263d739 100644
--- a/arch/alpha/lib/clear_page.S
+++ b/arch/alpha/lib/clear_page.S
@@ -3,7 +3,7 @@
  *
  * Zero an entire page.
  */
-
+#include <asm/export.h>
 	.text
 	.align 4
 	.global clear_page
@@ -37,3 +37,4 @@ clear_page:
 	nop
 
 	.end clear_page
+	EXPORT_SYMBOL(clear_page)

arch/alpha/lib/clear_user.S

View file

diff --git a/arch/alpha/lib/clear_user.S b/arch/alpha/lib/clear_user.S
index 8860316..bf5b931 100644
--- a/arch/alpha/lib/clear_user.S
+++ b/arch/alpha/lib/clear_user.S
@@ -24,6 +24,7 @@
  * Clobbers:
  *	$1,$2,$3,$4,$5,$6
  */
+#include <asm/export.h>
 
 /* Allow an exception for an insn; exit if we get one.  */
 #define EX(x,y...)			\
@@ -111,3 +112,4 @@ $exception:
 	ret	$31, ($28), 1	# .. e1 :
 
 	.end __do_clear_user
+	EXPORT_SYMBOL(__do_clear_user)

arch/alpha/lib/copy_page.S

View file

diff --git a/arch/alpha/lib/copy_page.S b/arch/alpha/lib/copy_page.S
index 9f3b974..2ee0bd0 100644
--- a/arch/alpha/lib/copy_page.S
+++ b/arch/alpha/lib/copy_page.S
@@ -3,7 +3,7 @@
  *
  * Copy an entire page.
  */
-
+#include <asm/export.h>
 	.text
 	.align 4
 	.global copy_page
@@ -47,3 +47,4 @@ copy_page:
 	nop
 
 	.end copy_page
+	EXPORT_SYMBOL(copy_page)

arch/alpha/lib/copy_user.S

View file

diff --git a/arch/alpha/lib/copy_user.S b/arch/alpha/lib/copy_user.S
index 6f3fab9..2238068 100644
--- a/arch/alpha/lib/copy_user.S
+++ b/arch/alpha/lib/copy_user.S
@@ -26,6 +26,8 @@
  *	$1,$2,$3,$4,$5,$6,$7
  */
 
+#include <asm/export.h>
+
 /* Allow an exception for an insn; exit if we get one.  */
 #define EXI(x,y...)			\
 	99: x,##y;			\
@@ -143,3 +145,4 @@ $101:
 	ret $31,($28),1
 
 	.end __copy_user
+EXPORT_SYMBOL(__copy_user)

arch/alpha/lib/csum_ipv6_magic.S

View file

diff --git a/arch/alpha/lib/csum_ipv6_magic.S b/arch/alpha/lib/csum_ipv6_magic.S
index 2c2acb9..e74b454 100644
--- a/arch/alpha/lib/csum_ipv6_magic.S
+++ b/arch/alpha/lib/csum_ipv6_magic.S
@@ -12,6 +12,7 @@
  * added by Ivan Kokshaysky <[email protected]>
  */
 
+#include <asm/export.h>
 	.globl csum_ipv6_magic
 	.align 4
 	.ent csum_ipv6_magic
@@ -113,3 +114,4 @@ csum_ipv6_magic:
 	ret			# .. e1 :
 
 	.end csum_ipv6_magic
+	EXPORT_SYMBOL(csum_ipv6_magic)

arch/alpha/lib/csum_partial_copy.c

View file

diff --git a/arch/alpha/lib/csum_partial_copy.c b/arch/alpha/lib/csum_partial_copy.c
index 5675dca..b4ff3b6 100644
--- a/arch/alpha/lib/csum_partial_copy.c
+++ b/arch/alpha/lib/csum_partial_copy.c
@@ -374,6 +374,7 @@ csum_partial_copy_from_user(const void __user *src, void *dst, int len,
 	}
 	return (__force __wsum)checksum;
 }
+EXPORT_SYMBOL(csum_partial_copy_from_user);
 
 __wsum
 csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum)
@@ -386,3 +387,4 @@ csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum)
 	set_fs(oldfs);
 	return checksum;
 }
+EXPORT_SYMBOL(csum_partial_copy_nocheck);

arch/alpha/lib/dec_and_lock.c

View file

diff --git a/arch/alpha/lib/dec_and_lock.c b/arch/alpha/lib/dec_and_lock.c
index f9f5fe8..4221b40 100644
--- a/arch/alpha/lib/dec_and_lock.c
+++ b/arch/alpha/lib/dec_and_lock.c
@@ -7,6 +7,7 @@
 
 #include <linux/spinlock.h>
 #include <linux/atomic.h>
+#include <linux/export.h>
 
   asm (".text					\n\
 	.global _atomic_dec_and_lock		\n\
@@ -39,3 +40,4 @@ static int __used atomic_dec_and_lock_1(atomic_t *atomic, spinlock_t *lock)
 	spin_unlock(lock);
 	return 0;
 }
+EXPORT_SYMBOL(_atomic_dec_and_lock);

arch/alpha/lib/divide.S

View file

diff --git a/arch/alpha/lib/divide.S b/arch/alpha/lib/divide.S
index 2d1a048..1e33bd1 100644
--- a/arch/alpha/lib/divide.S
+++ b/arch/alpha/lib/divide.S
@@ -45,6 +45,7 @@
  *	$28 - compare status
  */
 
+#include <asm/export.h>
 #define halt .long 0
 
 /*
@@ -151,6 +152,7 @@ ufunction:
 	addq	$30,STACK,$30
 	ret	$31,($23),1
 	.end	ufunction
+EXPORT_SYMBOL(ufunction)
 
 /*
  * Uhh.. Ugly signed division. I'd rather not have it at all, but
@@ -193,3 +195,4 @@ sfunction:
 	addq	$30,STACK,$30
 	ret	$31,($23),1
 	.end	sfunction
+EXPORT_SYMBOL(sfunction)

arch/alpha/lib/ev6-clear_page.S

View file

diff --git a/arch/alpha/lib/ev6-clear_page.S b/arch/alpha/lib/ev6-clear_page.S
index adf4f7b..abe99e6 100644
--- a/arch/alpha/lib/ev6-clear_page.S
+++ b/arch/alpha/lib/ev6-clear_page.S
@@ -3,7 +3,7 @@
  *
  * Zero an entire page.
  */
-
+#include <asm/export.h>
         .text
         .align 4
         .global clear_page
@@ -52,3 +52,4 @@ clear_page:
 	nop
 
 	.end clear_page
+	EXPORT_SYMBOL(clear_page)

arch/alpha/lib/ev6-clear_user.S

View file

diff --git a/arch/alpha/lib/ev6-clear_user.S b/arch/alpha/lib/ev6-clear_user.S
index 4f42a16..05bef6b 100644
--- a/arch/alpha/lib/ev6-clear_user.S
+++ b/arch/alpha/lib/ev6-clear_user.S
@@ -43,6 +43,7 @@
  *	want to leave a hole (and we also want to avoid repeating lots of work)
  */
 
+#include <asm/export.h>
 /* Allow an exception for an insn; exit if we get one.  */
 #define EX(x,y...)			\
 	99: x,##y;			\
@@ -222,4 +223,4 @@ $exception:			# Destination for exception recovery(?)
 	nop			# .. E  .. ..	:
 	ret	$31, ($28), 1	# L0 .. .. ..	: L U L U
 	.end __do_clear_user
-
+	EXPORT_SYMBOL(__do_clear_user)

arch/alpha/lib/ev6-copy_page.S

View file

diff --git a/arch/alpha/lib/ev6-copy_page.S b/arch/alpha/lib/ev6-copy_page.S
index b789db1..7793506 100644
--- a/arch/alpha/lib/ev6-copy_page.S
+++ b/arch/alpha/lib/ev6-copy_page.S
@@ -56,7 +56,7 @@
    destination pages are in the dcache, but it is my guess that this is
    less important than the dcache miss case.  */
 
-
+#include <asm/export.h>
 	.text
 	.align 4
 	.global copy_page
@@ -201,3 +201,4 @@ copy_page:
 	nop
 
 	.end copy_page
+	EXPORT_SYMBOL(copy_page)

arch/alpha/lib/ev6-copy_user.S

View file

diff --git a/arch/alpha/lib/ev6-copy_user.S b/arch/alpha/lib/ev6-copy_user.S
index db42ffe..debcc3b 100644
--- a/arch/alpha/lib/ev6-copy_user.S
+++ b/arch/alpha/lib/ev6-copy_user.S
@@ -37,6 +37,7 @@
  *	L	- lower subcluster; L0 - subcluster L0; L1 - subcluster L1
  */
 
+#include <asm/export.h>
 /* Allow an exception for an insn; exit if we get one.  */
 #define EXI(x,y...)			\
 	99: x,##y;			\
@@ -256,4 +257,4 @@ $101:
 	ret $31,($28),1		# L0
 
 	.end __copy_user
-
+	EXPORT_SYMBOL(__copy_user)

arch/alpha/lib/ev6-csum_ipv6_magic.S

View file

diff --git a/arch/alpha/lib/ev6-csum_ipv6_magic.S b/arch/alpha/lib/ev6-csum_ipv6_magic.S
index fc0bc39..de62627 100644
--- a/arch/alpha/lib/ev6-csum_ipv6_magic.S
+++ b/arch/alpha/lib/ev6-csum_ipv6_magic.S
@@ -52,6 +52,7 @@
  * may cause additional delay in rare cases (load-load replay traps).
  */
 
+#include <asm/export.h>
 	.globl csum_ipv6_magic
 	.align 4
 	.ent csum_ipv6_magic
@@ -148,3 +149,4 @@ csum_ipv6_magic:
 	ret			# L0 : L U L U
 
 	.end csum_ipv6_magic
+	EXPORT_SYMBOL(csum_ipv6_magic)

arch/alpha/lib/ev6-divide.S

View file

diff --git a/arch/alpha/lib/ev6-divide.S b/arch/alpha/lib/ev6-divide.S
index 2a82b9b..d18dc0e 100644
--- a/arch/alpha/lib/ev6-divide.S
+++ b/arch/alpha/lib/ev6-divide.S
@@ -55,6 +55,7 @@
  * Try not to change the actual algorithm if possible for consistency.
  */
 
+#include <asm/export.h>
 #define halt .long 0
 
 /*
@@ -205,6 +206,7 @@ ufunction:
 	addq	$30,STACK,$30		# E :
 	ret	$31,($23),1		# L0 : L U U L
 	.end	ufunction
+EXPORT_SYMBOL(ufunction)
 
 /*
  * Uhh.. Ugly signed division. I'd rather not have it at all, but
@@ -257,3 +259,4 @@ sfunction:
 	addq	$30,STACK,$30		# E :
 	ret	$31,($23),1		# L0 : L U U L
 	.end	sfunction
+EXPORT_SYMBOL(sfunction)

arch/alpha/lib/ev6-memchr.S

View file

diff --git a/arch/alpha/lib/ev6-memchr.S b/arch/alpha/lib/ev6-memchr.S
index 1a5f71b..419adc5 100644
--- a/arch/alpha/lib/ev6-memchr.S
+++ b/arch/alpha/lib/ev6-memchr.S
@@ -27,7 +27,7 @@
  *	L	- lower subcluster; L0 - subcluster L0; L1 - subcluster L1
  * Try not to change the actual algorithm if possible for consistency.
  */
-
+#include <asm/export.h>
         .set noreorder

This diff is incomplete. Download the complete patch.