Commit c37efa93 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next 

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next: (30 commits)
  Use macros for .data.page_aligned section.
  Use macros for .bss.page_aligned section.
  Use new __init_task_data macro in arch init_task.c files.
  kbuild: Don't define ALIGN and ENTRY when preprocessing linker scripts.
  arm, cris, mips, sparc, powerpc, um, xtensa: fix build with bash 4.0
  kbuild: add static to prototypes
  kbuild: fail build if recordmcount.pl fails
  kbuild: set -fconserve-stack option for gcc 4.5
  kbuild: echo the record_mcount command
  gconfig: disable "typeahead find" search in treeviews
  kbuild: fix cc1 options check to ensure we do not use -fPIC when compiling
  checkincludes.pl: add option to remove duplicates in place
  markup_oops: use modinfo to avoid confusion with underscored module names
  checkincludes.pl: provide usage helper
  checkincludes.pl: close file as soon as we're done with it
  ctags: usability fix
  kernel hacking: move STRIP_ASM_SYMS from General
  gitignore usr/initramfs_data.cpio.bz2 and usr/initramfs_data.cpio.lzma
  kbuild: Check if linker supports the -X option
  kbuild: introduce ld-option
  ...

Fix trivial conflict in scripts/basic/fixdep.c
parents 9e12a7e7 abe1ee3a

Documentation/kbuild/kbuild.txt

+16 −0
Original line number Diff line number Diff line
@@ -65,6 +65,22 @@ INSTALL_PATH 
INSTALL_PATH specifies where to place the updated kernel and system map

images. Default is /boot, but you can set it to other values.



INSTALLKERNEL

--------------------------------------------------

Install script called when using "make install".

The default name is "installkernel".



The script will be called with the following arguments:

    $1 - kernel version

    $2 - kernel image file

    $3 - kernel map file

    $4 - default install path (use root directory if blank)



The implmentation of "make install" is architecture specific

and it may differ from the above.



INSTALLKERNEL is provided to enable the possibility to

specify a custom installer when cross compiling a kernel.



MODLIB

--------------------------------------------------

Documentation/kbuild/makefiles.txt

+17 −3
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ This document describes the Linux kernel Makefiles. 
	   --- 3.9 Dependency tracking

	   --- 3.10 Special Rules

	   --- 3.11 $(CC) support functions

	   --- 3.12 $(LD) support functions



	=== 4 Host Program support

	   --- 4.1 Simple Host Program
@@ -435,14 +436,14 @@ more details, with real examples. 
	The second argument is optional, and if supplied will be used

	if first argument is not supported.



    ld-option

	ld-option is used to check if $(CC) when used to link object files

    cc-ldoption

	cc-ldoption is used to check if $(CC) when used to link object files

	supports the given option.  An optional second option may be

	specified if first option are not supported.



	Example:

		#arch/i386/kernel/Makefile

		vsyscall-flags += $(call ld-option, -Wl$(comma)--hash-style=sysv)

		vsyscall-flags += $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)



	In the above example, vsyscall-flags will be assigned the option

	-Wl$(comma)--hash-style=sysv if it is supported by $(CC).
@@ -570,6 +571,19 @@ more details, with real examples. 
			endif

		endif



--- 3.12 $(LD) support functions



    ld-option

	ld-option is used to check if $(LD) supports the supplied option.

	ld-option takes two options as arguments.

	The second argument is an optional option that can be used if the

	first option is not supported by $(LD).



	Example:

		#Makefile

		LDFLAGS_vmlinux += $(call really-ld-option, -X)





=== 4 Host Program support



Kbuild supports building executables on the host for use during the

Makefile

+52 −10
Original line number Diff line number Diff line
@@ -179,9 +179,46 @@ SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ 
# Alternatively CROSS_COMPILE can be set in the environment.

# Default value for CROSS_COMPILE is not to prefix executables

# Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile

#

# To force ARCH and CROSS_COMPILE settings include kernel.* files

# in the kernel tree - do not patch this file.

export KBUILD_BUILDHOST := $(SUBARCH)

ARCH		?= $(SUBARCH)

CROSS_COMPILE	?=



# Kbuild save the ARCH and CROSS_COMPILE setting in kernel.* files.

# Restore these settings and check that user did not specify

# conflicting values.



saved_arch  := $(shell cat include/generated/kernel.arch  2> /dev/null)

saved_cross := $(shell cat include/generated/kernel.cross 2> /dev/null)



ifneq ($(CROSS_COMPILE),)

        ifneq ($(saved_cross),)

                ifneq ($(CROSS_COMPILE),$(saved_cross))

                        $(error CROSS_COMPILE changed from \

                                "$(saved_cross)" to \

                                 to "$(CROSS_COMPILE)". \

                                 Use "make mrproper" to fix it up)

                endif

        endif

else

    CROSS_COMPILE := $(saved_cross)

endif



ifneq ($(ARCH),)

        ifneq ($(saved_arch),)

                ifneq ($(saved_arch),$(ARCH))

                        $(error ARCH changed from \

                                "$(saved_arch)" to "$(ARCH)". \

                                 Use "make mrproper" to fix it up)

                endif

        endif

