lkml.org 
[lkml]   [2011]   [Apr]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[34-longterm 177/209] x86, gcc-4.6: Use gcc -m options when building vdso
    Date
    From: H. Peter Anvin <hpa@linux.intel.com>

    =====================================================================
    | This is a commit scheduled for the next v2.6.34 longterm release. |
    | If you see a problem with using this for longterm, please comment.|
    =====================================================================

    commit de2a8cf98ecdde25231d6c5e7901e2cffaf32af9 upstream.

    The vdso Makefile passes linker-style -m options not to the linker but
    to gcc. This happens to work with earlier gcc, but fails with gcc
    4.6. Pass gcc-style -m options, instead.

    Note: all currently supported versions of gcc supports -m32, so there
    is no reason to conditionalize it any more.

    Reported-by: H. J. Lu <hjl.tools@gmail.com>
    Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
    LKML-Reference: <tip-*@git.kernel.org>
    Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
    ---
    arch/x86/vdso/Makefile | 4 ++--
    1 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
    index 6b4ffed..dd78ef6 100644
    --- a/arch/x86/vdso/Makefile
    +++ b/arch/x86/vdso/Makefile
    @@ -25,7 +25,7 @@ targets += vdso.so vdso.so.dbg vdso.lds $(vobjs-y)

    export CPPFLAGS_vdso.lds += -P -C

    -VDSO_LDFLAGS_vdso.lds = -m elf_x86_64 -Wl,-soname=linux-vdso.so.1 \
    +VDSO_LDFLAGS_vdso.lds = -m64 -Wl,-soname=linux-vdso.so.1 \
    -Wl,-z,max-page-size=4096 -Wl,-z,common-page-size=4096

    $(obj)/vdso.o: $(src)/vdso.S $(obj)/vdso.so
    @@ -69,7 +69,7 @@ vdso32.so-$(VDSO32-y) += sysenter
    vdso32-images = $(vdso32.so-y:%=vdso32-%.so)

    CPPFLAGS_vdso32.lds = $(CPPFLAGS_vdso.lds)
    -VDSO_LDFLAGS_vdso32.lds = -m elf_i386 -Wl,-soname=linux-gate.so.1
    +VDSO_LDFLAGS_vdso32.lds = -m32 -Wl,-soname=linux-gate.so.1

    # This makes sure the $(obj) subdirectory exists even though vdso32/
    # is not a kbuild sub-make subdirectory.
    --
    1.7.4.4


    \
     
     \ /
      Last update: 2011-04-14 20:11    [W:0.020 / U:121.748 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site