History

Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: kbuild: make KBUILD_NOCMDDEP=1 handle empty built-in.o scripts/kallsyms.c: fix potential segfault scripts/gen_initramfs_list.sh: Convert to a /bin/sh script kbuild: Fix GNU make v3.80 compatibility kbuild: Fix passing -Wno-* options to gcc 4.4+ kbuild: move scripts/basic/docproc.c to scripts/docproc.c kbuild: Fix Makefile.asm-generic for um kbuild: Allow to combine multiple W= levels kbuild: Disable -Wunused-but-set-variable for gcc 4.6.0 Fix handling of backlash character in LINUX_COMPILE_BY name kbuild: asm-generic support kbuild: implement several W= levels kbuild: Fix build with binutils <= 2.19 initramfs: Use KBUILD_BUILD_TIMESTAMP for generated entries kbuild: Allow to override LINUX_COMPILE_BY and LINUX_COMPILE_HOST macros kbuild: Drop unused LINUX_COMPILE_TIME and LINUX_COMPILE_DOMAIN macros kbuild: Use the deterministic mode of ar kbuild: Call gzip with -n kbuild: move KALLSYMS_EXTRA_PASS from Kconfig to Makefile Kconfig: improve KALLSYMS_ALL documentation Fix up trivial conflict in Makefile

Linus Torvalds committed 15 years ago

Commit 2bb732c2 parents f50d1d9 c4d5ee120 files · +287 −108Browse files

Showing the changes to scripts (13 of 20 files). Show all

Unified · Split

13 files
  1. scripts/.gitignore +1 −0
  2. scripts/Kbuild.include +12 −0
  3. scripts/Makefile +5 −2
  4. scripts/Makefile.asm-generic +23 −0
  5. scripts/Makefile.build +45 −29
  6. scripts/Makefile.headersinst +9 −1
  7. scripts/Makefile.lib +1 −1
  8. scripts/basic/.gitignore +0 −2
  9. scripts/basic/Makefile +1 −2
  10. scripts/docproc.c +0 −0
  11. scripts/gen_initramfs_list.sh +17 −10
  12. scripts/kallsyms.c +2 −0
  13. scripts/mkcompile_h +14 −16
