Commit 1bc27677 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull more Kbuild updates from Masahiro Yamada:

 - add build_{menu,n,g,x}config targets for compile-testing Kconfig

 - fix and improve recursive dependency detection in Kconfig

 - fix parallel building of menuconfig/nconfig

 - fix syntax error in clang-version.sh

 - suppress distracting log from syncconfig

 - remove obsolete "rpm" target

 - remove VMLINUX_SYMBOL(_STR) macro entirely

 - fix microblaze build with CONFIG_DYNAMIC_FTRACE

 - move compiler test for dead code/data elimination to Kconfig

 - rename well-known LDFLAGS variable to KBUILD_LDFLAGS

 - misc fixes and cleanups

* tag 'kbuild-v4.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  kbuild: rename LDFLAGS to KBUILD_LDFLAGS
  kbuild: pass LDFLAGS to recordmcount.pl
  kbuild: test dead code/data elimination support in Kconfig
  initramfs: move gen_initramfs_list.sh from scripts/ to usr/
  vmlinux.lds.h: remove stale <linux/export.h> include
  export.h: remove VMLINUX_SYMBOL() and VMLINUX_SYMBOL_STR()
  Coccinelle: remove pci_alloc_consistent semantic to detect in zalloc-simple.cocci
  kbuild: make sorting initramfs contents independent of locale
  kbuild: remove "rpm" target, which is alias of "rpm-pkg"
  kbuild: Fix LOADLIBES rename in Documentation/kbuild/makefiles.txt
  kconfig: suppress "configuration written to .config" for syncconfig
  kconfig: fix "Can't open ..." in parallel build
  kbuild: Add a space after `!` to prevent parsing as file pattern
  scripts: modpost: check memory allocation results
  kconfig: improve the recursive dependency report
  kconfig: report recursive dependency involving 'imply'
  kconfig: error out when seeing recursive dependency
  kconfig: add build-only configurator targets
  scripts/dtc: consolidate include path options in Makefile
parents b8dcdab3 d503ac53

Documentation/early-userspace/README

+3 −3
Original line number Diff line number Diff line
@@ -66,17 +66,17 @@ early userspace image can be built by an unprivileged user. 


As a technical note, when directories and files are specified, the

entire CONFIG_INITRAMFS_SOURCE is passed to

scripts/gen_initramfs_list.sh.  This means that CONFIG_INITRAMFS_SOURCE

usr/gen_initramfs_list.sh.  This means that CONFIG_INITRAMFS_SOURCE

can really be interpreted as any legal argument to

gen_initramfs_list.sh.  If a directory is specified as an argument then

the contents are scanned, uid/gid translation is performed, and

usr/gen_init_cpio file directives are output.  If a directory is

specified as an argument to scripts/gen_initramfs_list.sh then the

specified as an argument to usr/gen_initramfs_list.sh then the

contents of the file are simply copied to the output.  All of the output

directives from directory scanning and file contents copying are

processed by usr/gen_init_cpio.



See also 'scripts/gen_initramfs_list.sh -h'.

See also 'usr/gen_initramfs_list.sh -h'.



Where's this all leading?

=========================

Documentation/filesystems/ramfs-rootfs-initramfs.txt

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ Documentation/early-userspace/README for more details.) 
The kernel does not depend on external cpio tools.  If you specify a

directory instead of a configuration file, the kernel's build infrastructure

creates a configuration file from that directory (usr/Makefile calls

scripts/gen_initramfs_list.sh), and proceeds to package up that directory

usr/gen_initramfs_list.sh), and proceeds to package up that directory

using the config file (by feeding it to usr/gen_init_cpio, which is created

from usr/gen_init_cpio.c).  The kernel's build-time cpio creation code is

entirely self-contained, and the kernel's boot-time extractor is also

Documentation/kbuild/kconfig-language.txt

+1 −2
Original line number Diff line number Diff line
@@ -545,7 +545,7 @@ make KBUILD_KCONFIG=Documentation/kbuild/Kconfig.recursion-issue-02 allnoconfig 
Practical solutions to kconfig recursive issue

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~



