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

Commit 1700ff82 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:
 "Kbuild changes for v3.16-rc1:

   - cross-compilation fix so that cc-option is testing the right
     compiler
   - Fix for make defconfig all
   - Using relative paths to the object and source directory where
     possible, plus fixes for the fallout of the change
   - several cleanups in the Makefiles and scripts

  The powerpc fix is from today, because it was only discovered
  recently.  The rest has been in linux-next for some time"

* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  powerpc: Avoid circular dependency with zImage.%
  kbuild: create include/config directory in scripts/kconfig/Makefile
  kbuild: do not create include/linux directory
  Makefile: Fix unrecognized cross-compiler command line options
  kbuild: do not add "selinux" to subdir- twice
  um: Fix for relative objtree when generating x86 headers
  kbuild: Use relative path when building in a subdir of the source tree
  kbuild: Use relative path when building in the source tree
  kbuild: Use relative path for $(objtree)
  firmware: Use $(quote) in the Makefile
  firmware: Simplify directory creation
  kbuild: trivial - fix comment block indent
  kbuild: trivial - remove trailing spaces
  kbuild: support simultaneous "make %config" and "make all"
  kbuild: move extra gcc checks to scripts/Makefile.extrawarn
parents 8841c8b3 699c659b

Makefile

+52 −37
Original line number Diff line number Diff line
@@ -105,10 +105,6 @@ ifeq ("$(origin O)", "command line") 
  KBUILD_OUTPUT := $(O)

endif



ifeq ("$(origin W)", "command line")

  export KBUILD_ENABLE_EXTRA_GCC_CHECKS := $(W)

endif



# That's our default target when none is given on the command line

PHONY := _all

_all:
@@ -153,8 +149,18 @@ else 
_all: modules

endif



srctree		:= $(if $(KBUILD_SRC),$(KBUILD_SRC),$(CURDIR))

objtree		:= $(CURDIR)

ifeq ($(KBUILD_SRC),)

        # building in the source tree

        srctree := .

else

        ifeq ($(KBUILD_SRC)/,$(dir $(CURDIR)))

                # building in a subdirectory of the source tree

                srctree := ..

        else

                srctree := $(KBUILD_SRC)

        endif

endif

objtree		:= .

src		:= $(srctree)

obj		:= $(objtree)
@@ -346,7 +352,6 @@ $(srctree)/scripts/Kbuild.include: ; 
include $(srctree)/scripts/Kbuild.include



# Make variables (CC, etc...)



AS		= $(CROSS_COMPILE)as

LD		= $(CROSS_COMPILE)ld

CC		= $(CROSS_COMPILE)gcc
@@ -395,8 +400,8 @@ KBUILD_CPPFLAGS := -D__KERNEL__ 
KBUILD_CFLAGS   := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \

		   -fno-strict-aliasing -fno-common \

		   -Werror-implicit-function-declaration \

		   -Wno-format-security \

		   $(call cc-option,-fno-delete-null-pointer-checks,)

		   -Wno-format-security



KBUILD_AFLAGS_KERNEL :=

KBUILD_CFLAGS_KERNEL :=

KBUILD_AFLAGS   := -D__ASSEMBLY__
@@ -504,8 +509,16 @@ ifeq ($(mixed-targets),1) 
# We're called with mixed targets (*config and build targets).

# Handle them one by one.



%:: FORCE

	$(Q)$(MAKE) -C $(srctree) KBUILD_SRC= $@

PHONY += $(MAKECMDGOALS) __build_one_by_one



$(filter-out __build_one_by_one, $(MAKECMDGOALS)): __build_one_by_one

	@:



__build_one_by_one:

	$(Q)set -e; \

	for i in $(MAKECMDGOALS); do \

		$(MAKE) -f $(srctree)/Makefile $$i; \

	done



else

ifeq ($(config-targets),1)
@@ -520,11 +533,9 @@ include $(srctree)/arch/$(SRCARCH)/Makefile 
export KBUILD_DEFCONFIG KBUILD_KCONFIG



config: scripts_basic outputmakefile FORCE

	$(Q)mkdir -p include/linux include/config

	$(Q)$(MAKE) $(build)=scripts/kconfig $@



