Commit b422b758 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:
 "Here is the first round of kbuild changes for v4.1-rc1:

   - kallsyms fix for ARM and cleanup

   - make dep(end) removed (developers have no sense of nostalgia these
     days...)

   - include Makefiles by relative path

   - stop useless rebuilds of asm-offsets.h and bounds.h"

* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  Kbuild: kallsyms: drop special handling of pre-3.0 GCC symbols
  Kbuild: kallsyms: ignore veneers emitted by the ARM linker
  kbuild: ia64: use $(src)/Makefile.gate rather than particular path
  kbuild: include $(src)/Makefile rather than $(obj)/Makefile
  kbuild: use relative path more to include Makefile
  kbuild: use relative path to include Makefile
  kbuild: do not add $(bounds-file) and $(offsets-file) to targets
  kbuild: remove warning about "make depend"
  kbuild: Don't reset timestamps in include/generated if not needed
parents d488d3a4 41b585b2

Kbuild

+10 −11
Original line number Diff line number Diff line
@@ -13,8 +13,9 @@ define sed-y 
	s:->::; p;}"

endef



quiet_cmd_offsets = GEN     $@

define cmd_offsets

# Use filechk to avoid rebuilds when a header changes, but the resulting file

# does not

define filechk_offsets

	(set -e; \

	 echo "#ifndef $2"; \

	 echo "#define $2"; \
@@ -24,9 +25,9 @@ define cmd_offsets 
	 echo " * This file was generated by Kbuild"; \

	 echo " */"; \

	 echo ""; \

	 sed -ne $(sed-y) $<; \

	 sed -ne $(sed-y); \

	 echo ""; \

	 echo "#endif" ) > $@

	 echo "#endif" )

endef



#####
@@ -35,16 +36,15 @@ endef 
bounds-file := include/generated/bounds.h



always  := $(bounds-file)

targets := $(bounds-file) kernel/bounds.s

targets := kernel/bounds.s



# We use internal kbuild rules to avoid the "is up to date" message from make

kernel/bounds.s: kernel/bounds.c FORCE

	$(Q)mkdir -p $(dir $@)

	$(call if_changed_dep,cc_s_c)



$(obj)/$(bounds-file): kernel/bounds.s Kbuild

	$(Q)mkdir -p $(dir $@)

	$(call cmd,offsets,__LINUX_BOUNDS_H__)

$(obj)/$(bounds-file): kernel/bounds.s FORCE

	$(call filechk,offsets,__LINUX_BOUNDS_H__)



#####

# 2) Generate asm-offsets.h
@@ -53,7 +53,6 @@ $(obj)/$(bounds-file): kernel/bounds.s Kbuild 
offsets-file := include/generated/asm-offsets.h



always  += $(offsets-file)

targets += $(offsets-file)

targets += arch/$(SRCARCH)/kernel/asm-offsets.s



# We use internal kbuild rules to avoid the "is up to date" message from make
@@ -62,8 +61,8 @@ arch/$(SRCARCH)/kernel/asm-offsets.s: arch/$(SRCARCH)/kernel/asm-offsets.c \ 
	$(Q)mkdir -p $(dir $@)

	$(call if_changed_dep,cc_s_c)



$(obj)/$(offsets-file): arch/$(SRCARCH)/kernel/asm-offsets.s Kbuild

	$(call cmd,offsets,__ASM_OFFSETS_H__)

$(obj)/$(offsets-file): arch/$(SRCARCH)/kernel/asm-offsets.s FORCE

	$(call filechk,offsets,__ASM_OFFSETS_H__)



#####

# 3) Check for missing system calls

Makefile

+10 −18
Original line number Diff line number Diff line
@@ -10,9 +10,10 @@ NAME = Hurr durr I'ma sheep 
# Comments in this file are targeted only to the developer, do not

# expect to learn how to build the kernel reading this file.



# Do not use make's built-in rules and variables

# o Do not use make's built-in rules and variables

#   (this increases performance and avoids hard-to-debug behaviour);

MAKEFLAGS += -rR

# o Look for make include files relative to root of kernel src

MAKEFLAGS += -rR --include-dir=$(CURDIR)



# Avoid funny character set dependencies

unexport LC_ALL
@@ -344,12 +345,9 @@ endif 
export COMPILER

endif



# Look for make include files relative to root of kernel src

MAKEFLAGS += --include-dir=$(srctree)



# We need some generic definitions (do not try to remake the file).

$(srctree)/scripts/Kbuild.include: ;

include $(srctree)/scripts/Kbuild.include

scripts/Kbuild.include: ;

include scripts/Kbuild.include



# Make variables (CC, etc...)

AS		= $(CROSS_COMPILE)as
@@ -533,7 +531,7 @@ ifeq ($(config-targets),1) 
# Read arch specific Makefile to set KBUILD_DEFCONFIG as needed.

# KBUILD_DEFCONFIG may point out an alternative default configuration

# used for 'make defconfig'

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

include arch/$(SRCARCH)/Makefile

export KBUILD_DEFCONFIG KBUILD_KCONFIG



config: scripts_basic outputmakefile FORCE
@@ -609,7 +607,7 @@ endif # $(dot-config) 
# Defaults to vmlinux, but the arch makefile usually adds further targets

all: vmlinux



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

include arch/$(SRCARCH)/Makefile



KBUILD_CFLAGS	+= $(call cc-option,-fno-delete-null-pointer-checks,)
@@ -782,8 +780,8 @@ ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC)), y) 
	KBUILD_AFLAGS += -DCC_HAVE_ASM_GOTO

endif



include $(srctree)/scripts/Makefile.kasan

include $(srctree)/scripts/Makefile.extrawarn

include scripts/Makefile.kasan

include scripts/Makefile.extrawarn



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

KBUILD_CPPFLAGS += $(KCPPFLAGS)
@@ -1026,12 +1024,6 @@ headerdep: 
	$(Q)find $(srctree)/include/ -name '*.h' | xargs --max-args 1 \

	$(srctree)/scripts/headerdep.pl -I$(srctree)/include



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



PHONY += depend dep

depend dep:

	@echo '*** Warning: make $@ is unnecessary now.'



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

# Firmware install

INSTALL_FW_PATH=$(INSTALL_MOD_PATH)/lib/firmware

arch/arm/boot/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#



ifneq ($(MACHINE),)

include $(srctree)/$(MACHINE)/Makefile.boot

include $(MACHINE)/Makefile.boot

endif



# Note: the following conditions must always be true:

arch/ia64/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ obj-$(CONFIG_BINFMT_ELF) += elfcore.o 
CFLAGS_traps.o  += -mfixed-range=f2-f5,f16-f31



# The gate DSO image is built using a special linker script.

include $(srctree)/arch/ia64/kernel/Makefile.gate

include $(src)/Makefile.gate

# tell compiled for native

CPPFLAGS_gate.lds += -D__IA64_GATE_PARAVIRTUALIZED_NATIVE

arch/mips/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ endif 
#

# Board-dependent options and extra files

#

include $(srctree)/arch/mips/Kbuild.platforms

include arch/mips/Kbuild.platforms



ifdef CONFIG_PHYSICAL_START

load-y					= $(CONFIG_PHYSICAL_START)

CRA Git | Maintained and supported by SUSTech CRA and CCSE