Commit 27a22ee4 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:

 - several cleanups in kbuild

 - serialize multiple *config targets so that 'make defconfig kvmconfig'
   works

 - The cc-ifversion macro got support for an else-branch

* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  kbuild,gcov: simplify kernel/gcov/Makefile more
  kbuild: allow cc-ifversion to have the argument for false condition
  kbuild,gcov: simplify kernel/gcov/Makefile
  kbuild,gcov: remove unnecessary workaround
  kbuild: do not add $(call ...) to invoke cc-version or cc-fullversion
  kbuild: fix cc-ifversion macro
  kbuild: drop $(version_h) from MRPROPER_FILES
  kbuild: use mixed-targets when two or more config targets are given
  kbuild: remove redundant line from bounds.h/asm-offsets.h
  kbuild: merge bounds.h and asm-offsets.h rules
  kbuild: Drop support for clean-rule
parents b2b89ebf a75f8b8d

Documentation/kbuild/makefiles.txt

+5 −4
Original line number Diff line number Diff line
@@ -524,15 +524,16 @@ more details, with real examples. 
	Example:

		#arch/x86/Makefile

		cflags-y += $(shell \

		if [ $(call cc-version) -ge 0300 ] ; then \

		if [ $(cc-version) -ge 0300 ] ; then \

			echo "-mregparm=3"; fi ;)



	In the above example, -mregparm=3 is only used for gcc version greater

	than or equal to gcc 3.0.



    cc-ifversion

	cc-ifversion tests the version of $(CC) and equals last argument if

	version expression is true.

	cc-ifversion tests the version of $(CC) and equals the fourth parameter

	if version expression is true, or the fifth (if given) if the version

	expression is false.



	Example:

		#fs/reiserfs/Makefile
@@ -552,7 +553,7 @@ more details, with real examples. 


	Example:

		#arch/powerpc/Makefile

		$(Q)if test "$(call cc-fullversion)" = "040200" ; then \

		$(Q)if test "$(cc-fullversion)" = "040200" ; then \

			echo -n '*** GCC-4.2.0 cannot compile the 64-bit powerpc ' ; \

			false ; \

		fi

Kbuild

+21 −40
Original line number Diff line number Diff line
@@ -5,24 +5,23 @@ 
# 2) Generate asm-offsets.h (may need bounds.h)

# 3) Check for missing system calls



#####

# 1) Generate bounds.h



bounds-file := include/generated/bounds.h



always  := $(bounds-file)

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

# Default sed regexp - multiline due to syntax constraints

define sed-y

	"/^->/{s:->#\(.*\):/* \1 */:; \

	s:^->\([^ ]*\) [\$$#]*\([-0-9]*\) \(.*\):#define \1 \2 /* \3 */:; \

	s:^->\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; \

	s:->::; p;}"

endef



quiet_cmd_bounds = GEN     $@

define cmd_bounds

quiet_cmd_offsets = GEN     $@

define cmd_offsets

	(set -e; \

	 echo "#ifndef __LINUX_BOUNDS_H__"; \

	 echo "#define __LINUX_BOUNDS_H__"; \

	 echo "#ifndef $2"; \

	 echo "#define $2"; \

	 echo "/*"; \

	 echo " * DO NOT MODIFY."; \

	 echo " *"; \

	 echo " * This file was generated by Kbuild"; \

	 echo " *"; \

	 echo " */"; \

	 echo ""; \

	 sed -ne $(sed-y) $<; \
@@ -30,6 +29,14 @@ define cmd_bounds 
	 echo "#endif" ) > $@

endef



#####

# 1) Generate bounds.h



bounds-file := include/generated/bounds.h



always  := $(bounds-file)

targets := $(bounds-file) 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 $@)
@@ -37,7 +44,7 @@ kernel/bounds.s: kernel/bounds.c FORCE 


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

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

	$(call cmd,bounds)

	$(call cmd,offsets,__LINUX_BOUNDS_H__)



#####

# 2) Generate asm-offsets.h
@@ -49,32 +56,6 @@ always += $(offsets-file) 
targets += $(offsets-file)

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





# Default sed regexp - multiline due to syntax constraints