else

        ifneq ($(saved_arch),)

                ARCH := $(saved_arch)

        else

                ARCH := $(SUBARCH)

        endif

endif



# Architecture as present in compile.h

UTS_MACHINE 	:= $(ARCH)
@@ -315,6 +352,7 @@ OBJCOPY = $(CROSS_COMPILE)objcopy 
OBJDUMP		= $(CROSS_COMPILE)objdump

AWK		= awk

GENKSYMS	= scripts/genksyms/genksyms

INSTALLKERNEL  := installkernel

DEPMOD		= /sbin/depmod

KALLSYMS	= scripts/kallsyms

PERL		= perl
@@ -353,7 +391,8 @@ KERNELVERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) 


export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION

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 CPP AR NM STRIP OBJCOPY OBJDUMP

export MAKE AWK GENKSYMS INSTALLKERNEL PERL UTS_MACHINE

export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS



export KBUILD_CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS
@@ -444,6 +483,11 @@ ifeq ($(config-targets),1) 
include $(srctree)/arch/$(SRCARCH)/Makefile

export KBUILD_DEFCONFIG KBUILD_KCONFIG



# save ARCH & CROSS_COMPILE settings

$(shell mkdir -p include/generated &&                            \

        echo $(ARCH)          > include/generated/kernel.arch && \

        echo $(CROSS_COMPILE) > include/generated/kernel.cross)



config: scripts_basic outputmakefile FORCE

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

	$(Q)$(MAKE) $(build)=scripts/kconfig $@
@@ -571,6 +615,9 @@ KBUILD_CFLAGS += $(call cc-option,-fno-strict-overflow) 
# revert to pre-gcc-4.4 behaviour of .eh_frame

KBUILD_CFLAGS	+= $(call cc-option,-fno-dwarf2-cfi-asm)



# conserve stack if available

KBUILD_CFLAGS   += $(call cc-option,-fconserve-stack)



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

# But warn user when we do so

warn-assign = \
@@ -591,12 +638,12 @@ endif 


# Use --build-id when available.

LDFLAGS_BUILD_ID = $(patsubst -Wl$(comma)%,%,\

			      $(call ld-option, -Wl$(comma)--build-id,))

			      $(call cc-ldoption, -Wl$(comma)--build-id,))

LDFLAGS_MODULE += $(LDFLAGS_BUILD_ID)

LDFLAGS_vmlinux += $(LDFLAGS_BUILD_ID)



ifeq ($(CONFIG_STRIP_ASM_SYMS),y)

LDFLAGS_vmlinux	+= -X

LDFLAGS_vmlinux	+= $(call ld-option, -X,)

endif



# Default kernel image to build when no specific target is given.
@@ -980,11 +1027,6 @@ prepare0: archprepare FORCE 
# All the preparing..

prepare: prepare0



# Leave this as default for preprocessing vmlinux.lds.S, which is now

# done in arch/$(ARCH)/kernel/Makefile



export CPPFLAGS_vmlinux.lds += -P -C -U$(ARCH)



# The asm symlink changes when $(ARCH) changes.

# Detect this and ask user to run make mrproper

# If asm is a stale symlink (point to dir that does not exist) remove it

arch/arm/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ LDFLAGS_vmlinux :=-p --no-undefined -X 
ifeq ($(CONFIG_CPU_ENDIAN_BE8),y)

LDFLAGS_vmlinux	+= --be8

endif

CPPFLAGS_vmlinux.lds = -DTEXT_OFFSET=$(TEXT_OFFSET)



OBJCOPYFLAGS	:=-O binary -R .note -R .note.gnu.build-id -R .comment -S

GZFLAGS		:=-9

#KBUILD_CFLAGS	+=-pipe
@@ -279,7 +279,7 @@ define archhelp 
  echo  '                  (supply initrd image via make variable INITRD=<path>)'

  echo  '  install       - Install uncompressed kernel'

  echo  '  zinstall      - Install compressed kernel'

  echo  '                  Install using (your) ~/bin/installkernel or'

  echo  '                  (distribution) /sbin/installkernel or'

  echo  '                  Install using (your) ~/bin/$(INSTALLKERNEL) or'

  echo  '                  (distribution) /sbin/$(INSTALLKERNEL) or'

  echo  '                  install to $$(INSTALL_PATH) and run lilo'

endef

arch/arm/boot/install.sh

+2 −2
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ 
#



# User may have a custom install script

if [ -x ~/bin/${CROSS_COMPILE}installkernel ]; then exec ~/bin/${CROSS_COMPILE}installkernel "$@"; fi

if [ -x /sbin/${CROSS_COMPILE}installkernel ]; then exec /sbin/${CROSS_COMPILE}installkernel "$@"; fi

if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi

if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi



if [ "$(basename $2)" = "zImage" ]; then

# Compressed install

CRA Git | Maintained and supported by SUSTech CRA and CCSE