diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-11 21:27:27 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-11 21:27:27 -0400 |
commit | ae3e4628287de0ab90545c14076657aeee38506b (patch) | |
tree | a846e66dc3fd31e093f2f0a3965534e2d299013f /scripts/mod | |
parent | 5f76945a9c978b8b8bf8eb7fe3b17b9981240a97 (diff) | |
parent | 415c2c525fab214ab75413aadbc67b4ee9cf212e (diff) |
Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull kbuild changes from Michal Marek:
"The main part of kbuild for v3.7 contains:
- Fix for scripts/Makefile.modpost to not choke on a '.ko' substring
in the build directory path
- Two warning fixes (modpost and main Makefile)
- __compiletime_error works also with gcc 4.3
- make tar{gz,bz2,xz}-pkg uses default compression settings instead
of saving as many bytes as possible (this should actually be in the
misc branch, I don't know why I applied it here)."
* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
compiler-gcc4.h: correct verion check for __compiletime_error
modpost: Permit .GCC.command.line sections
Kbuild: use normal compression settings for tar*-pkg
scripts/Makefile.modpost: error in finding modules from .mod files.
kbuild: Remove useless warning while appending KCFLAGS
Diffstat (limited to 'scripts/mod')
-rw-r--r-- | scripts/mod/modpost.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 00f7512a217f..0d93856a03f4 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c | |||
@@ -821,6 +821,7 @@ static const char *section_white_list[] = | |||
821 | ".debug*", | 821 | ".debug*", |
822 | ".zdebug*", /* Compressed debug sections. */ | 822 | ".zdebug*", /* Compressed debug sections. */ |
823 | ".GCC-command-line", /* mn10300 */ | 823 | ".GCC-command-line", /* mn10300 */ |
824 | ".GCC.command.line", /* record-gcc-switches, non mn10300 */ | ||
824 | ".mdebug*", /* alpha, score, mips etc. */ | 825 | ".mdebug*", /* alpha, score, mips etc. */ |
825 | ".pdr", /* alpha, score, mips etc. */ | 826 | ".pdr", /* alpha, score, mips etc. */ |
826 | ".stab*", | 827 | ".stab*", |