Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 202668ec authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-2.6.18:
  gitignore: gitignore quilt's files
  kbuild: always use $(CC) for $(call cc-version)
  kconfig: correct oldconfig for unset choice options
  kbuild: -fno-stack-protector is not good
  kbuild: fix typo in modpost
  kbuild: improve error from file2alias
  kbuild: .gitignore utsrelease.h
  kbuild: version.h and new headers_* targets does not require a kernel config
  kbuild: hardcode value of YACC&LEX for aic7-triple-x
parents a205729e 8ccf2832

.gitignore

+5 −0
Original line number Diff line number Diff line
@@ -30,6 +30,11 @@ include/config 
include/linux/autoconf.h

include/linux/compile.h

include/linux/version.h

include/linux/utsrelease.h



# stgit generated dirs

patches-*



# quilt's files

patches

series

Makefile

+3 −2
Original line number Diff line number Diff line
@@ -310,8 +310,8 @@ CPPFLAGS := -D__KERNEL__ $(LINUXINCLUDE) 
CFLAGS          := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \

                   -fno-strict-aliasing -fno-common

# Force gcc to behave correct even for buggy distributions

CFLAGS          += $(call cc-option, -fno-stack-protector-all \

                                     -fno-stack-protector)

CFLAGS          += $(call cc-option, -fno-stack-protector)



AFLAGS          := -D__ASSEMBLY__



# Read KERNELRELEASE from include/config/kernel.release (if it exists)
@@ -368,6 +368,7 @@ endif 


no-dot-config-targets := clean mrproper distclean \

			 cscope TAGS tags help %docs check% \

			 include/linux/version.h headers_% \

			 kernelrelease kernelversion



config-targets := 0

drivers/scsi/aic7xxx/aicasm/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ LIBS= -ldb 
clean-files:= ${GENSRCS} ${GENHDRS} $(YSRCS:.y=.output) $(PROG)

# Override default kernel CFLAGS.  This is a userland app.

AICASM_CFLAGS:= -I/usr/include -I.

LEX= flex

YACC= bison

YFLAGS= -d



NOMAN=	noman

scripts/Kbuild.include

+1 −2
Original line number Diff line number Diff line
@@ -77,8 +77,7 @@ cc-option-align = $(subst -functions=0,,\ 


# cc-version

# Usage gcc-ver := $(call cc-version, $(CC))

cc-version = $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-version.sh \

              $(if $(1), $(1), $(CC)))

cc-version = $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-version.sh $(CC))



# cc-ifversion

# Usage:  EXTRA_CFLAGS += $(call cc-ifversion, -lt, 0402, -O1)

scripts/Makefile.modpost

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ include scripts/Kbuild.include 
include scripts/Makefile.lib



kernelsymfile := $(objtree)/Module.symvers

modulesymfile := $(KBUILD_EXTMOD)/Modules.symvers

modulesymfile := $(KBUILD_EXTMOD)/Module.symvers



# Step 1), find all modules listed in $(MODVERDIR)/

__modules := $(sort $(shell grep -h '\.ko' /dev/null $(wildcard $(MODVERDIR)/*.mod)))