| Message ID | b10299edd8ba98d17e07dafcd895b8ecf4d99eff.1402586707.git.luto@amacapital.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Jun 12, 2014 at 11:28 AM, Andy Lutomirski <luto@amacapital.net> wrote: > The filenames are different now. Inspired by a patch from > Sam Ravnborg. > > Acked-by: Sam Ravnborg <sam@ravnborg.org> > Reported-by: Josh Boyer <jwboyer@fedoraproject.org> > Signed-off-by: Andy Lutomirski <luto@amacapital.net> Things look great with this version. Thanks much! Tested-by: Josh Boyer <jwboyer@fedoraproject.org> > --- > > 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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 06/12/2014 10:01 AM, Josh Boyer wrote: > On Thu, Jun 12, 2014 at 11:28 AM, Andy Lutomirski <luto@amacapital.net> wrote: >> The filenames are different now. Inspired by a patch from >> Sam Ravnborg. >> >> Acked-by: Sam Ravnborg <sam@ravnborg.org> >> Reported-by: Josh Boyer <jwboyer@fedoraproject.org> >> Signed-off-by: Andy Lutomirski <luto@amacapital.net> > > Things look great with this version. Thanks much! > > Tested-by: Josh Boyer <jwboyer@fedoraproject.org> > Are we okay with the 64-bit vdso now being installed as vdso64.so? -hpa -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Jun 13, 2014 at 10:24 AM, H. Peter Anvin <hpa@zytor.com> wrote: > On 06/12/2014 10:01 AM, Josh Boyer wrote: >> On Thu, Jun 12, 2014 at 11:28 AM, Andy Lutomirski <luto@amacapital.net> wrote: >>> The filenames are different now. Inspired by a patch from >>> Sam Ravnborg. >>> >>> Acked-by: Sam Ravnborg <sam@ravnborg.org> >>> Reported-by: Josh Boyer <jwboyer@fedoraproject.org> >>> Signed-off-by: Andy Lutomirski <luto@amacapital.net> >> >> Things look great with this version. Thanks much! >> >> Tested-by: Josh Boyer <jwboyer@fedoraproject.org> >> > > Are we okay with the 64-bit vdso now being installed as vdso64.so? Unless someone actually complains, I think so. Ideally, I think we'd have a symlink from the build id, but that's a separate issue. AFAIK, the only thing that actually references these files is Fedora's gdb, which is finding them from Fedora's build-id symlinks, which should work fine regardless of what the thing is called. How's this for a patch description: make vdso_install has been broken since this commit: commit 6f121e548f83674ab4920a4e60afb58d4f61b829 Author: Andy Lutomirski <luto@amacapital.net> Date: Mon May 5 12:19:34 2014 -0700 x86, vdso: Reimplement vdso.so preparation in build-time C because the names of the files to be installed changed. This fixes vdso_install to install the right files. -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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*