Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild (821f3eff) · Commits · e / devices / android_kernel_oneplus_sm8150

CREDITS

+6 −0

Original line number	Diff line number	Diff line
		@@ -1165,6 +1165,12 @@ S: 600 North Bell Avenue, Suite 160
		S: Carnegie, Pennsylvania 15106-4304
		S: USA

		N: Kai Germaschewski
		E: kai@germaschewski.name
		D: Major kbuild rework during the 2.5 cycle
		D: ISDN Maintainer
		S: USA

		N: Philip Gladstone
		E: philip@gladstonefamily.net
		D: Kernel / timekeeping stuff

Documentation/kbuild/makefiles.txt

+32 −30

Original line number	Diff line number	Diff line
		@@ -276,41 +276,39 @@ more details, with real examples.

		--- 3.7 Compilation flags

		EXTRA_CFLAGS, EXTRA_AFLAGS, EXTRA_LDFLAGS, EXTRA_ARFLAGS
		ccflags-y, asflags-y and ldflags-y
		The three flags listed above applies only to the kbuild makefile
		where they are assigned. They are used for all the normal
		cc, as and ld invocation happenign during a recursive build.
		Note: Flags with the same behaviour were previously named:
		EXTRA_CFLAGS, EXTRA_AFLAGS and EXTRA_LDFLAGS.
		They are yet supported but their use are deprecated.

		All the EXTRA_ variables apply only to the kbuild makefile
		where they are assigned. The EXTRA_ variables apply to all
		commands executed in the kbuild makefile.

		$(EXTRA_CFLAGS) specifies options for compiling C files with
		$(CC).
		ccflags-y specifies options for compiling C files with $(CC).

		Example:
		# drivers/sound/emu10k1/Makefile
		EXTRA_CFLAGS += -I$(obj)
		ifdef DEBUG
		EXTRA_CFLAGS += -DEMU10K1_DEBUG
		endif
		ccflags-y += -I$(obj)
		ccflags-$(DEBUG) += -DEMU10K1_DEBUG


		This variable is necessary because the top Makefile owns the
		variable $(CFLAGS) and uses it for compilation flags for the
		variable $(KBUILD_CFLAGS) and uses it for compilation flags for the
		entire tree.

		$(EXTRA_AFLAGS) is a similar string for per-directory options
		asflags-y is a similar string for per-directory options
		when compiling assembly language source.

		Example:
		#arch/x86_64/kernel/Makefile
		EXTRA_AFLAGS := -traditional
		asflags-y := -traditional


		$(EXTRA_LDFLAGS) and $(EXTRA_ARFLAGS) are similar strings for
		per-directory options to $(LD) and $(AR).
		ldflags-y is a string for per-directory options to $(LD).

		Example:
		#arch/m68k/fpsp040/Makefile
		EXTRA_LDFLAGS := -x
		ldflags-y := -x

		CFLAGS_$@, AFLAGS_$@

		@@ -425,6 +423,7 @@ more details, with real examples.
		as-instr checks if the assembler reports a specific instruction
		and then outputs either option1 or option2
		C escapes are supported in the test instruction
		Note: as-instr-option uses KBUILD_AFLAGS for $(AS) options

		cc-option
		cc-option is used to check if $(CC) supports a given option, and not
		@@ -438,6 +437,7 @@ more details, with real examples.
		-march=pentium-mmx if supported by $(CC), otherwise -march=i586.
		The second argument to cc-option is optional, and if omitted,
		cflags-y will be assigned no value if first option is not supported.
		Note: cc-option uses KBUILD_CFLAGS for $(CC) options

		cc-option-yn
		cc-option-yn is used to check if gcc supports a given option
		@@ -453,6 +453,7 @@ more details, with real examples.
		option. When $(biarch) equals 'y', the expanded variables $(aflags-y)
		and $(cflags-y) will be assigned the values -a32 and -m32,
		respectively.
		Note: cc-option-yn uses KBUILD_CFLAGS for $(CC) options

		cc-option-align
		gcc versions >= 3.0 changed the type of options used to specify
		@@ -464,10 +465,11 @@ more details, with real examples.
		cc-option-align = -falign

		Example:
		CFLAGS += $(cc-option-align)-functions=4
		KBUILD_CFLAGS += $(cc-option-align)-functions=4

		In the above example, the option -falign-functions=4 is used for
		gcc >= 3.00. For gcc < 3.00, -malign-functions=4 is used.
		Note: cc-option-align uses KBUILD_CFLAGS for $(CC) options

		cc-version
		cc-version returns a numerical version of the $(CC) compiler version.
		@@ -492,9 +494,9 @@ more details, with real examples.

		Example:
		#fs/reiserfs/Makefile
		EXTRA_CFLAGS := $(call cc-ifversion, -lt, 0402, -O1)
		ccflags-y := $(call cc-ifversion, -lt, 0402, -O1)

		In this example, EXTRA_CFLAGS will be assigned the value -O1 if the
		In this example, ccflags-y will be assigned the value -O1 if the
		$(CC) version is less than 4.2.
		cc-ifversion takes all the shell operators:
		-eq, -ne, -lt, -le, -gt, and -ge
		@@ -780,8 +782,8 @@ When kbuild executes, the following steps are followed (roughly):
		Example:
		#arch/s390/Makefile
		LDFLAGS := -m elf_s390
		Note: EXTRA_LDFLAGS and LDFLAGS_$@ can be used to further customise
		the flags used. See chapter 7.
		Note: ldflags-y can be used to further customise
		the flags used. See chapter 3.7.

		LDFLAGS_MODULE Options for $(LD) when linking modules

		@@ -817,26 +819,26 @@ When kbuild executes, the following steps are followed (roughly):
		In this example, the binary $(obj)/image is a binary version of
		vmlinux. The usage of $(call if_changed,xxx) will be described later.

		AFLAGS $(AS) assembler flags
		KBUILD_AFLAGS $(AS) assembler flags

		Default value - see top level Makefile
		Append or modify as required per architecture.

		Example:
		#arch/sparc64/Makefile
		AFLAGS += -m64 -mcpu=ultrasparc
		KBUILD_AFLAGS += -m64 -mcpu=ultrasparc

		CFLAGS $(CC) compiler flags
		KBUILD_CFLAGS $(CC) compiler flags

		Default value - see top level Makefile
		Append or modify as required per architecture.

		Often, the CFLAGS variable depends on the configuration.
		Often, the KBUILD_CFLAGS variable depends on the configuration.

		Example:
		#arch/i386/Makefile
		cflags-$(CONFIG_M386) += -march=i386
		CFLAGS += $(cflags-y)
		KBUILD_CFLAGS += $(cflags-y)

		Many arch Makefiles dynamically run the target C compiler to
		probe supported options:
		@@ -848,7 +850,7 @@ When kbuild executes, the following steps are followed (roughly):
		-march=pentium2,-march=i686)
		...
		# Disable unit-at-a-time mode ...
		CFLAGS += $(call cc-option,-fno-unit-at-a-time)
		KBUILD_CFLAGS += $(call cc-option,-fno-unit-at-a-time)
		...


		@@ -1096,8 +1098,8 @@ When kbuild executes, the following steps are followed (roughly):
		specified options when building the target vmlinux.lds.

		When building the *.lds target, kbuild uses the variables:
		CPPFLAGS : Set in top-level Makefile
		EXTRA_CPPFLAGS : May be set in the kbuild makefile
		KBUILD_CPPFLAGS : Set in top-level Makefile
		cppflags-y : May be set in the kbuild makefile
		CPPFLAGS_$(@F) : Target specific flags.
		Note that the full filename is used in this
		assignment.

