From 9d1aebd1c5ad4361620fe9c23dddb8616c59adf5 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 11 Oct 2007 11:12:44 +0200 Subject: [PATCH] --- yaml --- r: 65387 b: refs/heads/master c: 5bdef8fd610b8b07cf58ad2139f1f76bf127ad5d h: refs/heads/master i: 65385: 62ca4a904b81567fd90fa97193e7166ba3d0aea4 65383: dcb43462f7d652dc9349b58133c1a3c8a0c8e3ff v: v3 --- [refs] | 2 +- trunk/arch/i386/kernel/Makefile | 8 ++++---- .../{vsyscall-sysenter.S => vsyscall-sysenter_32.S} | 0 3 files changed, 5 insertions(+), 5 deletions(-) rename trunk/arch/i386/kernel/{vsyscall-sysenter.S => vsyscall-sysenter_32.S} (100%) diff --git a/[refs] b/[refs] index 8abb932107b5..1cb217d3cfdf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 128ffcdab2e74292ead956f257e10d288a215e06 +refs/heads/master: 5bdef8fd610b8b07cf58ad2139f1f76bf127ad5d diff --git a/trunk/arch/i386/kernel/Makefile b/trunk/arch/i386/kernel/Makefile index 8c739b03eff8..4e4b1fa96157 100644 --- a/trunk/arch/i386/kernel/Makefile +++ b/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 diff --git a/trunk/arch/i386/kernel/vsyscall-sysenter.S b/trunk/arch/i386/kernel/vsyscall-sysenter_32.S similarity index 100% rename from trunk/arch/i386/kernel/vsyscall-sysenter.S rename to trunk/arch/i386/kernel/vsyscall-sysenter_32.S