kbuild updates - that just missed -rc2 :-(
Subsystems (4)
PATCH 1/1 kbuild updates - that just missed -rc2 :-(
Hi Linus.
A few kbuild updates that I liked to have applied before -rc2 but too late.
Nothing earth shaking but the ubuntu fix for -fno-stack-protector would be good to see soon in mailline.
shortlog and full patch below.
Can be pulled from:
git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild.git
Sam [heading for 2 weeks non-internet vacation]
Dave Jones:
kbuild: fix typo in modpost
Matthew Wilcox:
kconfig: support DOS line endings
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
.gitignore | 1 + Makefile | 5 ++- drivers/scsi/aic7xxx/aicasm/Makefile | 2 + scripts/Makefile.modpost | 2 + scripts/kconfig/confdata.c | 10 ++++- scripts/mod/file2alias.c | 62 ++++++++++++++++++++++++---------- 6 files changed, 57 insertions(+), 25 deletions(-)
.gitignore +1 -0
@@ -30,6 +30,7 @@ include/config include/linux/autoconf.h include/linux/compile.h include/linux/version.h +include/linux/utsrelease.h # stgit generated dirs patches-*
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/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 +7 -3
@@ -193,8 +193,11 @@ load:continue ; *p++ =0 ; p2 =strchr (p,'\n' ); -if (p2) - *p2 =0 ; +if (p2) { + *p2-- =0 ; +if (*p2 =='\r' ) + *p2 =0 ; + }if (def ==S_DEF_USER ) { sym =sym_find (line +7 );if (!sym) {
@@ -266,6 +269,7 @@ load: ; }break ; +case '\r' :case '\n' :break ;default :
@@ -357,7 +361,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