scripts/.gitignore+1−0
@@ -8,3 +8,4 @@ bin2c · 7 unmodified lines
88 unifdef
99 ihex2fw
1010 recordmcount
11+docproc
scripts/Kbuild.include+12−0
@@ -118,6 +118,11 @@ cc-option-yn = $(call try-run,\ · 117 unmodified lines
118118 cc-option-align = $(subst -functions=0,,\
119119 $(call cc-option,-falign-functions=0,-malign-functions=0))
120120
121+# cc-disable-warning
122+# Usage: cflags-y += $(call cc-disable-warning,unused-but-set-variable)
123+cc-disable-warning = $(call try-run,\
124+ $(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) -W$(strip $(1)) -c -xc /dev/null -o "$$TMP",-Wno-$(strip $(1)))
125+
121126 # cc-version
122127 # Usage gcc-ver := $(call cc-version)
123128 cc-version = $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-version.sh $(CC))
@@ -141,6 +146,11 @@ cc-ldoption = $(call try-run,\ · 17 unmodified lines
141146 ld-option = $(call try-run,\
142147 $(CC) /dev/null -c -o "$$TMPO" ; $(LD) $(1) "$$TMPO" -o "$$TMP",$(1),$(2))
143148
149+# ar-option
150+# Usage: KBUILD_ARFLAGS := $(call ar-option,D)
151+# Important: no spaces around options
152+ar-option = $(call try-run, $(AR) rc$(1) "$$TMP",$(1),$(2))
153+
144154 ######
145155
146156 ###
@@ -187,6 +197,8 @@ ifneq ($(KBUILD_NOCMDDEP),1) · 40 unmodified lines
187197 # User may override this check using make KBUILD_NOCMDDEP=1
188198 arg-check = $(strip $(filter-out $(cmd_$(1)), $(cmd_$@)) \
189199 $(filter-out $(cmd_$@), $(cmd_$(1))) )
200+else
201+arg-check = $(if $(strip $(cmd_$@)),,1)
190202 endif
191203
192204 # >'< substitution is for echo to work,
scripts/Makefile+5−2
@@ -6,6 +6,7 @@ · 5 unmodified lines
66 # pnmttologo: Convert pnm files to logo files
77 # conmakehash: Create chartable
88 # conmakehash: Create arrays for initializing the kernel console tables
9+# docproc: Used in Documentation/DocBook
910
1011 hostprogs-$(CONFIG_KALLSYMS) += kallsyms
1112 hostprogs-$(CONFIG_LOGO) += pnmtologo
@@ -16,12 +17,14 @@ hostprogs-$(BUILD_C_RECORDMCOUNT) += recordmcount · 4 unmodified lines
1617 always := $(hostprogs-y) $(hostprogs-m)
1718
1819 # The following hostprogs-y programs are only build on demand
19−hostprogs-y += unifdef
20+hostprogs-y += unifdef docproc
2021
21−# This target is used internally to avoid "is up to date" messages
22+# These targets are used internally to avoid "is up to date" messages
2223 PHONY += build_unifdef
2324 build_unifdef: scripts/unifdef FORCE
2425 @:
26+build_docproc: scripts/docproc FORCE
27+ @:
2528
2629 subdir-$(CONFIG_MODVERSIONS) += genksyms
2730 subdir-y += mod
scripts/Makefile.asm-generic+23−0
@@ -0,0 +1,23 @@
1+# include/asm-generic contains a lot of files that are used
2+# verbatim by several architectures.
3+#
4+# This Makefile reads the file arch/$(SRCARCH)/include/asm/Kbuild
5+# and for each file listed in this file with generic-y creates
6+# a small wrapper file in $(obj) (arch/$(SRCARCH)/include/generated/asm)
7+
8+kbuild-file := $(srctree)/arch/$(SRCARCH)/include/asm/Kbuild
9+-include $(kbuild-file)
10+
11+include scripts/Kbuild.include
12+
13+# Create output directory if not already present
14+_dummy := $(shell [ -d $(obj) ] || mkdir -p $(obj))
15+
16+quiet_cmd_wrap = WRAP $@
17+cmd_wrap = echo "\#include <asm-generic/$*.h>" >$@
18+
19+all: $(patsubst %, $(obj)/%, $(generic-y))
20+
21+$(obj)/%.h:
22+ $(call cmd,wrap)
23+
scripts/Makefile.build+45−29
@@ -51,36 +51,52 @@ ifeq ($(KBUILD_NOPEDANTIC),) · 50 unmodified lines
5151 endif
5252
5353 #
54−# make W=1 settings
54+# make W=... settings
5555 #
56−# $(call cc-option... ) handles gcc -W.. options which
56+# W=1 - warnings that may be relevant and does not occur too often
57+# W=2 - warnings that occur quite often but may still be relevant
58+# W=3 - the more obscure warnings, can most likely be ignored
59+#
60+# $(call cc-option, -W...) handles gcc -W.. options which
5761 # are not supported by all versions of the compiler
5862 ifdef KBUILD_ENABLE_EXTRA_GCC_CHECKS
59−KBUILD_EXTRA_WARNINGS := -Wextra
60−KBUILD_EXTRA_WARNINGS += -Wunused -Wno-unused-parameter
61−KBUILD_EXTRA_WARNINGS += -Waggregate-return
62−KBUILD_EXTRA_WARNINGS += -Wbad-function-cast
63−KBUILD_EXTRA_WARNINGS += -Wcast-qual
64−KBUILD_EXTRA_WARNINGS += -Wcast-align
65−KBUILD_EXTRA_WARNINGS += -Wconversion
66−KBUILD_EXTRA_WARNINGS += -Wdisabled-optimization
67−KBUILD_EXTRA_WARNINGS += -Wlogical-op
68−KBUILD_EXTRA_WARNINGS += -Wmissing-declarations
69−KBUILD_EXTRA_WARNINGS += -Wmissing-format-attribute
70−KBUILD_EXTRA_WARNINGS += $(call cc-option, -Wmissing-include-dirs,)
71−KBUILD_EXTRA_WARNINGS += -Wmissing-prototypes
72−KBUILD_EXTRA_WARNINGS += -Wnested-externs
73−KBUILD_EXTRA_WARNINGS += -Wold-style-definition
74−KBUILD_EXTRA_WARNINGS += $(call cc-option, -Woverlength-strings,)
75−KBUILD_EXTRA_WARNINGS += -Wpacked
76−KBUILD_EXTRA_WARNINGS += -Wpacked-bitfield-compat
77−KBUILD_EXTRA_WARNINGS += -Wpadded
78−KBUILD_EXTRA_WARNINGS += -Wpointer-arith
79−KBUILD_EXTRA_WARNINGS += -Wredundant-decls
80−KBUILD_EXTRA_WARNINGS += -Wshadow
81−KBUILD_EXTRA_WARNINGS += -Wswitch-default
82−KBUILD_EXTRA_WARNINGS += $(call cc-option, -Wvla,)
83−KBUILD_CFLAGS += $(KBUILD_EXTRA_WARNINGS)
63+warning- := $(empty)
64+
65+warning-1 := -Wextra -Wunused -Wno-unused-parameter
66+warning-1 += -Wmissing-declarations
67+warning-1 += -Wmissing-format-attribute
68+warning-1 += -Wmissing-prototypes
69+warning-1 += -Wold-style-definition
70+warning-1 += $(call cc-option, -Wmissing-include-dirs)
71+warning-1 += $(call cc-option, -Wunused-but-set-variable)
72+
73+warning-2 := -Waggregate-return
74+warning-2 += -Wcast-align
75+warning-2 += -Wdisabled-optimization
76+warning-2 += -Wnested-externs
77+warning-2 += -Wshadow
78+warning-2 += $(call cc-option, -Wlogical-op)
79+
80+warning-3 := -Wbad-function-cast
81+warning-3 += -Wcast-qual
82+warning-3 += -Wconversion
83+warning-3 += -Wpacked
84+warning-3 += -Wpadded
85+warning-3 += -Wpointer-arith
86+warning-3 += -Wredundant-decls
87+warning-3 += -Wswitch-default
88+warning-3 += $(call cc-option, -Wpacked-bitfield-compat)
89+warning-3 += $(call cc-option, -Wvla)
90+
91+warning := $(warning-$(findstring 1, $(KBUILD_ENABLE_EXTRA_GCC_CHECKS)))
92+warning += $(warning-$(findstring 2, $(KBUILD_ENABLE_EXTRA_GCC_CHECKS)))
93+warning += $(warning-$(findstring 3, $(KBUILD_ENABLE_EXTRA_GCC_CHECKS)))
94+
95+ifeq ("$(strip $(warning))","")
96+ $(error W=$(KBUILD_ENABLE_EXTRA_GCC_CHECKS) is unknown)
97+endif
98+
99+KBUILD_CFLAGS += $(warning)
84100 endif
85101
86102 include scripts/Makefile.lib
@@ -351,7 +367,7 @@ quiet_cmd_link_o_target = LD $@ · 264 unmodified lines
351367 cmd_link_o_target = $(if $(strip $(obj-y)),\
352368 $(LD) $(ld_flags) -r -o $@ $(filter $(obj-y), $^) \
353369 $(cmd_secanalysis),\
354− rm -f $@; $(AR) rcs $@)
370+ rm -f $@; $(AR) rcs$(KBUILD_ARFLAGS) $@)
355371
356372 $(builtin-target): $(obj-y) FORCE
357373 $(call if_changed,link_o_target)
@@ -377,7 +393,7 @@ $(modorder-target): $(subdir-ym) FORCE · 19 unmodified lines
377393 #
378394 ifdef lib-target
379395 quiet_cmd_link_l_target = AR $@
380−cmd_link_l_target = rm -f $@; $(AR) rcs $@ $(lib-y)
396+cmd_link_l_target = rm -f $@; $(AR) rcs$(KBUILD_ARFLAGS) $@ $(lib-y)
381397
382398 $(lib-target): $(lib-y) FORCE
383399 $(call if_changed,link_l_target)
scripts/Makefile.headersinst+9−1
@@ -27,8 +27,13 @@ header-y := $(filter-out %/, $(header-y)) · 26 unmodified lines
2727 install-file := $(install)/.install
2828 check-file := $(install)/.check
2929
30+# generic-y list all files an architecture uses from asm-generic
31+# Use this to build a list of headers which require a wrapper
32+wrapper-files := $(filter $(header-y), $(generic-y))
33+
3034 # all headers files for this dir
31−all-files := $(header-y) $(objhdr-y)
35+header-y := $(filter-out $(generic-y), $(header-y))
36+all-files := $(header-y) $(objhdr-y) $(wrapper-files)
3237 input-files := $(addprefix $(srctree)/$(obj)/,$(header-y)) \
3338 $(addprefix $(objtree)/$(obj)/,$(objhdr-y))
3439 output-files := $(addprefix $(install)/, $(all-files))
@@ -47,6 +52,9 @@ quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ · 12 unmodified lines
4752 cmd_install = \
4853 $(PERL) $< $(srctree)/$(obj) $(install) $(SRCARCH) $(header-y); \
4954 $(PERL) $< $(objtree)/$(obj) $(install) $(SRCARCH) $(objhdr-y); \
55+ for F in $(wrapper-files); do \
56+ echo "\#include <asm-generic/$$F>" > $(install)/$$F; \
57+ done; \
5058 touch $@
5159
5260 quiet_cmd_remove = REMOVE $(unwanted)
scripts/Makefile.lib+1−1
@@ -197,7 +197,7 @@ cmd_objcopy = $(OBJCOPY) $(OBJCOPYFLAGS) $(OBJCOPYFLAGS_$(@F)) $< $@ · 196 unmodified lines
197197 # ---------------------------------------------------------------------------
198198
199199 quiet_cmd_gzip = GZIP $@
200−cmd_gzip = (cat $(filter-out FORCE,$^) | gzip -f -9 > $@) || \
200+cmd_gzip = (cat $(filter-out FORCE,$^) | gzip -n -f -9 > $@) || \
201201 (rm -f $@ ; false)
202202
203203 # DTC
scripts/basic/.gitignore+0−2
@@ -1,3 +1 @@
1−hash
21 fixdep
3−docproc
scripts/basic/Makefile+1−2
@@ -7,9 +7,8 @@ · 6 unmodified lines
77 # .config is included by main Makefile.
88 # ---------------------------------------------------------------------------
99 # fixdep: Used to generate dependency information during build process
10−# docproc: Used in Documentation/DocBook
1110
12−hostprogs-y := fixdep docproc
11+hostprogs-y := fixdep
1312 always := $(hostprogs-y)
1413
1514 # fixdep is needed to compile other host programs
scripts/docproc.crenamed from scripts/basic/docproc.c+0−0

