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

Commit 9a12efc5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull Kbuild updates from Masahiro Yamada:

 - clean-up leftovers in Kconfig files

 - remove stale oldnoconfig and silentoldconfig targets

 - remove unneeded cc-fullversion and cc-name variables

 - improve merge_config script to allow overriding option prefix

* tag 'kbuild-v4.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  kbuild: remove cc-name variable
  kbuild: replace cc-name test with CONFIG_CC_IS_CLANG
  merge_config.sh: Allow to define config prefix
  kbuild: remove unused cc-fullversion variable
  kconfig: remove silentoldconfig target
  kconfig: remove oldnoconfig target
  powerpc: PCI_MSI needs PCI
  powerpc: remove CONFIG_MCA leftovers
  powerpc: remove CONFIG_PCI_QSPAN
  scsi: aha152x: rename the PCMCIA define
parents 16944728 99516742

Documentation/kbuild/makefiles.txt

+0 −15
Original line number Diff line number Diff line
@@ -537,21 +537,6 @@ 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 "$(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.



    cc-cross-prefix

	cc-cross-prefix is used to check if there exists a $(CC) in path with

	one of the listed prefixes. The first prefix where there exist a

Documentation/networking/ice.rst

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ Enabling the driver 
The driver is enabled via the standard kernel configuration system,

using the make command::



  make oldconfig/silentoldconfig/menuconfig/etc.

  make oldconfig/menuconfig/etc.



The driver is located in the menu structure at:

Makefile

+2 −2
Original line number Diff line number Diff line
@@ -485,7 +485,7 @@ ifneq ($(KBUILD_SRC),) 
	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkmakefile $(srctree)

endif



ifeq ($(cc-name),clang)

ifneq ($(shell $(CC) --version 2>&1 | head -n 1 | grep clang),)

ifneq ($(CROSS_COMPILE),)

CLANG_TARGET	:= --target=$(notdir $(CROSS_COMPILE:%-=%))

GCC_TOOLCHAIN_DIR := $(dir $(shell which $(LD)))
@@ -702,7 +702,7 @@ stackp-flags-$(CONFIG_STACKPROTECTOR_STRONG) := -fstack-protector-strong 


KBUILD_CFLAGS += $(stackp-flags-y)



ifeq ($(cc-name),clang)

ifdef CONFIG_CC_IS_CLANG

KBUILD_CPPFLAGS += $(call cc-option,-Qunused-arguments,)

KBUILD_CFLAGS += $(call cc-disable-warning, format-invalid-specifier)

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

arch/mips/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ cflags-y += -ffreestanding 
# clang's output will be based upon the build machine. So for clang we simply

# unconditionally specify -EB or -EL as appropriate.

#

ifeq ($(cc-name),clang)

ifdef CONFIG_CC_IS_CLANG

cflags-$(CONFIG_CPU_BIG_ENDIAN)		+= -EB

cflags-$(CONFIG_CPU_LITTLE_ENDIAN)	+= -EL

else

arch/mips/vdso/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ ccflags-vdso := \ 
	$(filter -march=%,$(KBUILD_CFLAGS)) \

	-D__VDSO__



ifeq ($(cc-name),clang)

ifdef CONFIG_CC_IS_CLANG

ccflags-vdso += $(filter --target=%,$(KBUILD_CFLAGS))

endif