aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-10-11 21:27:27 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-11 21:27:27 -0400
commitae3e4628287de0ab90545c14076657aeee38506b (patch)
treea846e66dc3fd31e093f2f0a3965534e2d299013f /scripts
parent5f76945a9c978b8b8bf8eb7fe3b17b9981240a97 (diff)
parent415c2c525fab214ab75413aadbc67b4ee9cf212e (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')
-rw-r--r--scripts/Makefile.modinst2
-rw-r--r--scripts/Makefile.modpost2
-rw-r--r--scripts/mod/modpost.c1
-rw-r--r--scripts/package/buildtar6
4 files changed, 6 insertions, 5 deletions
diff --git a/scripts/Makefile.modinst b/scripts/Makefile.modinst
index efa5d940e632..3d13d3a3edfe 100644
--- a/scripts/Makefile.modinst
+++ b/scripts/Makefile.modinst
@@ -9,7 +9,7 @@ include scripts/Kbuild.include
9 9
10# 10#
11 11
12__modules := $(sort $(shell grep -h '\.ko' /dev/null $(wildcard $(MODVERDIR)/*.mod))) 12__modules := $(sort $(shell grep -h '\.ko$$' /dev/null $(wildcard $(MODVERDIR)/*.mod)))
13modules := $(patsubst %.o,%.ko,$(wildcard $(__modules:.ko=.o))) 13modules := $(patsubst %.o,%.ko,$(wildcard $(__modules:.ko=.o)))
14 14
15PHONY += $(modules) 15PHONY += $(modules)
diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
index 08dce14f2dc8..a1cb0222ebe6 100644
--- a/scripts/Makefile.modpost
+++ b/scripts/Makefile.modpost
@@ -60,7 +60,7 @@ kernelsymfile := $(objtree)/Module.symvers
60modulesymfile := $(firstword $(KBUILD_EXTMOD))/Module.symvers 60modulesymfile := $(firstword $(KBUILD_EXTMOD))/Module.symvers
61 61
62# Step 1), find all modules listed in $(MODVERDIR)/ 62# Step 1), find all modules listed in $(MODVERDIR)/
63__modules := $(sort $(shell grep -h '\.ko' /dev/null $(wildcard $(MODVERDIR)/*.mod))) 63__modules := $(sort $(shell grep -h '\.ko$$' /dev/null $(wildcard $(MODVERDIR)/*.mod)))
64modules := $(patsubst %.o,%.ko, $(wildcard $(__modules:.ko=.o))) 64modules := $(patsubst %.o,%.ko, $(wildcard $(__modules:.ko=.o)))
65 65
66# Stop after building .o files if NOFINAL is set. Makes compile tests quicker 66# Stop after building .o files if NOFINAL is set. Makes compile tests quicker
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*",
diff --git a/scripts/package/buildtar b/scripts/package/buildtar
index d0d748e72915..62d8234f8787 100644
--- a/scripts/package/buildtar
+++ b/scripts/package/buildtar
@@ -28,15 +28,15 @@ case "${1}" in
28 file_ext="" 28 file_ext=""
29 ;; 29 ;;
30 targz-pkg) 30 targz-pkg)
31 compress="gzip -c9" 31 compress="gzip"
32 file_ext=".gz" 32 file_ext=".gz"
33 ;; 33 ;;
34 tarbz2-pkg) 34 tarbz2-pkg)
35 compress="bzip2 -c9" 35 compress="bzip2"
36 file_ext=".bz2" 36 file_ext=".bz2"
37 ;; 37 ;;
38 tarxz-pkg) 38 tarxz-pkg)
39 compress="xz -c9" 39 compress="xz"
40 file_ext=".xz" 40 file_ext=".xz"
41 ;; 41 ;;
42 *) 42 *)