kbuild
Subsystems (3)
Hi Linus.
kbuild stuff where the majority of the patch is Documentation updates.
The most controversial part is the addition of a flag to discard local symbols from vmlinux.
The patch has been in my inbox for a while but I had just not got around to it until now. It came in via Andrew so I expect it has been in -nect for a while.
This pull also add support for destination-y in header export files. This is not a fix but a few people has asked for this feature and they cannot use it until it is present.
The rest is assorted set of fixes as the shortlog below tells.
Please pull.
Sam
The following changes since commit d848223808c5d21e1b3cea090047e34722c6254b:
Linus Torvalds (1):
Merge git://git.kernel.org/.../dhowells/linux-2.6-mn10300
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes.git master
David Howells (1):
kbuild: make it possible for the linker to discard local symbols from vmlinux
Jan Beulich (1):
kbuild: remove pointless strdup() on arguments passed to new_module() in modpost
Kirill Smelkov (1):
kbuild: fix a few typos in top-level Makefile
Maxime Bizon (1):
kbuild: fix spurious initramfs rebuild
Peter Korsgaard (1):
kbuild: use git svn instead of git-svn in setlocalversion
Randy Dunlap (1):
docbook: make cleandocs
Sam Ravnborg (3):
kconfig: fix update-po-config to accect backslash in input
kbuild: introduce destination-y for exported headers
Documentation: explain the difference between __bitwise and __bitwise__
Uwe Kleine-König (1):
kbuild: fix option processing for -I in headerdep
Documentation/DocBook/Makefile | 11 +++- Documentation/kbuild/makefiles.txt | 83 ++++++++++++++++++++++++++++++++--- Documentation/sparse.txt | 8 +++ Makefile | 8 +++- init/Kconfig | 8 +++ scripts/Makefile.headersinst | 2 + scripts/gen_initramfs_list.sh | 2 +- scripts/headerdep.pl | 2 +- scripts/kconfig/kxgettext.c | 4 ++ scripts/mod/modpost.c | 4 +- scripts/setlocalversion | 2 +- 11 files changed, 116 insertions(+), 18 deletions(-)
Documentation/DocBook/Makefile +8 -3
@@ -31,7 +31,7 @@ PS_METHOD = $(prefer-db2x) ### # The targets that may be used. -PHONY += xmldocs sgmldocs psdocs pdfdocs htmldocs mandocs installmandocs +PHONY += xmldocs sgmldocs psdocs pdfdocs htmldocs mandocs installmandocs cleandocs BOOKS := $(addprefix $(obj)/,$(DOCBOOKS)) xmldocs: $(BOOKS)
@@ -213,11 +213,12 @@ silent_gen_xml = : dochelp: @echo ' Linux kernel internal documentation in different formats:' @echo ' htmldocs - HTML' - @echo ' installmandocs - install man pages generated by mandocs' - @echo ' mandocs - man pages' @echo ' pdfdocs - PDF' @echo ' psdocs - Postscript' @echo ' xmldocs - XML DocBook' + @echo ' mandocs - man pages' + @echo ' installmandocs - install man pages generated by mandocs' + @echo ' cleandocs - clean all generated DocBook files' ### # Temporary files left by various tools
@@ -235,6 +236,10 @@ clean-files := $(DOCBOOKS) \ clean-dirs := $(patsubst %.xml,%,$(DOCBOOKS)) man +cleandocs: + $(Q)rm -f $(call objectify, $(clean-files)) + $(Q)rm -rf $(call objectify, $(clean-dirs)) + # Declare the contents of the .PHONY variable as phony. We keep that # information in a variable se we can use it in if_changed and friends.
Documentation/kbuild/makefiles.txt +75 -8
114 lines not on this page · raw message
Documentation/sparse.txt +8 -0
@@ -42,6 +42,14 @@ sure that bitwise types don't get mixed up (little-endian vs big-endian vs cpu-endian vs whatever), and there the constant "0" really _is_ special. +__bitwise__ - to be used for relatively compact stuff (gfp_t, etc.) that +is mostly warning-free and is supposed to stay that way. Warnings will +be generated without __CHECK_ENDIAN__. + +__bitwise - noisy stuff; in particular, __le*/__be* are that. We really +don't want to drown in noise unless we'd explicitly asked for it. + + Getting sparse ~~~~~~~~~~~~~~
Makefile +6 -2
@@ -567,7 +567,7 @@ KBUILD_CFLAGS += $(call cc-option,-Wdeclaration-after-statement,) # disable pointer signed / unsigned warnings in gcc 4.0 KBUILD_CFLAGS += $(call cc-option,-Wno-pointer-sign,) -# disable invalid "can't wrap" optimzations for signed / pointers +# disable invalid "can't wrap" optimizations for signed / pointers KBUILD_CFLAGS += $(call cc-option,-fwrapv) # revert to pre-gcc-4.4 behaviour of .eh_frame
@@ -597,6 +597,10 @@ LDFLAGS_BUILD_ID = $(patsubst -Wl$(comma)%,%,\ LDFLAGS_MODULE += $(LDFLAGS_BUILD_ID) LDFLAGS_vmlinux += $(LDFLAGS_BUILD_ID) +ifeq ($(CONFIG_STRIP_ASM_SYMS),y) +LDFLAGS_vmlinux += -X +endif + # Default kernel image to build when no specific target is given. # KBUILD_IMAGE may be overruled on the command line or # set in the environment
@@ -1587,5 +1591,5 @@ PHONY += FORCE FORCE: # Declare the contents of the .PHONY variable as phony. We keep that -# information in a variable se we can use it in if_changed and friends. +# information in a variable so we can use it in if_changed and friends. .PHONY: $(PHONY)
init/Kconfig +8 -0
@@ -808,6 +808,14 @@ config KALLSYMS_EXTRA_PASS you wait for kallsyms to be fixed. +config STRIP_ASM_SYMS + bool "Strip assembler-generated symbols during link" + default n + help + Strip internal assembler-generated symbols during a link (symbols + that look like '.Lxxx') so they don't pollute the output of + get_wchan() and suchlike. + config HOTPLUG bool "Support for hot-pluggable devices" if EMBEDDED default y
scripts/Makefile.headersinst +2 -0
@@ -14,6 +14,8 @@ _dst := $(if $(dst),$(dst),$(obj)) kbuild-file := $(srctree)/$(obj)/Kbuild include $(kbuild-file) +_dst := $(if $(destination-y),$(destination-y),$(_dst)) + include scripts/Kbuild.include install := $(INSTALL_HDR_PATH)/$(_dst)
scripts/gen_initramfs_list.sh +1 -1
@@ -97,7 +97,7 @@ print_mtime() { } list_parse() { - echo "$1 \\" + [ ! -L "$1" ] && echo "$1 \\" || : } # for each file print a line in following format
scripts/headerdep.pl +1 -1
@@ -19,7 +19,7 @@ my $opt_graph; version => \&version, all => \$opt_all, - I => \@opt_include, + "I=s" => \@opt_include, graph => \$opt_graph, );
scripts/kconfig/kxgettext.c +4 -0
@@ -43,6 +43,10 @@ static char *escape(const char* text, char *bf, int len) ++text; goto next; } +else if (*text =='\\' ) { + *bfp++ ='\\' ; + len--; + } *bfp++ = *text++; next: --len;
scripts/mod/modpost.c +2 -2
@@ -1913,7 +1913,7 @@ static void read_dump(const char *fname, unsigned int kernel)if (!mod) {if (is_vmlinux (modname)) have_vmlinux =1 ; - mod =new_module (NOFAIL (strdup (modname))); + mod =new_module (modname); mod->skip =1 ; } s =sym_add_exported (symname, mod,export_no (export));
@@ -1997,7 +1997,7 @@ static void read_markers(const char *fname) mod =find_module (modname);if (!mod) { - mod =new_module (NOFAIL (strdup (modname))); + mod =new_module (modname); mod->skip =1 ; }if (is_vmlinux (modname)) {
scripts/setlocalversion +1 -1
@@ -21,7 +21,7 @@ if head=`git rev-parse --verify --short HEAD 2>/dev/null`; then # Is this git on svn? if git config --get svn-remote.svn.url >/dev/null; then - printf -- '-svn%s' "`git-svn find-rev $head`" + printf -- '-svn%s' "`git svn find-rev $head`" fi # Are there uncommitted changes?