File renamed without changes.

scripts/gen_initramfs_list.sh+17−10
@@ -1,4 +1,4 @@
1−#!/bin/bash
1+#!/bin/sh
22 # Copyright (C) Martin Schlemmer <azarah@nosferatu.za.org>
33 # Copyright (C) 2006 Sam Ravnborg <sam@ravnborg.org>
44 #
@@ -105,9 +105,9 @@ list_parse() { · 100 unmodified lines
105105 # for links, devices etc the format differs. See gen_init_cpio for details
106106 parse() {
107107 local location="$1"
108− local name="${location/${srcdir}//}"
108+ local name="/${location#${srcdir}}"
109109 # change '//' into '/'
110− name="${name//\/\///}"
110+ name=$(echo "$name" | sed -e 's://*:/:g')
111111 local mode="$2"
112112 local uid="$3"
113113 local gid="$4"
@@ -117,8 +117,8 @@ parse() { · 3 unmodified lines
117117 [ "$root_gid" = "squash" ] && gid=0 || [ "$gid" -eq "$root_gid" ] && gid=0
118118 local str="${mode} ${uid} ${gid}"
119119
120− [ "${ftype}" == "invalid" ] && return 0
121− [ "${location}" == "${srcdir}" ] && return 0
120+ [ "${ftype}" = "invalid" ] && return 0
121+ [ "${location}" = "${srcdir}" ] && return 0
122122
123123 case "${ftype}" in
124124 "file")
@@ -192,7 +192,7 @@ input_file() { · 67 unmodified lines
192192 if [ -f "$1" ]; then
193193 ${dep_list}header "$1"
194194 is_cpio="$(echo "$1" | sed 's/^.*\.cpio\(\..*\)\?/cpio/')"
195− if [ $2 -eq 0 -a ${is_cpio} == "cpio" ]; then
195+ if [ $2 -eq 0 -a ${is_cpio} = "cpio" ]; then
196196 cpio_file=$1
197197 echo "$1" | grep -q '^.*\.cpio\..*' && is_cpio_compressed="compressed"
198198 [ ! -z ${dep_list} ] && echo "$1"
@@ -204,7 +204,7 @@ input_file() { · 5 unmodified lines
204204 else
205205 echo "$1 \\"
206206 cat "$1" | while read type dir file perm ; do
207− if [ "$type" == "file" ]; then
207+ if [ "$type" = "file" ]; then
208208 echo "$file \\";
209209 fi
210210 done
@@ -226,7 +226,7 @@ cpio_list= · 15 unmodified lines
226226 output="/dev/stdout"
227227 output_file=""
228228 is_cpio_compressed=
229−compr="gzip -9 -f"
229+compr="gzip -n -9 -f"
230230
231231 arg="$1"
232232 case "$arg" in
@@ -240,7 +240,7 @@ case "$arg" in · 7 unmodified lines
240240 output_file="$1"
241241 cpio_list="$(mktemp ${TMPDIR:-/tmp}/cpiolist.XXXXXX)"
242242 output=${cpio_list}
243− echo "$output_file" | grep -q "\.gz$" && compr="gzip -9 -f"
243+ echo "$output_file" | grep -q "\.gz$" && compr="gzip -n -9 -f"
244244 echo "$output_file" | grep -q "\.bz2$" && compr="bzip2 -9 -f"
245245 echo "$output_file" | grep -q "\.lzma$" && compr="lzma -9 -f"
246246 echo "$output_file" | grep -q "\.xz$" && \
@@ -287,8 +287,15 @@ done · 40 unmodified lines
287287 # we are careful to delete tmp files
288288 if [ ! -z ${output_file} ]; then
289289 if [ -z ${cpio_file} ]; then
290+ timestamp=
291+ if test -n "$KBUILD_BUILD_TIMESTAMP"; then
292+ timestamp="$(date -d"$KBUILD_BUILD_TIMESTAMP" +%s || :)"
293+ if test -n "$timestamp"; then
294+ timestamp="-t $timestamp"
295+ fi
296+ fi
290297 cpio_tfile="$(mktemp ${TMPDIR:-/tmp}/cpiofile.XXXXXX)"
291− usr/gen_init_cpio ${cpio_list} > ${cpio_tfile}
298+ usr/gen_init_cpio $timestamp ${cpio_list} > ${cpio_tfile}
292299 else
293300 cpio_tfile=${cpio_file}
294301 fi
scripts/kallsyms.c+2−0
@@ -500,6 +500,8 @@ static void optimize_result(void) · 499 unmodified lines
500500
501501 /* find the token with the breates profit value */
502502 best = find_best_token();
503+ if (token_profit[best] == 0)
504+ break;
503505
504506 /* place it in the "best" table */
505507 best_table_len[i] = 2;
scripts/mkcompile_h+14−16
@@ -42,6 +42,16 @@ if [ -z "$KBUILD_BUILD_TIMESTAMP" ]; then · 41 unmodified lines
4242 else
4343 TIMESTAMP=$KBUILD_BUILD_TIMESTAMP
4444 fi
45+if test -z "$KBUILD_BUILD_USER"; then
46+ LINUX_COMPILE_BY=$(whoami | sed 's/\\/\\\\/')
47+else
48+ LINUX_COMPILE_BY=$KBUILD_BUILD_USER
49+fi
50+if test -z "$KBUILD_BUILD_HOST"; then
51+ LINUX_COMPILE_HOST=`hostname`
52+else
53+ LINUX_COMPILE_HOST=$KBUILD_BUILD_HOST
54+fi
4555
4656 UTS_VERSION="#$VERSION"
4757 CONFIG_FLAGS=""
@@ -63,20 +73,8 @@ UTS_TRUNCATE="cut -b -$UTS_LEN" · 15 unmodified lines
6373
6474 echo \#define UTS_VERSION \"`echo $UTS_VERSION | $UTS_TRUNCATE`\"
6575
66− echo \#define LINUX_COMPILE_TIME \"`date +%T`\"
67− echo \#define LINUX_COMPILE_BY \"`whoami`\"
68− echo \#define LINUX_COMPILE_HOST \"`hostname | $UTS_TRUNCATE`\"
69−
70− domain=`dnsdomainname 2> /dev/null`
71− if [ -z "$domain" ]; then
72− domain=`domainname 2> /dev/null`
73− fi
74−
75− if [ -n "$domain" ]; then
76− echo \#define LINUX_COMPILE_DOMAIN \"`echo $domain | $UTS_TRUNCATE`\"
77− else
78− echo \#define LINUX_COMPILE_DOMAIN
79− fi
76+ echo \#define LINUX_COMPILE_BY \"`echo $LINUX_COMPILE_BY | $UTS_TRUNCATE`\"
77+ echo \#define LINUX_COMPILE_HOST \"`echo $LINUX_COMPILE_HOST | $UTS_TRUNCATE`\"
8078
8179 echo \#define LINUX_COMPILER \"`$CC -v 2>&1 | tail -n 1`\"
8280 ) > .tmpcompile
@@ -91,8 +89,8 @@ UTS_TRUNCATE="cut -b -$UTS_LEN" · 8 unmodified lines
9189 # first line.
9290
9391 if [ -r $TARGET ] && \
94− grep -v 'UTS_VERSION\|LINUX_COMPILE_TIME' $TARGET > .tmpver.1 && \
95− grep -v 'UTS_VERSION\|LINUX_COMPILE_TIME' .tmpcompile > .tmpver.2 && \
92+ grep -v 'UTS_VERSION' $TARGET > .tmpver.1 && \
93+ grep -v 'UTS_VERSION' .tmpcompile > .tmpver.2 && \
9694 cmp -s .tmpver.1 .tmpver.2; then
9795 rm -f .tmpcompile
9896 else