From: Roland McGrath Signed-off-by: Roland McGrath Cc: Andi Kleen Signed-off-by: Andrew Morton --- arch/x86_64/Makefile | 6 ++++-- arch/x86_64/ia32/Makefile | 2 +- arch/x86_64/vdso/Makefile | 6 +++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff -puN arch/x86_64/Makefile~x86_64-mm-x86_64-ia32-vdso-install-unstripped-copies-on-disk-update arch/x86_64/Makefile --- a/arch/x86_64/Makefile~x86_64-mm-x86_64-ia32-vdso-install-unstripped-copies-on-disk-update +++ a/arch/x86_64/Makefile @@ -109,12 +109,14 @@ bzdisk: vmlinux fdimage fdimage144 fdimage288 isoimage: vmlinux $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(BOOTIMAGE) $@ -install: +install: vdso_install $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(BOOTIMAGE) $@ - $(Q)$(MAKE) $(build)=arch/x86_64/vdso $@ + +vdso_install: ifeq ($(CONFIG_IA32_EMULATION),y) $(Q)$(MAKE) $(build)=arch/x86_64/ia32 $@ endif + $(Q)$(MAKE) $(build)=arch/x86_64/vdso $@ archclean: $(Q)$(MAKE) $(clean)=$(boot) diff -puN arch/x86_64/ia32/Makefile~x86_64-mm-x86_64-ia32-vdso-install-unstripped-copies-on-disk-update arch/x86_64/ia32/Makefile --- a/arch/x86_64/ia32/Makefile~x86_64-mm-x86_64-ia32-vdso-install-unstripped-copies-on-disk-update +++ a/arch/x86_64/ia32/Makefile @@ -49,4 +49,4 @@ $(vdsos): @mkdir -p $(MODLIB)/vdso $(call cmd,vdso_install) -install: $(vdsos) +vdso_install: $(vdsos) diff -puN arch/x86_64/vdso/Makefile~x86_64-mm-x86_64-ia32-vdso-install-unstripped-copies-on-disk-update arch/x86_64/vdso/Makefile --- a/arch/x86_64/vdso/Makefile~x86_64-mm-x86_64-ia32-vdso-install-unstripped-copies-on-disk-update +++ a/arch/x86_64/vdso/Makefile @@ -36,7 +36,7 @@ $(obj)/%.so: OBJCOPYFLAGS := -S $(obj)/%.so: $(obj)/%.so.dbg FORCE $(call if_changed,objcopy) -CFL := $(PROFILING) -mcmodel=small -fPIC -O2 -fasynchronous-unwind-tables -m64 +CFL := $(PROFILING) -mcmodel=small -fPIC $(if $(CONFIG_DEBUG_INFO),-g,-g0) -O2 -fasynchronous-unwind-tables -m64 $(obj)/vclock_gettime.o: CFLAGS = $(CFL) $(obj)/vgetcpu.o: CFLAGS = $(CFL) @@ -53,9 +53,9 @@ $(obj)/vdso-syms.o: $(src)/vdso.lds $(vo $(call if_changed,syscall) quiet_cmd_vdso_install = INSTALL $@ - cmd_vdso_install = cp $@.dbg $(MODLIB)/vdso/$@ + cmd_vdso_install = cp $(obj)/$@.dbg $(MODLIB)/vdso/$@ vdso.so: @mkdir -p $(MODLIB)/vdso $(call cmd,vdso_install) -install: vdso.so +vdso_install: vdso.so _