kbuild fixes
Subsystems (4)
PATCH 1/1 kbuild fixes
Hi Linus.
Following is a minimum set of kbuild fixes for 2.6.18. The other kbuild patches previously sent is now queued for 2.6.19. All patches below has been in -mm for a while.
Please apply.
git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-2.6.18.git
Shotlog, diffstat and diff all inline.
Sam
Dave Jones:
kbuild: fix typo in modpost
Qi Yong:
gitignore: gitignore quilt's files
Roman Zippel:
kconfig: correct oldconfig for unset choice options
Sam Ravnborg:
kbuild: hardcode value of YACC&LEX for aic7-triple-x
kbuild: version.h and new headers_* targets does not require a kernel config
kbuild: .gitignore utsrelease.h
kbuild: improve error from file2alias
kbuild: -fno-stack-protector is not good
kbuild: always use $(CC) for $(call cc-version)
.gitignore | 5 +++ Makefile | 5 ++- drivers/scsi/aic7xxx/aicasm/Makefile | 2 + scripts/Kbuild.include | 3 +- scripts/Makefile.modpost | 2 + scripts/kconfig/confdata.c | 2 + scripts/mod/file2alias.c | 62 ++++++++++++++++++++++++---------- 7 files changed, 56 insertions(+), 25 deletions(-)
.gitignore +5 -0
@@ -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
@@ -310,8 +310,8 @@ CPPFLAGS := -D__KERNEL__ $(LINUXI 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 @@ # of make so .config is not included in 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
@@ -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
@@ -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
@@ -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)))
scripts/kconfig/confdata.c +1 -1
@@ -357,7 +357,7 @@ int conf_read(const char *name)for (e = prop->expr; e; e = e->left.expr)if (e->right.sym->visible != no) flags &= e->right.sym->flags; - sym->flags |= flags &SYMBOL_DEF_USER ; + sym->flags &= flags | ~SYMBOL_DEF_USER ; } sym_change_count += conf_warnings || conf_unsaved;
scripts/mod/file2alias.c +43 -19
115 lines not on this page · raw message