%config: scripts_basic outputmakefile FORCE

	$(Q)mkdir -p include/linux include/config

	$(Q)$(MAKE) $(build)=scripts/kconfig $@



else
@@ -594,14 +605,16 @@ endif # $(dot-config) 
# Defaults to vmlinux, but the arch makefile usually adds further targets

all: vmlinux



include $(srctree)/arch/$(SRCARCH)/Makefile



KBUILD_CFLAGS	+= $(call cc-option,-fno-delete-null-pointer-checks,)



ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE

KBUILD_CFLAGS	+= -Os $(call cc-disable-warning,maybe-uninitialized,)

else

KBUILD_CFLAGS	+= -O2

endif



include $(srctree)/arch/$(SRCARCH)/Makefile



ifdef CONFIG_READABLE_ASM

# Disable optimizations that make assembler listings hard to read.

# reorder blocks reorders the control in the function
@@ -731,6 +744,8 @@ ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC)), y) 
	KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO

endif



include $(srctree)/scripts/Makefile.extrawarn



# Add user supplied CPPFLAGS, AFLAGS and CFLAGS as the last assignments

KBUILD_CPPFLAGS += $(KCPPFLAGS)

KBUILD_AFLAGS += $(KAFLAGS)
@@ -1054,10 +1069,10 @@ _modinst_: 
	@rm -rf $(MODLIB)/kernel

	@rm -f $(MODLIB)/source

	@mkdir -p $(MODLIB)/kernel

	@ln -s $(srctree) $(MODLIB)/source

	@ln -s `cd $(srctree) && /bin/pwd` $(MODLIB)/source

	@if [ ! $(objtree) -ef  $(MODLIB)/build ]; then \

		rm -f $(MODLIB)/build ; \

		ln -s $(objtree) $(MODLIB)/build ; \

		ln -s $(CURDIR) $(MODLIB)/build ; \

	fi

	@cp -f $(objtree)/modules.order $(MODLIB)/

	@cp -f $(objtree)/modules.builtin $(MODLIB)/

arch/powerpc/boot/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -333,8 +333,8 @@ $(addprefix $(obj)/, $(initrd-y)): $(obj)/ramdisk.image.gz 
$(obj)/zImage.initrd.%: vmlinux $(wrapperbits)

	$(call if_changed,wrap,$*,,,$(obj)/ramdisk.image.gz)



$(obj)/zImage.%: vmlinux $(wrapperbits)

	$(call if_changed,wrap,$*)

$(addprefix $(obj)/, $(sort $(filter zImage.%, $(image-y)))): vmlinux $(wrapperbits)

	$(call if_changed,wrap,$(subst $(obj)/zImage.,,$@))



# dtbImage% - a dtbImage is a zImage with an embedded device tree blob

$(obj)/dtbImage.initrd.%: vmlinux $(wrapperbits) $(obj)/%.dtb

arch/um/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -111,8 +111,7 @@ endef 
KBUILD_KCONFIG := $(HOST_DIR)/um/Kconfig



archheaders:

	$(Q)$(MAKE) -C '$(srctree)' KBUILD_SRC= \

		ARCH=$(HEADER_ARCH) O='$(objtree)' archheaders

	$(Q)$(MAKE) KBUILD_SRC= ARCH=$(HEADER_ARCH) archheaders



archprepare: include/generated/user_constants.h

firmware/Makefile

+7 −27
Original line number Diff line number Diff line
@@ -4,10 +4,10 @@ 


# Create $(fwabs) from $(CONFIG_EXTRA_FIRMWARE_DIR) -- if it doesn't have a

# leading /, it's relative to $(srctree).

