diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2007-10-11 05:12:44 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2007-10-11 05:12:44 -0400 |
commit | 5bdef8fd610b8b07cf58ad2139f1f76bf127ad5d (patch) | |
tree | f77f4e272858c47dd41e1a22f1b27cabbc6c9eba /arch/i386/kernel/Makefile | |
parent | 128ffcdab2e74292ead956f257e10d288a215e06 (diff) |
i386: prepare shared kernel/vsyscall-sysenter.S
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/i386/kernel/Makefile')
-rw-r--r-- | arch/i386/kernel/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile index 8c739b03eff8..4e4b1fa96157 100644 --- a/arch/i386/kernel/Makefile +++ b/arch/i386/kernel/Makefile | |||
@@ -50,7 +50,7 @@ obj-$(CONFIG_SCx200) += scx200.o | |||
50 | # vsyscall_32.o contains the vsyscall DSO images as __initdata. | 50 | # vsyscall_32.o contains the vsyscall DSO images as __initdata. |
51 | # We must build both images before we can assemble it. | 51 | # We must build both images before we can assemble it. |
52 | # Note: kbuild does not track this dependency due to usage of .incbin | 52 | # Note: kbuild does not track this dependency due to usage of .incbin |
53 | $(obj)/vsyscall_32.o: $(obj)/vsyscall-int80_32.so $(obj)/vsyscall-sysenter.so | 53 | $(obj)/vsyscall_32.o: $(obj)/vsyscall-int80_32.so $(obj)/vsyscall-sysenter_32.so |
54 | targets += $(foreach F,int80 sysenter,vsyscall-$F.o vsyscall-$F.so) | 54 | targets += $(foreach F,int80 sysenter,vsyscall-$F.o vsyscall-$F.so) |
55 | targets += vsyscall-note.o vsyscall_32.lds | 55 | targets += vsyscall-note.o vsyscall_32.lds |
56 | 56 | ||
@@ -63,10 +63,10 @@ export CPPFLAGS_vsyscall_32.lds += -P -C -U$(ARCH) | |||
63 | 63 | ||
64 | vsyscall-flags = -shared -s -Wl,-soname=linux-gate.so.1 \ | 64 | vsyscall-flags = -shared -s -Wl,-soname=linux-gate.so.1 \ |
65 | $(call ld-option, -Wl$(comma)--hash-style=sysv) | 65 | $(call ld-option, -Wl$(comma)--hash-style=sysv) |
66 | SYSCFLAGS_vsyscall-sysenter.so = $(vsyscall-flags) | 66 | SYSCFLAGS_vsyscall-sysenter_32.so = $(vsyscall-flags) |
67 | SYSCFLAGS_vsyscall-int80_32.so = $(vsyscall-flags) | 67 | SYSCFLAGS_vsyscall-int80_32.so = $(vsyscall-flags) |
68 | 68 | ||
69 | $(obj)/vsyscall-int80_32.so $(obj)/vsyscall-sysenter.so: \ | 69 | $(obj)/vsyscall-int80_32.so $(obj)/vsyscall-sysenter_32.so: \ |
70 | $(obj)/vsyscall-%.so: $(src)/vsyscall_32.lds \ | 70 | $(obj)/vsyscall-%.so: $(src)/vsyscall_32.lds \ |
71 | $(obj)/vsyscall-%.o $(obj)/vsyscall-note.o FORCE | 71 | $(obj)/vsyscall-%.o $(obj)/vsyscall-note.o FORCE |
72 | $(call if_changed,syscall) | 72 | $(call if_changed,syscall) |
@@ -80,7 +80,7 @@ $(obj)/built-in.o: ld_flags += -R $(obj)/vsyscall-syms.o | |||
80 | 80 | ||
81 | SYSCFLAGS_vsyscall-syms.o = -r | 81 | SYSCFLAGS_vsyscall-syms.o = -r |
82 | $(obj)/vsyscall-syms.o: $(src)/vsyscall_32.lds \ | 82 | $(obj)/vsyscall-syms.o: $(src)/vsyscall_32.lds \ |
83 | $(obj)/vsyscall-sysenter.o $(obj)/vsyscall-note.o FORCE | 83 | $(obj)/vsyscall-sysenter_32.o $(obj)/vsyscall-note.o FORCE |
84 | $(call if_changed,syscall) | 84 | $(call if_changed,syscall) |
85 | 85 | ||
86 | k8-y += ../../x86_64/kernel/k8.o | 86 | k8-y += ../../x86_64/kernel/k8.o |