lkml.org 
[lkml]   [2015]   [Sep]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.1 32/78] ARM: 8385/1: VDSO: group link options
    Date
    4.1-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Nathan Lynch <nathan_lynch@mentor.com>

    commit d33ce23b2160d26b27a47092da5d556b5b11a12a upstream.

    Currently the VDSO's link options are kind of a mess spread between

    ccflags-y and cmd_vdsold. Collect linker directives into one
    variable, VDSO_LDFLAGS, and use that in cmd_vdsold.

    Signed-off-by: Nathan Lynch <nathan_lynch@mentor.com>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
    Cc: Alexander Kochetkov <al.kochet@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/arm/vdso/Makefile | 17 ++++++++++-------
    1 file changed, 10 insertions(+), 7 deletions(-)

    --- a/arch/arm/vdso/Makefile
    +++ b/arch/arm/vdso/Makefile
    @@ -6,9 +6,14 @@ obj-vdso := vgettimeofday.o datapage.o
    targets := $(obj-vdso) vdso.so vdso.so.dbg vdso.so.raw vdso.lds
    obj-vdso := $(addprefix $(obj)/, $(obj-vdso))

    -ccflags-y := -shared -fPIC -fno-common -fno-builtin -fno-stack-protector
    -ccflags-y += -nostdlib -Wl,-soname=linux-vdso.so.1 -DDISABLE_BRANCH_PROFILING
    -ccflags-y += -Wl,--no-undefined $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
    +ccflags-y := -fPIC -fno-common -fno-builtin -fno-stack-protector
    +ccflags-y += -DDISABLE_BRANCH_PROFILING
    +
    +VDSO_LDFLAGS := -Wl,-Bsymbolic -Wl,--no-undefined -Wl,-soname=linux-vdso.so.1
    +VDSO_LDFLAGS += -Wl,-z,max-page-size=4096 -Wl,-z,common-page-size=4096
    +VDSO_LDFLAGS += -nostdlib -shared
    +VDSO_LDFLAGS += $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
    +VDSO_LDFLAGS += $(call cc-ldoption, -Wl$(comma)--build-id)

    obj-$(CONFIG_VDSO) += vdso.o
    extra-$(CONFIG_VDSO) += vdso.lds
    @@ -40,10 +45,8 @@ $(obj)/%.so: $(obj)/%.so.dbg FORCE

    # Actual build commands
    quiet_cmd_vdsold = VDSO $@
    - cmd_vdsold = $(CC) $(c_flags) -Wl,-T $(filter %.lds,$^) $(filter %.o,$^) \
    - $(call cc-ldoption, -Wl$(comma)--build-id) \
    - -Wl,-Bsymbolic -Wl,-z,max-page-size=4096 \
    - -Wl,-z,common-page-size=4096 -o $@
    + cmd_vdsold = $(CC) $(c_flags) $(VDSO_LDFLAGS) \
    + -Wl,-T $(filter %.lds,$^) $(filter %.o,$^) -o $@

    quiet_cmd_vdsomunge = MUNGE $@
    cmd_vdsomunge = $(objtree)/$(obj)/vdsomunge $< $@



    \
     
     \ /
      Last update: 2015-09-12 01:21    [W:4.230 / U:0.384 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site