Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-27 13:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

Browse Source 
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
This commit is contained in:
Linus Torvalds 2015-04-15 11:19:18 -07:00
commit b422b75875
11 changed files with 50 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Kbuild
View File

@ -13,8 +13,9 @@ define sed-y
s:->::; p;}" s:->::; p;}"
endef endef
quiet_cmd_offsets = GEN $@ # Use filechk to avoid rebuilds when a header changes, but the resulting file
define cmd_offsets # does not
define filechk_offsets
(set -e; \ (set -e; \
echo "#ifndef $2"; \ echo "#ifndef $2"; \
echo "#define $2"; \ echo "#define $2"; \
@ -24,9 +25,9 @@ define cmd_offsets
echo " * This file was generated by Kbuild"; \ echo " * This file was generated by Kbuild"; \
echo " */"; \ echo " */"; \
echo ""; \ echo ""; \
sed -ne $(sed-y) $<; \ sed -ne $(sed-y); \
echo ""; \ echo ""; \
echo "#endif" ) > $@ echo "#endif" )
endef endef
##### #####
@ -35,16 +36,15 @@ endef
bounds-file := include/generated/bounds.h bounds-file := include/generated/bounds.h
always := $(bounds-file) 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 # We use internal kbuild rules to avoid the "is up to date" message from make
kernel/bounds.s: kernel/bounds.c FORCE kernel/bounds.s: kernel/bounds.c FORCE
$(Q)mkdir -p $(dir $@) $(Q)mkdir -p $(dir $@)
$(call if_changed_dep,cc_s_c) $(call if_changed_dep,cc_s_c)
$(obj)/$(bounds-file): kernel/bounds.s Kbuild $(obj)/$(bounds-file): kernel/bounds.s FORCE
$(Q)mkdir -p $(dir $@) $(call filechk,offsets,__LINUX_BOUNDS_H__)
$(call cmd,offsets,__LINUX_BOUNDS_H__)
##### #####
# 2) Generate asm-offsets.h # 2) Generate asm-offsets.h
@ -53,7 +53,6 @@ $(obj)/$(bounds-file): kernel/bounds.s Kbuild
offsets-file := include/generated/asm-offsets.h offsets-file := include/generated/asm-offsets.h
always += $(offsets-file) always += $(offsets-file)
targets += $(offsets-file)
targets += arch/$(SRCARCH)/kernel/asm-offsets.s targets += arch/$(SRCARCH)/kernel/asm-offsets.s
# We use internal kbuild rules to avoid the "is up to date" message from make # 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 $@) $(Q)mkdir -p $(dir $@)
$(call if_changed_dep,cc_s_c) $(call if_changed_dep,cc_s_c)
$(obj)/$(offsets-file): arch/$(SRCARCH)/kernel/asm-offsets.s Kbuild $(obj)/$(offsets-file): arch/$(SRCARCH)/kernel/asm-offsets.s FORCE
$(call cmd,offsets,__ASM_OFFSETS_H__) $(call filechk,offsets,__ASM_OFFSETS_H__)
##### #####
# 3) Check for missing system calls # 3) Check for missing system calls

28
Makefile
View File

