lkml.org 
[lkml]   [2007]   [Jan]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 12/50] kbuild: dont put temp files in source
    -stable review patch.  If anyone has any objections, please let us know.
    ------------------

    From: Roman Zippel <zippel@linux-m68k.org>

    The as-instr/ld-option need to create temporary files, but create them in the
    output directory, when compiling external modules. Reformat them a bit and
    use $(CC) instead of $(AS) as the former is used by kbuild to assemble files.

    Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
    Cc: Andi Kleen <ak@suse.de>
    Cc: Jan Beulich <jbeulich@novell.com>
    Cc: Sam Ravnborg <sam@ravnborg.org>
    Cc: <jpdenheijer@gmail.com>
    Cc: Horst Schirmeier <horst@schirmeier.com>
    Cc: Daniel Drake <dsd@gentoo.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Chris Wright <chrisw@sous-sol.org>
    ---
    It fixes building of external modules in a sandboxed environment.
    http://bugs.gentoo.org/149307

    scripts/Kbuild.include | 19 ++++++++++++-------
    1 file changed, 12 insertions(+), 7 deletions(-)

    --- linux-2.6.19.1.orig/scripts/Kbuild.include
    +++ linux-2.6.19.1/scripts/Kbuild.include
    @@ -56,6 +56,9 @@ endef
    # gcc support functions
    # See documentation in Documentation/kbuild/makefiles.txt

    +# output directory for tests below
    +TMPOUT := $(if $(KBUILD_EXTMOD),$(firstword $(KBUILD_EXTMOD))/)
    +
    # as-option
    # Usage: cflags-y += $(call as-option, -Wa$(comma)-isa=foo,)

    @@ -66,9 +69,11 @@ as-option = $(shell if $(CC) $(CFLAGS) $
    # as-instr
    # Usage: cflags-y += $(call as-instr, instr, option1, option2)

    -as-instr = $(shell if echo -e "$(1)" | $(AS) >/dev/null 2>&1 -W -Z -o astest$$$$.out ; \
    - then echo "$(2)"; else echo "$(3)"; fi; \
    - rm -f astest$$$$.out)
    +as-instr = $(shell if echo -e "$(1)" | \
    + $(CC) $(AFLAGS) -c -xassembler - \
    + -o $(TMPOUT)astest$$$$.out > /dev/null 2>&1; \
    + then rm $(TMPOUT)astest$$$$.out; echo "$(2)"; \
    + else echo "$(3)"; fi)

    # cc-option
    # Usage: cflags-y += $(call cc-option, -march=winchip-c6, -march=i586)
    @@ -97,10 +102,10 @@ cc-ifversion = $(shell if [ $(call cc-ve

    # ld-option
    # Usage: ldflags += $(call ld-option, -Wl$(comma)--hash-style=both)
    -ld-option = $(shell if $(CC) $(1) \
    - -nostdlib -o ldtest$$$$.out -xc /dev/null \
    - > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi; \
    - rm -f ldtest$$$$.out)
    +ld-option = $(shell if $(CC) $(1) -nostdlib -xc /dev/null \
    + -o $(TMPOUT)ldtest$$$$.out > /dev/null 2>&1; \
    + then rm $(TMPOUT)ldtest$$$$.out; echo "$(1)"; \
    + else echo "$(2)"; fi)

    ###
    # Shorthand for $(Q)$(MAKE) -f scripts/Makefile.build obj=
    --
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-01-06 03:31    [W:5.984 / U:0.648 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site