Commit 1bf99477 authored by Linus Torvalds's avatar Linus Torvalds

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

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
  Don't clean bounds.h and asm-offsets.h
  kconfig: incorrect 'len' field initialisation ?
  kernel-doc: allow unnamed bit-fields
  kbuild: filter away debug symbols from kernel symbols
  Remove *.rej pattern from .gitignore
  MAINTAINERS: document names of new kbuild trees
  kbuild: disable modpost warnings for linkonce sections
  kbuild: escape meta characters in regular expression in make TAGS
parents 83e0c24a 7d3cc8b6
...@@ -54,6 +54,5 @@ series ...@@ -54,6 +54,5 @@ series
cscope.* cscope.*
*.orig *.orig
*.rej
*~ *~
\#*# \#*#
...@@ -96,5 +96,4 @@ missing-syscalls: scripts/checksyscalls.sh FORCE ...@@ -96,5 +96,4 @@ missing-syscalls: scripts/checksyscalls.sh FORCE
$(call cmd,syscalls) $(call cmd,syscalls)
# Delete all targets during make clean # Delete all targets during make clean
clean-files := $(addprefix $(objtree)/,$(targets)) clean-files := $(addprefix $(objtree)/,$(filter-out $(bounds-file) $(offsets-file),$(targets)))
...@@ -2329,7 +2329,8 @@ S: Maintained ...@@ -2329,7 +2329,8 @@ S: Maintained
KERNEL BUILD (kbuild: Makefile, scripts/Makefile.*) KERNEL BUILD (kbuild: Makefile, scripts/Makefile.*)
P: Sam Ravnborg P: Sam Ravnborg
M: sam@ravnborg.org M: sam@ravnborg.org
T: git kernel.org:/pub/scm/linux/kernel/git/sam/kbuild.git T: git kernel.org:/pub/scm/linux/kernel/git/sam/kbuild-next.git
T: git kernel.org:/pub/scm/linux/kernel/git/sam/kbuild-fixes.git
L: linux-kbuild@vger.kernel.org L: linux-kbuild@vger.kernel.org
S: Maintained S: Maintained
......
...@@ -1114,6 +1114,7 @@ MRPROPER_DIRS += include/config include2 usr/include ...@@ -1114,6 +1114,7 @@ MRPROPER_DIRS += include/config include2 usr/include
MRPROPER_FILES += .config .config.old include/asm .version .old_version \ MRPROPER_FILES += .config .config.old include/asm .version .old_version \
include/linux/autoconf.h include/linux/version.h \ include/linux/autoconf.h include/linux/version.h \
include/linux/utsrelease.h \ include/linux/utsrelease.h \
include/linux/bounds.h include/asm*/asm-offsets.h \
Module.symvers tags TAGS cscope* Module.symvers tags TAGS cscope*
# clean - Delete most, but leave enough to build external modules # clean - Delete most, but leave enough to build external modules
...@@ -1431,7 +1432,7 @@ define xtags ...@@ -1431,7 +1432,7 @@ define xtags
elif $1 --version 2>&1 | grep -iq emacs; then \ elif $1 --version 2>&1 | grep -iq emacs; then \
$(all-sources) | xargs $1 -a; \ $(all-sources) | xargs $1 -a; \
$(all-kconfigs) | xargs $1 -a \ $(all-kconfigs) | xargs $1 -a \
--regex='/^[ \t]*(menu|)config[ \t]+\([a-zA-Z0-9_]+\)/\2/'; \ --regex='/^[ \t]*\(\(menu\)*config\)[ \t]+\([a-zA-Z0-9_]+\)/\3/'; \
$(all-defconfigs) | xargs -r $1 -a \ $(all-defconfigs) | xargs -r $1 -a \
--regex='/^#?[ \t]?\(CONFIG_[a-zA-Z0-9_]+\)/\1/'; \ --regex='/^#?[ \t]?\(CONFIG_[a-zA-Z0-9_]+\)/\1/'; \
else \ else \
......
...@@ -108,6 +108,9 @@ static int read_symbol(FILE *in, struct sym_entry *s) ...@@ -108,6 +108,9 @@ static int read_symbol(FILE *in, struct sym_entry *s)
/* exclude also MIPS ELF local symbols ($L123 instead of .L123) */ /* exclude also MIPS ELF local symbols ($L123 instead of .L123) */
else if (str[0] == '$') else if (str[0] == '$')
return -1; return -1;
/* exclude debugging symbols */
else if (stype == 'N')
return -1;
/* include the type field in the symbol name, so that it gets /* include the type field in the symbol name, so that it gets
* compressed together */ * compressed together */
......
...@@ -77,7 +77,7 @@ struct gstr str_new(void) ...@@ -77,7 +77,7 @@ struct gstr str_new(void)
{ {
struct gstr gs; struct gstr gs;
gs.s = malloc(sizeof(char) * 64); gs.s = malloc(sizeof(char) * 64);
gs.len = 16; gs.len = 64;
strcpy(gs.s, "\0"); strcpy(gs.s, "\0");
return gs; return gs;
} }
......
...@@ -1556,7 +1556,9 @@ sub create_parameterlist($$$) { ...@@ -1556,7 +1556,9 @@ sub create_parameterlist($$$) {
push_parameter($2, "$type $1", $file); push_parameter($2, "$type $1", $file);
} }
elsif ($param =~ m/(.*?):(\d+)/) { elsif ($param =~ m/(.*?):(\d+)/) {
push_parameter($1, "$type:$2", $file) if ($type ne "") { # skip unnamed bit-fields
push_parameter($1, "$type:$2", $file)
}
} }
else { else {
push_parameter($param, $type, $file); push_parameter($param, $type, $file);
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
# For System.map filter away: # For System.map filter away:
# a - local absolute symbols # a - local absolute symbols
# U - undefined global symbols # U - undefined global symbols
# N - debugging symbols
# w - local weak symbols # w - local weak symbols
# readprofile starts reading symbols when _stext is found, and # readprofile starts reading symbols when _stext is found, and
...@@ -40,5 +41,5 @@ ...@@ -40,5 +41,5 @@
# so we just ignore them to let readprofile continue to work. # so we just ignore them to let readprofile continue to work.
# (At least sparc64 has __crc_ in the middle). # (At least sparc64 has __crc_ in the middle).
$NM -n $1 | grep -v '\( [aUw] \)\|\(__crc_\)\|\( \$[adt]\)' > $2 $NM -n $1 | grep -v '\( [aNUw] \)\|\(__crc_\)\|\( \$[adt]\)' > $2
...@@ -721,7 +721,7 @@ static int check_section(const char *modname, const char *sec) ...@@ -721,7 +721,7 @@ static int check_section(const char *modname, const char *sec)
/* consume all digits */ /* consume all digits */
while (*e && e != sec && isdigit(*e)) while (*e && e != sec && isdigit(*e))
e--; e--;
if (*e == '.') { if (*e == '.' && !strstr(sec, ".linkonce")) {
warn("%s (%s): unexpected section name.\n" warn("%s (%s): unexpected section name.\n"
"The (.[number]+) following section name are " "The (.[number]+) following section name are "
"ld generated and not expected.\n" "ld generated and not expected.\n"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment