---

yaml
---
r: 65387
b: refs/heads/master
c: 5bdef8f
h: refs/heads/master
i:
  65385: 62ca4a9
  65383: dcb4346
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 128ffcdab2e74292ead956f257e10d288a215e06
+refs/heads/master: 5bdef8fd610b8b07cf58ad2139f1f76bf127ad5d

trunk/arch/i386/kernel/Makefile

@@ -50,7 +50,7 @@ obj-$(CONFIG_SCx200)		+= scx200.o
 # vsyscall_32.o contains the vsyscall DSO images as __initdata.
 # We must build both images before we can assemble it.
 # Note: kbuild does not track this dependency due to usage of .incbin
-$(obj)/vsyscall_32.o: $(obj)/vsyscall-int80_32.so $(obj)/vsyscall-sysenter.so
+$(obj)/vsyscall_32.o: $(obj)/vsyscall-int80_32.so $(obj)/vsyscall-sysenter_32.so
 targets += $(foreach F,int80 sysenter,vsyscall-$F.o vsyscall-$F.so)
 targets += vsyscall-note.o vsyscall_32.lds
 
@@ -63,10 +63,10 @@ export CPPFLAGS_vsyscall_32.lds += -P -C -U$(ARCH)
 
 vsyscall-flags = -shared -s -Wl,-soname=linux-gate.so.1 \
 		 $(call ld-option, -Wl$(comma)--hash-style=sysv)
-SYSCFLAGS_vsyscall-sysenter.so	= $(vsyscall-flags)
+SYSCFLAGS_vsyscall-sysenter_32.so	= $(vsyscall-flags)
 SYSCFLAGS_vsyscall-int80_32.so	= $(vsyscall-flags)
 
-$(obj)/vsyscall-int80_32.so $(obj)/vsyscall-sysenter.so: \
+$(obj)/vsyscall-int80_32.so $(obj)/vsyscall-sysenter_32.so: \
 $(obj)/vsyscall-%.so: $(src)/vsyscall_32.lds \
 		      $(obj)/vsyscall-%.o $(obj)/vsyscall-note.o FORCE
 	$(call if_changed,syscall)
@@ -80,7 +80,7 @@ $(obj)/built-in.o: ld_flags += -R $(obj)/vsyscall-syms.o
 
 SYSCFLAGS_vsyscall-syms.o = -r
 $(obj)/vsyscall-syms.o: $(src)/vsyscall_32.lds \
-			$(obj)/vsyscall-sysenter.o $(obj)/vsyscall-note.o FORCE
+			$(obj)/vsyscall-sysenter_32.o $(obj)/vsyscall-note.o FORCE
 	$(call if_changed,syscall)
 
 k8-y                      += ../../x86_64/kernel/k8.o