@ -10,9 +10,10 @@ NAME = Hurr durr I'ma sheep
# Comments in this file are targeted only to the developer, do not # Comments in this file are targeted only to the developer, do not
# expect to learn how to build the kernel reading this file. # 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); # (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 # Avoid funny character set dependencies
unexport LC_ALL unexport LC_ALL
@ -344,12 +345,9 @@ endif
export COMPILER export COMPILER
endif 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). # We need some generic definitions (do not try to remake the file).
$(srctree)/scripts/Kbuild.include: ; scripts/Kbuild.include: ;
include $(srctree)/scripts/Kbuild.include include scripts/Kbuild.include
# Make variables (CC, etc...) # Make variables (CC, etc...)
AS = $(CROSS_COMPILE)as AS = $(CROSS_COMPILE)as
@ -533,7 +531,7 @@ ifeq ($(config-targets),1)
# Read arch specific Makefile to set KBUILD_DEFCONFIG as needed. # Read arch specific Makefile to set KBUILD_DEFCONFIG as needed.
# KBUILD_DEFCONFIG may point out an alternative default configuration # KBUILD_DEFCONFIG may point out an alternative default configuration
# used for 'make defconfig' # used for 'make defconfig'
include $(srctree)/arch/$(SRCARCH)/Makefile include arch/$(SRCARCH)/Makefile
export KBUILD_DEFCONFIG KBUILD_KCONFIG export KBUILD_DEFCONFIG KBUILD_KCONFIG
config: scripts_basic outputmakefile FORCE config: scripts_basic outputmakefile FORCE
@ -609,7 +607,7 @@ endif # $(dot-config)
# Defaults to vmlinux, but the arch makefile usually adds further targets # Defaults to vmlinux, but the arch makefile usually adds further targets
all: vmlinux all: vmlinux
include $(srctree)/arch/$(SRCARCH)/Makefile include arch/$(SRCARCH)/Makefile
KBUILD_CFLAGS += $(call cc-option,-fno-delete-null-pointer-checks,) 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 KBUILD_AFLAGS += -DCC_HAVE_ASM_GOTO
endif endif
include $(srctree)/scripts/Makefile.kasan include scripts/Makefile.kasan
include $(srctree)/scripts/Makefile.extrawarn include scripts/Makefile.extrawarn
# Add user supplied CPPFLAGS, AFLAGS and CFLAGS as the last assignments # Add user supplied CPPFLAGS, AFLAGS and CFLAGS as the last assignments
KBUILD_CPPFLAGS += $(KCPPFLAGS) KBUILD_CPPFLAGS += $(KCPPFLAGS)
@ -1026,12 +1024,6 @@ headerdep:
$(Q)find $(srctree)/include/ -name '*.h' | xargs --max-args 1 \ $(Q)find $(srctree)/include/ -name '*.h' | xargs --max-args 1 \
$(srctree)/scripts/headerdep.pl -I$(srctree)/include $(srctree)/scripts/headerdep.pl -I$(srctree)/include
# ---------------------------------------------------------------------------
PHONY += depend dep
depend dep:
@echo '*** Warning: make $@ is unnecessary now.'
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
# Firmware install # Firmware install
INSTALL_FW_PATH=$(INSTALL_MOD_PATH)/lib/firmware INSTALL_FW_PATH=$(INSTALL_MOD_PATH)/lib/firmware

2
arch/arm/boot/Makefile
View File

@ -12,7 +12,7 @@
# #
ifneq ($(MACHINE),) ifneq ($(MACHINE),)
include $(srctree)/$(MACHINE)/Makefile.boot include $(MACHINE)/Makefile.boot
endif endif
# Note: the following conditions must always be true: # Note: the following conditions must always be true:

2
arch/ia64/kernel/Makefile
View File

@ -51,7 +51,7 @@ obj-$(CONFIG_BINFMT_ELF) += elfcore.o
CFLAGS_traps.o += -mfixed-range=f2-f5,f16-f31 CFLAGS_traps.o += -mfixed-range=f2-f5,f16-f31
# The gate DSO image is built using a special linker script. # 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 # tell compiled for native
CPPFLAGS_gate.lds += -D__IA64_GATE_PARAVIRTUALIZED_NATIVE CPPFLAGS_gate.lds += -D__IA64_GATE_PARAVIRTUALIZED_NATIVE

2
arch/mips/Makefile
View File

@ -225,7 +225,7 @@ endif
# #
# Board-dependent options and extra files # Board-dependent options and extra files
# #
include $(srctree)/arch/mips/Kbuild.platforms include arch/mips/Kbuild.platforms
ifdef CONFIG_PHYSICAL_START ifdef CONFIG_PHYSICAL_START
load-y = $(CONFIG_PHYSICAL_START) load-y = $(CONFIG_PHYSICAL_START)

6
arch/um/Makefile
View File

@ -43,8 +43,8 @@ endif
HOST_DIR := arch/$(HEADER_ARCH) HOST_DIR := arch/$(HEADER_ARCH)
include $(srctree)/$(ARCH_DIR)/Makefile-skas include $(ARCH_DIR)/Makefile-skas
include $(srctree)/$(HOST_DIR)/Makefile.um include $(HOST_DIR)/Makefile.um
core-y += $(HOST_DIR)/um/ core-y += $(HOST_DIR)/um/
@ -73,7 +73,7 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\
$(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64 -idirafter include $(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64 -idirafter include
#This will adjust *FLAGS accordingly to the platform. #This will adjust *FLAGS accordingly to the platform.
include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS) include $(ARCH_DIR)/Makefile-os-$(OS)
KBUILD_CPPFLAGS += -I$(srctree)/$(HOST_DIR)/include \ KBUILD_CPPFLAGS += -I$(srctree)/$(HOST_DIR)/include \
-I$(srctree)/$(HOST_DIR)/include/uapi \ -I$(srctree)/$(HOST_DIR)/include/uapi \

2
arch/x86/Makefile
View File

@ -63,7 +63,7 @@ ifeq ($(CONFIG_X86_32),y)
$(call cc-option,-fno-unit-at-a-time)) $(call cc-option,-fno-unit-at-a-time))
# CPU-specific tuning. Anything which can be shared with UML should go here. # CPU-specific tuning. Anything which can be shared with UML should go here.
include $(srctree)/arch/x86/Makefile_32.cpu include arch/x86/Makefile_32.cpu
KBUILD_CFLAGS += $(cflags-y) KBUILD_CFLAGS += $(cflags-y)
# temporary until string.h is fixed # temporary until string.h is fixed

