Skip to content

Commit

Permalink
x86 vDSO: ia32 vsyscall removal
Browse files Browse the repository at this point in the history
This removes all the old vsyscall code from arch/x86/ia32/ that is
no longer used because arch/x86/vdso/ code has replaced it.

Signed-off-by: Roland McGrath <roland@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  • Loading branch information
Roland McGrath authored and Ingo Molnar committed Jan 30, 2008
1 parent af65d64 commit 16f4bc7
Show file tree
Hide file tree
Showing 10 changed files with 0 additions and 554 deletions.
3 changes: 0 additions & 3 deletions arch/x86/Makefile_64
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,6 @@ install: vdso_install
$(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(BOOTIMAGE) $@

vdso_install:
ifeq ($(CONFIG_IA32_EMULATION),y)
$(Q)$(MAKE) $(build)=arch/x86/ia32 $@
endif
$(Q)$(MAKE) $(build)=arch/x86/vdso $@

archclean:
Expand Down
37 changes: 0 additions & 37 deletions arch/x86/ia32/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,40 +12,3 @@ obj-$(CONFIG_IA32_AOUT) += ia32_aout.o

audit-class-$(CONFIG_AUDIT) := audit.o
obj-$(CONFIG_IA32_EMULATION) += $(audit-class-y)

$(obj)/syscall32_syscall.o: \
$(foreach F,sysenter syscall,$(obj)/vsyscall-$F.so)

# Teach kbuild about targets
targets := $(foreach F,$(addprefix vsyscall-,sysenter syscall),\
$F.o $F.so $F.so.dbg)

# The DSO images are built using a special linker script
quiet_cmd_syscall = SYSCALL $@
cmd_syscall = $(CC) -m32 -nostdlib -shared \
$(call ld-option, -Wl$(comma)--hash-style=sysv) \
-Wl,-soname=linux-gate.so.1 -o $@ \
-Wl,-T,$(filter-out FORCE,$^)

$(obj)/%.so: OBJCOPYFLAGS := -S
$(obj)/%.so: $(obj)/%.so.dbg FORCE
$(call if_changed,objcopy)

$(obj)/vsyscall-sysenter.so.dbg $(obj)/vsyscall-syscall.so.dbg: \
$(obj)/vsyscall-%.so.dbg: $(src)/vsyscall.lds $(obj)/vsyscall-%.o FORCE
$(call if_changed,syscall)

AFLAGS_vsyscall-sysenter.o = -m32 -Wa,-32
AFLAGS_vsyscall-syscall.o = -m32 -Wa,-32

vdsos := vdso32-sysenter.so vdso32-syscall.so

quiet_cmd_vdso_install = INSTALL $@
cmd_vdso_install = cp $(@:vdso32-%.so=$(obj)/vsyscall-%.so.dbg) \
$(MODLIB)/vdso/$@

$(vdsos):
@mkdir -p $(MODLIB)/vdso
$(call cmd,vdso_install)

vdso_install: $(vdsos)
90 changes: 0 additions & 90 deletions arch/x86/ia32/syscall32.c

This file was deleted.

17 changes: 0 additions & 17 deletions arch/x86/ia32/syscall32_syscall.S

This file was deleted.

142 changes: 0 additions & 142 deletions arch/x86/ia32/vsyscall-sigreturn.S

This file was deleted.

69 changes: 0 additions & 69 deletions arch/x86/ia32/vsyscall-syscall.S

This file was deleted.

Loading

0 comments on commit 16f4bc7

Please sign in to comment.