MAINTAINERS

+0 −4

Original line number	Diff line number	Diff line
		@@ -2138,8 +2138,6 @@ S: Maintained
		ISDN SUBSYSTEM
		P: Karsten Keil
		M: kkeil@suse.de
		P: Kai Germaschewski
		M: kai.germaschewski@gmx.de
		L: isdn4linux@listserv.isdn4linux.de
		W: http://www.isdn4linux.de
		T: git kernel.org:/pub/scm/linux/kernel/kkeil/isdn-2.6.git
		@@ -2208,8 +2206,6 @@ L: autofs@linux.kernel.org
		S: Maintained

		KERNEL BUILD (kbuild: Makefile, scripts/Makefile.*)
		P: Kai Germaschewski
		M: kai@germaschewski.name
		P: Sam Ravnborg
		M: sam@ravnborg.org
		T: git kernel.org:/pub/scm/linux/kernel/git/sam/kbuild.git

Makefile

+38 −19

Original line number	Diff line number	Diff line
		@@ -115,13 +115,20 @@ saved-output := $(KBUILD_OUTPUT)
		KBUILD_OUTPUT := $(shell cd $(KBUILD_OUTPUT) && /bin/pwd)
		$(if $(KBUILD_OUTPUT),, \
		$(error output directory "$(saved-output)" does not exist))
		# Check that OUTPUT directory is not the same as where we have kernel src
		$(if $(filter-out $(KBUILD_OUTPUT),$(shell /bin/pwd)),, \
		$(error Output directory (O=...) specifies kernel src dir))

		PHONY += $(MAKECMDGOALS)
		PHONY += $(MAKECMDGOALS) sub-make

		$(filter-out _all,$(MAKECMDGOALS)) _all:
		$(filter-out _all sub-make,$(MAKECMDGOALS)) _all: sub-make
		$(Q)@:

		sub-make: FORCE
		$(if $(KBUILD_VERBOSE:1=),@)$(MAKE) -C $(KBUILD_OUTPUT) \
		KBUILD_SRC=$(CURDIR) \
		KBUILD_EXTMOD="$(KBUILD_EXTMOD)" -f $(CURDIR)/Makefile $@
		KBUILD_EXTMOD="$(KBUILD_EXTMOD)" -f $(CURDIR)/Makefile \
		$(filter-out _all sub-make,$(MAKECMDGOALS))

		# Leave processing to above invocation of make
		skip-makefile := 1
		@@ -311,12 +318,12 @@ LINUXINCLUDE := -Iinclude \
		$(if $(KBUILD_SRC),-Iinclude2 -I$(srctree)/include) \
		-include include/linux/autoconf.h

		CPPFLAGS := -D__KERNEL__ $(LINUXINCLUDE)
		KBUILD_CPPFLAGS := -D__KERNEL__ $(LINUXINCLUDE)

		CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
		KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
		-fno-strict-aliasing -fno-common \
		-Werror-implicit-function-declaration
		AFLAGS := -D__ASSEMBLY__
		KBUILD_AFLAGS := -D__ASSEMBLY__

		# Read KERNELRELEASE from include/config/kernel.release (if it exists)
		KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)
		@@ -327,9 +334,9 @@ export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC
		export CPP AR NM STRIP OBJCOPY OBJDUMP MAKE AWK GENKSYMS PERL UTS_MACHINE
		export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS

		export CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS
		export CFLAGS CFLAGS_KERNEL CFLAGS_MODULE
		export AFLAGS AFLAGS_KERNEL AFLAGS_MODULE
		export KBUILD_CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS
		export KBUILD_CFLAGS CFLAGS_KERNEL CFLAGS_MODULE
		export KBUILD_AFLAGS AFLAGS_KERNEL AFLAGS_MODULE

		# When compiling out-of-tree modules, put MODVERDIR in the module
		# tree rather than in the kernel tree. The kernel tree might
		@@ -485,35 +492,41 @@ endif # $(dot-config)
		all: vmlinux

		ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
		CFLAGS += -Os
		KBUILD_CFLAGS += -Os
		else
		CFLAGS += -O2
		KBUILD_CFLAGS += -O2
		endif

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

		ifdef CONFIG_FRAME_POINTER
		CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls
		KBUILD_CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls
		else
		CFLAGS += -fomit-frame-pointer
		KBUILD_CFLAGS += -fomit-frame-pointer
		endif

		ifdef CONFIG_DEBUG_INFO
		CFLAGS += -g
		KBUILD_CFLAGS += -g
		KBUILD_AFLAGS += -gdwarf-2
		endif

		# Force gcc to behave correct even for buggy distributions
		CFLAGS += $(call cc-option, -fno-stack-protector)
		KBUILD_CFLAGS += $(call cc-option, -fno-stack-protector)

		# arch Makefile may override CC so keep this after arch Makefile is included
		NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
		CHECKFLAGS += $(NOSTDINC_FLAGS)

		# warn about C99 declaration after statement
		CFLAGS += $(call cc-option,-Wdeclaration-after-statement,)
		KBUILD_CFLAGS += $(call cc-option,-Wdeclaration-after-statement,)

		# disable pointer signed / unsigned warnings in gcc 4.0
		CFLAGS += $(call cc-option,-Wno-pointer-sign,)
		KBUILD_CFLAGS += $(call cc-option,-Wno-pointer-sign,)

		# Add user supplied CPPFLAGS, AFLAGS and CFLAGS as the last assignments
		KBUILD_CPPFLAGS += $(CPPFLAGS)
		KBUILD_AFLAGS += $(AFLAGS)
		KBUILD_CFLAGS += $(CFLAGS)

		# Use --build-id when available.
		LDFLAGS_BUILD_ID = $(patsubst -Wl$(comma)%,%,\
		@@ -1149,6 +1162,7 @@ help:
		@echo 'Static analysers'
		@echo ' checkstack - Generate a list of stack hogs'
		@echo ' namespacecheck - Name space analysis on compiled kernel'
		@echo ' export_report - List the usages of all exported symbols'
		@if [ -r $(srctree)/include/asm-$(SRCARCH)/Kbuild ]; then \
		echo ' headers_check - Sanity check on exported headers'; \
		fi
		@@ -1255,8 +1269,10 @@ $(clean-dirs):
		$(Q)$(MAKE) $(clean)=$(patsubst _clean_%,%,$@)

		clean: rm-dirs := $(MODVERDIR)
		clean: rm-files := $(KBUILD_EXTMOD)/Module.symvers
		clean: $(clean-dirs)
		$(call cmd,rmdirs)
		$(call cmd,rmfiles)
		@find $(KBUILD_EXTMOD) $(RCS_FIND_IGNORE) \
		\( -name '.[oas]' -o -name '.ko' -o -name '.*.cmd' \
		-o -name '..d' -o -name '..tmp' -o -name '*.mod.c' \) \
		@@ -1411,6 +1427,9 @@ versioncheck:
		namespacecheck:
		$(PERL) $(srctree)/scripts/namespace.pl

		export_report:
		$(PERL) $(srctree)/scripts/export_report.pl

		endif #ifeq ($(config-targets),1)
		endif #ifeq ($(mixed-targets),1)

		@@ -1488,8 +1507,8 @@ quiet_cmd_rmfiles = $(if $(wildcard $(rm-files)),CLEAN $(wildcard $(rm-files))
		cmd_rmfiles = rm -f $(rm-files)


		a_flags = -Wp,-MD,$(depfile) $(AFLAGS) $(AFLAGS_KERNEL) \
		$(NOSTDINC_FLAGS) $(CPPFLAGS) \
		a_flags = -Wp,-MD,$(depfile) $(KBUILD_AFLAGS) $(AFLAGS_KERNEL) \
		$(NOSTDINC_FLAGS) $(KBUILD_CPPFLAGS) \
		$(modkern_aflags) $(EXTRA_AFLAGS) $(AFLAGS_$(basetarget).o)

		quiet_cmd_as_o_S = AS $@

arch/alpha/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@ cflags-y += $(cpuflags-y)
		# For TSUNAMI, we must have the assembler not emulate our instructions.
		# The same is true for IRONGATE, POLARIS, PYXIS.
		# BWX is most important, but we don't really want any emulation ever.
		CFLAGS += $(cflags-y) -Wa,-mev6
		KBUILD_CFLAGS += $(cflags-y) -Wa,-mev6

		head-y := arch/alpha/kernel/head.o