fwdir := $(subst ",,$(CONFIG_EXTRA_FIRMWARE_DIR))

fwdir := $(subst $(quote),,$(CONFIG_EXTRA_FIRMWARE_DIR))

fwabs := $(addprefix $(srctree)/,$(filter-out /%,$(fwdir)))$(filter /%,$(fwdir))



fw-external-y := $(subst ",,$(CONFIG_EXTRA_FIRMWARE))

fw-external-y := $(subst $(quote),,$(CONFIG_EXTRA_FIRMWARE))



# There are three cases to care about:

# 1. Building kernel with CONFIG_FIRMWARE_IN_KERNEL=y -- $(fw-shipped-y) should
@@ -138,12 +138,6 @@ fw-shipped-$(CONFIG_YAM) += yam/1200.bin yam/9600.bin 


fw-shipped-all := $(fw-shipped-y) $(fw-shipped-m) $(fw-shipped-)



# Directories which we _might_ need to create, so we have a rule for them.

firmware-dirs := $(sort $(addprefix $(objtree)/$(obj)/,$(dir $(fw-external-y) $(fw-shipped-all))))



quiet_cmd_mkdir = MKDIR   $(patsubst $(objtree)/%,%,$@)

      cmd_mkdir = mkdir -p $@



quiet_cmd_ihex  = IHEX    $@

      cmd_ihex  = $(OBJCOPY) -Iihex -Obinary $< $@
@@ -184,21 +178,10 @@ wordsize_deps := $(wildcard include/config/64bit.h include/config/32bit.h \ 
		include/config/superh32.h include/config/superh64.h \

		include/config/x86_32.h include/config/x86_64.h)



# Workaround for make < 3.81, where .SECONDEXPANSION doesn't work.

# It'll end up depending on these targets, so make them a PHONY rule which

# depends on _all_ the directories in $(firmware-dirs), and it'll work out OK.

PHONY += $(objtree)/$$(%) $(objtree)/$(obj)/$$(%)

$(objtree)/$$(%) $(objtree)/$(obj)/$$(%): $(firmware-dirs)

	@true



# For the $$(dir %) trick, where we need % to be expanded first.

.SECONDEXPANSION:



$(patsubst %,$(obj)/%.gen.S, $(fw-shipped-y)): %: $(wordsize_deps) \

		| $(objtree)/$$(dir %)

$(patsubst %,$(obj)/%.gen.S, $(fw-shipped-y)): %: $(wordsize_deps)

	$(call cmd,fwbin,$(patsubst %.gen.S,%,$@))

$(patsubst %,$(obj)/%.gen.S, $(fw-external-y)): %: $(wordsize_deps) \

		include/config/extra/firmware/dir.h | $(objtree)/$$(dir %)

		include/config/extra/firmware/dir.h

	$(call cmd,fwbin,$(fwabs)/$(patsubst $(obj)/%.gen.S,%,$@))



# The .o files depend on the binaries directly; the .S files don't.
@@ -207,7 +190,7 @@ $(patsubst %,$(obj)/%.gen.o, $(fw-external-y)): $(obj)/%.gen.o: $(fwdir)/% 


# .ihex is used just as a simple way to hold binary files in a source tree

# where binaries are frowned upon. They are directly converted with objcopy.

$(obj)/%: $(obj)/%.ihex | $(objtree)/$(obj)/$$(dir %)

$(obj)/%: $(obj)/%.ihex

	$(call cmd,ihex)



# Don't depend on ihex2fw if we're installing and it already exists.
@@ -226,16 +209,13 @@ endif 
# is actually meaningful, because the firmware has to be loaded in a certain

# order rather than as a single binary blob. Thus, we convert them into our

# more compact binary representation of ihex records (<linux/ihex.h>)

$(obj)/%.fw: $(obj)/%.HEX $(ihex2fw_dep) | $(objtree)/$(obj)/$$(dir %)

$(obj)/%.fw: $(obj)/%.HEX $(ihex2fw_dep)

	$(call cmd,ihex2fw)



# .H16 is our own modified form of Intel HEX, with 16-bit length for records.

$(obj)/%.fw: $(obj)/%.H16 $(ihex2fw_dep) | $(objtree)/$(obj)/$$(dir %)

$(obj)/%.fw: $(obj)/%.H16 $(ihex2fw_dep)

	$(call cmd,h16tofw)



$(firmware-dirs):

	$(call cmd,mkdir)



obj-y				 += $(patsubst %,%.gen.o, $(fw-external-y))

obj-$(CONFIG_FIRMWARE_IN_KERNEL) += $(patsubst %,%.gen.o, $(fw-shipped-y))

scripts/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -39,4 +39,4 @@ subdir-$(CONFIG_SECURITY_SELINUX) += selinux 
subdir-$(CONFIG_DTC)         += dtc



# Let clean descend into subdirs

subdir-	+= basic kconfig package selinux
 
subdir-	+= basic kconfig package