Developers who run into the recursive Kconfig issue have three options

Developers who run into the recursive Kconfig issue have two options

at their disposal. We document them below and also provide a list of

historical issues resolved through these different solutions.
@@ -553,7 +553,6 @@ historical issues resolved through these different solutions. 
  b) Match dependency semantics:

	b1) Swap all "select FOO" to "depends on FOO" or,

	b2) Swap all "depends on FOO" to "select FOO"

  c) Consider the use of "imply" instead of "select"



The resolution to a) can be tested with the sample Kconfig file

Documentation/kbuild/Kconfig.recursion-issue-01 through the removal

Documentation/kbuild/makefiles.txt

+1 −1
Original line number Diff line number Diff line
@@ -680,7 +680,7 @@ Both possibilities are described in the following. 


	Example:

		#scripts/kconfig/Makefile

		HOSTLOADLIBES_qconf := -L$(QTDIR)/lib

		HOSTLDLIBS_qconf := -L$(QTDIR)/lib



	When linking qconf, it will be passed the extra option

	"-L$(QTDIR)/lib".

Makefile

+5 −13
Original line number Diff line number Diff line
@@ -440,7 +440,7 @@ KBUILD_CFLAGS_KERNEL := 
KBUILD_AFLAGS_MODULE  := -DMODULE

KBUILD_CFLAGS_MODULE  := -DMODULE

KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds

LDFLAGS :=

KBUILD_LDFLAGS :=

GCC_PLUGINS_CFLAGS :=



export ARCH SRCARCH CONFIG_SHELL HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE AS LD CC
@@ -448,7 +448,7 @@ export CPP AR NM STRIP OBJCOPY OBJDUMP KBUILD_HOSTLDFLAGS KBUILD_HOSTLDLIBS 
export MAKE LEX YACC AWK GENKSYMS INSTALLKERNEL PERL PYTHON PYTHON2 PYTHON3 UTS_MACHINE

export HOSTCXX KBUILD_HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS



export KBUILD_CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS

export KBUILD_CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS KBUILD_LDFLAGS

export KBUILD_CFLAGS CFLAGS_KERNEL CFLAGS_MODULE

export CFLAGS_KASAN CFLAGS_KASAN_NOSANITIZE CFLAGS_UBSAN

export KBUILD_AFLAGS AFLAGS_KERNEL AFLAGS_MODULE
@@ -790,8 +790,8 @@ KBUILD_CFLAGS += $(call cc-option, -fno-inline-functions-called-once) 
endif



ifdef CONFIG_LD_DEAD_CODE_DATA_ELIMINATION

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

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

KBUILD_CFLAGS_KERNEL += -ffunction-sections -fdata-sections

LDFLAGS_vmlinux += --gc-sections

endif



# arch Makefile may override CC so keep this after arch Makefile is included
@@ -857,10 +857,6 @@ LDFLAGS_BUILD_ID := $(call ld-option, --build-id) 
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
@@ -1024,7 +1020,7 @@ 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) ;    \

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

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



vmlinux: scripts/link-vmlinux.sh autoksyms_recursive $(vmlinux-deps) FORCE
@@ -1354,16 +1350,12 @@ distclean: mrproper 


# Packaging of the kernel to various formats

# ---------------------------------------------------------------------------

# rpm target kept for backward compatibility

package-dir	:= scripts/package



%src-pkg: FORCE

	$(Q)$(MAKE) $(build)=$(package-dir) $@

%pkg: include/config/kernel.release FORCE

	$(Q)$(MAKE) $(build)=$(package-dir) $@

rpm: rpm-pkg

	@echo "  WARNING: \"rpm\" target will be removed after Linux 4.18"

	@echo "           Please use \"rpm-pkg\" instead."





# Brief documentation of the typical targets used

CRA Git | Maintained and supported by SUSTech CRA and CCSE