On Thu, Jun 12, 2014 at 11:28 AM, Andy Lutomirski <luto@xxxxxxxxxxxxxx> wrote: > The filenames are different now. Inspired by a patch from > Sam Ravnborg. > > Acked-by: Sam Ravnborg <sam@xxxxxxxxxxxx> > Reported-by: Josh Boyer <jwboyer@xxxxxxxxxxxxxxxxx> > Signed-off-by: Andy Lutomirski <luto@xxxxxxxxxxxxxx> Things look great with this version. Thanks much! Tested-by: Josh Boyer <jwboyer@xxxxxxxxxxxxxxxxx> > --- > > I kept Sam's ack from v2, since v3 has only a trivial change. > > Changes from v1: Remove core kbuild change > Changes from v2: Name the result .so files again, not .so.dbg > > arch/x86/vdso/Makefile | 22 +++++++++++----------- > 1 file changed, 11 insertions(+), 11 deletions(-) > > diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile > index 9769df0..845b45e 100644 > --- a/arch/x86/vdso/Makefile > +++ b/arch/x86/vdso/Makefile > @@ -9,11 +9,6 @@ VDSOX32-$(CONFIG_X86_X32_ABI) := y > VDSO32-$(CONFIG_X86_32) := y > VDSO32-$(CONFIG_COMPAT) := y > > -vdso-install-$(VDSO64-y) += vdso.so > -vdso-install-$(VDSOX32-y) += vdsox32.so > -vdso-install-$(VDSO32-y) += $(vdso32-images) > - > - > # files to link into the vdso > vobjs-y := vdso-note.o vclock_gettime.o vgetcpu.o > > @@ -176,15 +171,20 @@ VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \ > GCOV_PROFILE := n > > # > -# Install the unstripped copy of vdso*.so listed in $(vdso-install-y). > +# Install the unstripped copies of vdso*.so. > # > -quiet_cmd_vdso_install = INSTALL $@ > - cmd_vdso_install = cp $(obj)/$@.dbg $(MODLIB)/vdso/$@ > -$(vdso-install-y): %.so: $(obj)/%.so.dbg FORCE > +quiet_cmd_vdso_install = INSTALL $(@:install_%=%) > + cmd_vdso_install = cp $< $(MODLIB)/vdso/$(@:install_%=%) > + > +vdso_img_insttargets := $(vdso_img_sodbg:%.dbg=install_%) > + > +$(MODLIB)/vdso: FORCE > @mkdir -p $(MODLIB)/vdso > + > +$(vdso_img_insttargets): install_%: $(obj)/%.dbg $(MODLIB)/vdso FORCE > $(call cmd,vdso_install) > > -PHONY += vdso_install $(vdso-install-y) > -vdso_install: $(vdso-install-y) > +PHONY += vdso_install $(vdso_img_insttargets) > +vdso_install: $(vdso_img_insttargets) FORCE > > clean-files := vdso32-syscall* vdso32-sysenter* vdso32-int80* > -- > 1.9.3 > -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