2
arch/x86/Makefile.um
View File

@ -18,7 +18,7 @@ LDS_EXTRA := -Ui386
export LDS_EXTRA export LDS_EXTRA
# First of all, tune CFLAGS for the specific CPU. This actually sets cflags-y. # First of all, tune CFLAGS for the specific CPU. This actually sets cflags-y.
include $(srctree)/arch/x86/Makefile_32.cpu include arch/x86/Makefile_32.cpu
# prevent gcc from keeping the stack 16 byte aligned. Taken from i386. # prevent gcc from keeping the stack 16 byte aligned. Taken from i386.
cflags-y += $(call cc-option,-mpreferred-stack-boundary=2) cflags-y += $(call cc-option,-mpreferred-stack-boundary=2)

2
scripts/Makefile.dtbinst
View File

@ -18,7 +18,7 @@ export dtbinst-root ?= $(obj)
include include/config/auto.conf include include/config/auto.conf
include scripts/Kbuild.include include scripts/Kbuild.include
include $(srctree)/$(obj)/Makefile include $(src)/Makefile
PHONY += __dtbs_install_prep PHONY += __dtbs_install_prep
__dtbs_install_prep: __dtbs_install_prep:

2
scripts/Makefile.fwinst
View File

@ -13,7 +13,7 @@ src := $(obj)
-include $(objtree)/.config -include $(objtree)/.config
include scripts/Kbuild.include include scripts/Kbuild.include
include $(srctree)/$(obj)/Makefile include $(src)/Makefile
include scripts/Makefile.host include scripts/Makefile.host

29
scripts/kallsyms.c
View File

@ -212,15 +212,22 @@ static int symbol_valid(struct sym_entry *s)
"_SDA_BASE_", /* ppc */ "_SDA_BASE_", /* ppc */
"_SDA2_BASE_", /* ppc */ "_SDA2_BASE_", /* ppc */
NULL }; NULL };
static char *special_suffixes[] = {
"_veneer", /* arm */
NULL };
int i; int i;
int offset = 1; char *sym_name = (char *)s->sym + 1;
if (s->addr < kernel_start_addr) if (s->addr < kernel_start_addr)
return 0; return 0;
/* skip prefix char */ /* skip prefix char */
if (symbol_prefix_char && *(s->sym + 1) == symbol_prefix_char) if (symbol_prefix_char && *sym_name == symbol_prefix_char)
offset++; sym_name++;
/* if --all-symbols is not specified, then symbols outside the text /* if --all-symbols is not specified, then symbols outside the text
* and inittext sections are discarded */ * and inittext sections are discarded */
@ -235,22 +242,26 @@ static int symbol_valid(struct sym_entry *s)
* rules. * rules.
*/ */
if ((s->addr == text_range_text->end && if ((s->addr == text_range_text->end &&
strcmp((char *)s->sym + offset, strcmp(sym_name,
text_range_text->end_sym)) || text_range_text->end_sym)) ||
(s->addr == text_range_inittext->end && (s->addr == text_range_inittext->end &&
strcmp((char *)s->sym + offset, strcmp(sym_name,
text_range_inittext->end_sym))) text_range_inittext->end_sym)))
return 0; return 0;
} }
/* Exclude symbols which vary between passes. */ /* Exclude symbols which vary between passes. */
if (strstr((char *)s->sym + offset, "_compiled."))
return 0;
for (i = 0; special_symbols[i]; i++) for (i = 0; special_symbols[i]; i++)
if( strcmp((char *)s->sym + offset, special_symbols[i]) == 0 ) if (strcmp(sym_name, special_symbols[i]) == 0)
return 0; return 0;
for (i = 0; special_suffixes[i]; i++) {
int l = strlen(sym_name) - strlen(special_suffixes[i]);
if (l >= 0 && strcmp(sym_name + l, special_suffixes[i]) == 0)
return 0;
}
return 1; return 1;
} }