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

Commit 98ced886 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'kbuild-thinar-v4.13' of... 

Merge tag 'kbuild-thinar-v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

Pull Kbuild thin archives updates from Masahiro Yamada:
 "Thin archives migration by Nicholas Piggin.

  THIN_ARCHIVES has been available for a while as an optional feature
  only for PowerPC architecture, but we do not need two different
  intermediate-artifact schemes.

  Using thin archives instead of conventional incremental linking has
  various advantages:

   - save disk space for builds

   - speed-up building a little

   - fix some link issues (for example, allyesconfig on ARM) due to more
     flexibility for the final linking

   - work better with dead code elimination we are planning

  As discussed before, this migration has been done unconditionally so
  that any problems caused by this will show up with "git bisect".

  With testing with 0-day and linux-next, some architectures actually
  showed up problems, but they were trivial and all fixed now"

* tag 'kbuild-thinar-v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  tile: remove unneeded extra-y in Makefile
  kbuild: thin archives make default for all archs
  x86/um: thin archives build fix
  tile: thin archives fix linking
  ia64: thin archives fix linking
  sh: thin archives fix linking
  kbuild: handle libs-y archives separately from built-in.o archives
  kbuild: thin archives use P option to ar
  kbuild: thin archives final link close --whole-archives option
  ia64: remove unneeded extra-y in Makefile.gate
  tile: fix dependency and .*.cmd inclusion for incremental build
  sparc64: Use indirect calls in hamming weight stubs
parents 16ffc4c3 42317ea7

Documentation/kbuild/kbuild.txt

+6 −2
Original line number Diff line number Diff line
@@ -236,5 +236,9 @@ Files specified with KBUILD_VMLINUX_INIT are linked first. 
KBUILD_VMLINUX_MAIN

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

All object files for the main part of vmlinux.

KBUILD_VMLINUX_INIT and KBUILD_VMLINUX_MAIN together specify

all the object files used to link vmlinux.
 


KBUILD_VMLINUX_LIBS

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

All .a "lib" files for vmlinux.

KBUILD_VMLINUX_INIT, KBUILD_VMLINUX_MAIN, and KBUILD_VMLINUX_LIBS together

specify all the object files used to link vmlinux.

Documentation/process/changes.rst

+4 −5
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ you probably needn't concern yourself with isdn4k-utils. 
====================== ===============  ========================================

GNU C                  3.2              gcc --version

GNU make               3.81             make --version

binutils               2.12             ld -v

binutils               2.20             ld -v

util-linux             2.10o            fdformat --version

module-init-tools      0.9.10           depmod -V

e2fsprogs              1.41.4           e2fsck -V
@@ -75,10 +75,9 @@ You will need GNU make 3.81 or later to build the kernel. 
Binutils

--------



Linux on IA-32 has recently switched from using ``as86`` to using ``gas`` for

assembling the 16-bit boot code, removing the need for ``as86`` to compile

your kernel.  This change does, however, mean that you need a recent

release of binutils.

The build system has, as of 4.13, switched to using thin archives (`ar T`)

rather than incremental linking (`ld -r`) for built-in.o intermediate steps.

This requires binutils 2.20 or newer.



Perl

----

Makefile

+4 −4
Original line number Diff line number Diff line
@@ -944,19 +944,19 @@ core-y := $(patsubst %/, %/built-in.o, $(core-y)) 
drivers-y	:= $(patsubst %/, %/built-in.o, $(drivers-y))

net-y		:= $(patsubst %/, %/built-in.o, $(net-y))

libs-y1		:= $(patsubst %/, %/lib.a, $(libs-y))

libs-y2		:= $(patsubst %/, %/built-in.o, $(libs-y))

libs-y		:= $(libs-y1) $(libs-y2)

libs-y2		:= $(filter-out %.a, $(patsubst %/, %/built-in.o, $(libs-y)))

virt-y		:= $(patsubst %/, %/built-in.o, $(virt-y))



# Externally visible symbols (used by link-vmlinux.sh)

export KBUILD_VMLINUX_INIT := $(head-y) $(init-y)

export KBUILD_VMLINUX_MAIN := $(core-y) $(libs-y) $(drivers-y) $(net-y) $(virt-y)

export KBUILD_VMLINUX_MAIN := $(core-y) $(libs-y2) $(drivers-y) $(net-y) $(virt-y)

export KBUILD_VMLINUX_LIBS := $(libs-y1)

export KBUILD_LDS          := arch/$(SRCARCH)/kernel/vmlinux.lds

export LDFLAGS_vmlinux

# used by scripts/pacmage/Makefile

export KBUILD_ALLDIRS := $(sort $(filter-out arch/%,$(vmlinux-alldirs)) arch Documentation include samples scripts tools)



vmlinux-deps := $(KBUILD_LDS) $(KBUILD_VMLINUX_INIT) $(KBUILD_VMLINUX_MAIN)

vmlinux-deps := $(KBUILD_LDS) $(KBUILD_VMLINUX_INIT) $(KBUILD_VMLINUX_MAIN) $(KBUILD_VMLINUX_LIBS)



# Include targets which we want to execute sequentially if the rest of the

# kernel build went well. If CONFIG_TRIM_UNUSED_KSYMS is set, this might be

arch/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -550,7 +550,7 @@ config CC_STACKPROTECTOR_STRONG 
endchoice



config THIN_ARCHIVES

	bool

	def_bool y

	help

	  Select this if the architecture wants to use thin archives

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

arch/ia64/kernel/Makefile.gate

+8 −7
Original line number Diff line number Diff line 
# The gate DSO image is built using a special linker script.



targets += gate.so gate-syms.o

targets += gate.so gate.lds gate.o gate-dummy.o



extra-y += gate.so gate-syms.o gate.lds gate.o

obj-y += gate-syms.o



CPPFLAGS_gate.lds := -P -C -U$(ARCH)
@@ -14,13 +14,14 @@ GATECFLAGS_gate.so = -shared -s -Wl,-soname=linux-gate.so.1 \ 
$(obj)/gate.so: $(obj)/gate.lds $(obj)/gate.o FORCE

	$(call if_changed,gate)



$(obj)/built-in.o: $(obj)/gate-syms.o

$(obj)/built-in.o: ld_flags += -R $(obj)/gate-syms.o



GATECFLAGS_gate-syms.o = -r

$(obj)/gate-syms.o: $(obj)/gate.lds $(obj)/gate.o FORCE

GATECFLAGS_gate-dummy.o = -r

$(obj)/gate-dummy.o: $(obj)/gate.lds $(obj)/gate.o FORCE

	$(call if_changed,gate)



LDFLAGS_gate-syms.o := -r -R

$(obj)/gate-syms.o: $(obj)/gate-dummy.o FORCE

	$(call if_changed,ld)



# gate-data.o contains the gate DSO image as data in section .data..gate.

# We must build gate.so before we can assemble it.

# Note: kbuild does not track this dependency due to usage of .incbin