define sed-y

	"/^->/{s:->#\(.*\):/* \1 */:; \

	s:^->\([^ ]*\) [\$$#]*\([-0-9]*\) \(.*\):#define \1 \2 /* \3 */:; \

	s:^->\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; \

	s:->::; p;}"

endef



quiet_cmd_offsets = GEN     $@

define cmd_offsets

	(set -e; \

	 echo "#ifndef __ASM_OFFSETS_H__"; \

	 echo "#define __ASM_OFFSETS_H__"; \

	 echo "/*"; \

	 echo " * DO NOT MODIFY."; \

	 echo " *"; \

	 echo " * This file was generated by Kbuild"; \

	 echo " *"; \

	 echo " */"; \

	 echo ""; \

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

	 echo ""; \

	 echo "#endif" ) > $@

endef



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

arch/$(SRCARCH)/kernel/asm-offsets.s: arch/$(SRCARCH)/kernel/asm-offsets.c \

                                      $(obj)/$(bounds-file) FORCE
@@ -82,7 +63,7 @@ arch/$(SRCARCH)/kernel/asm-offsets.s: arch/$(SRCARCH)/kernel/asm-offsets.c \ 
	$(call if_changed_dep,cc_s_c)



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

	$(call cmd,offsets)

	$(call cmd,offsets,__ASM_OFFSETS_H__)



#####

# 3) Check for missing system calls

Makefile

+2 −2
Original line number Diff line number Diff line
@@ -502,7 +502,7 @@ endif 
ifeq ($(KBUILD_EXTMOD),)

        ifneq ($(filter config %config,$(MAKECMDGOALS)),)

                config-targets := 1

                ifneq ($(filter-out config %config,$(MAKECMDGOALS)),)

                ifneq ($(words $(MAKECMDGOALS)),1)

                        mixed-targets := 1

                endif

        endif
@@ -1180,7 +1180,7 @@ CLEAN_DIRS += $(MODVERDIR) 
# Directories & files removed with 'make mrproper'

MRPROPER_DIRS  += include/config usr/include include/generated          \

		  arch/*/include/generated .tmp_objdiff

MRPROPER_FILES += .config .config.old .version .old_version $(version_h) \

MRPROPER_FILES += .config .config.old .version .old_version \

		  Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \

		  signing_key.priv signing_key.x509 x509.genkey		\

		  extra_certificates signing_key.x509.keyid		\

arch/parisc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ endef 
# we require gcc 3.3 or above to compile the kernel

archprepare: checkbin

checkbin:

	@if test "$(call cc-version)" -lt "0303"; then \

	@if test "$(cc-version)" -lt "0303"; then \

		echo -n "Sorry, GCC v3.3 or above is required to build " ; \

		echo "the kernel." ; \

		false ; \

arch/powerpc/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ TOUT := .tmp_gas_check 
# - Require gcc 4.0 or above on 64-bit

# - gcc-4.2.0 has issues compiling modules on 64-bit

checkbin:

	@if test "$(call cc-version)" = "0304" ; then \

	@if test "$(cc-version)" = "0304" ; then \

		if ! /bin/echo mftb 5 | $(AS) -v -mppc -many -o $(TOUT) >/dev/null 2>&1 ; then \

			echo -n '*** ${VERSION}.${PATCHLEVEL} kernels no longer build '; \

			echo 'correctly with gcc-3.4 and your version of binutils.'; \
@@ -322,13 +322,13 @@ checkbin: 
			false; \

		fi ; \

	fi

	@if test "$(call cc-version)" -lt "0400" \

	@if test "$(cc-version)" -lt "0400" \

	    && test "x${CONFIG_PPC64}" = "xy" ; then \

                echo -n "Sorry, GCC v4.0 or above is required to build " ; \

                echo "the 64-bit powerpc kernel." ; \

                false ; \

        fi

	@if test "$(call cc-fullversion)" = "040200" \

	@if test "$(cc-fullversion)" = "040200" \

	    && test "x${CONFIG_MODULES}${CONFIG_PPC64}" = "xyy" ; then \

		echo -n '*** GCC-4.2.0 cannot compile the 64-bit powerpc ' ; \

		echo 'kernel with modules enabled.' ; \

CRA Git | Maintained and supported by SUSTech CRA and CCSE