lkml.org 
[lkml]   [2007]   [Nov]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 18/18] x86 vDSO: makefile cleanup
    Date

    This cleans up the arch/x86/vdso/Makefile rules for vdso.so to
    share more code with the vdso32-*.so rules and remove old cruft.

    Signed-off-by: Roland McGrath <roland@redhat.com>
    ---
    arch/x86/vdso/Makefile | 19 ++++---------------
    1 files changed, 4 insertions(+), 15 deletions(-)

    diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
    index 53f36bc..2d5bbbe 100644
    --- a/arch/x86/vdso/Makefile
    +++ b/arch/x86/vdso/Makefile
    @@ -23,25 +23,15 @@ $(obj)/vdso.o: $(obj)/vdso.so

    targets += vdso.so vdso.so.dbg vdso.lds $(vobjs-y)

    -# The DSO images are built using a special linker script.
    -quiet_cmd_syscall = SYSCALL $@
    - cmd_syscall = $(CC) -m elf_x86_64 -nostdlib $(SYSCFLAGS_$(@F)) \
    - -Wl,-T,$(filter-out FORCE,$^) -o $@
    -
    export CPPFLAGS_vdso.lds += -P -C

    -vdso-flags = -fPIC -shared -Wl,-soname=linux-vdso.so.1 \
    - $(call ld-option, -Wl$(comma)--hash-style=sysv) \
    - -Wl,-z,max-page-size=4096 -Wl,-z,common-page-size=4096
    -SYSCFLAGS_vdso.so = $(vdso-flags)
    -SYSCFLAGS_vdso.so.dbg = $(vdso-flags)
    +VDSO_LDFLAGS_vdso.lds = -m elf_x86_64 -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

    -$(obj)/vdso.so: $(src)/vdso.lds $(vobjs) FORCE
    -
    $(obj)/vdso.so.dbg: $(src)/vdso.lds $(vobjs) FORCE
    - $(call if_changed,syscall)
    + $(call if_changed,vdso)

    $(obj)/%.so: OBJCOPYFLAGS := -S
    $(obj)/%.so: $(obj)/%.so.dbg FORCE
    @@ -49,8 +39,7 @@ $(obj)/%.so: $(obj)/%.so.dbg FORCE

    CFL := $(PROFILING) -mcmodel=small -fPIC -g0 -O2 -fasynchronous-unwind-tables -m64

    -$(obj)/vclock_gettime.o: KBUILD_CFLAGS = $(CFL)
    -$(obj)/vgetcpu.o: KBUILD_CFLAGS = $(CFL)
    +$(vobjs): KBUILD_CFLAGS = $(CFL)

    targets += vdso-syms.lds
    obj-$(VDSO64-y) += vdso-syms.lds
    -
    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-11-19 23:15    [W:4.020 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site