diff options
author | Roland McGrath <roland@redhat.com> | 2008-01-30 07:30:41 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:30:41 -0500 |
commit | 2b9c97e16101e8dc2b0810d6f932d475a051d785 (patch) | |
tree | 69b4eb7fb31a2af1f763dfb19cc6b799cf19fb25 /arch/x86/vdso/Makefile | |
parent | 7f3646aa16f496201e045183402c6614fa27b0c7 (diff) |
x86 vDSO: remove vdso-syms.o
Get rid of vdso-syms.o from the kernel link. We don't need it any more.
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>
Diffstat (limited to 'arch/x86/vdso/Makefile')
-rw-r--r-- | arch/x86/vdso/Makefile | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile index d2ec17044adc..6a665dd09848 100644 --- a/arch/x86/vdso/Makefile +++ b/arch/x86/vdso/Makefile | |||
@@ -6,13 +6,13 @@ | |||
6 | vobjs-y := vdso-note.o vclock_gettime.o vgetcpu.o vvar.o | 6 | vobjs-y := vdso-note.o vclock_gettime.o vgetcpu.o vvar.o |
7 | 7 | ||
8 | # files to link into kernel | 8 | # files to link into kernel |
9 | obj-y := vma.o vdso.o vdso-syms.o | 9 | obj-y := vma.o vdso.o |
10 | 10 | ||
11 | vobjs := $(foreach F,$(vobjs-y),$(obj)/$F) | 11 | vobjs := $(foreach F,$(vobjs-y),$(obj)/$F) |
12 | 12 | ||
13 | $(obj)/vdso.o: $(obj)/vdso.so | 13 | $(obj)/vdso.o: $(obj)/vdso.so |
14 | 14 | ||
15 | targets += vdso.so vdso.so.dbg vdso.lds $(vobjs-y) vdso-syms.o | 15 | targets += vdso.so vdso.so.dbg vdso.lds $(vobjs-y) |
16 | 16 | ||
17 | # The DSO images are built using a special linker script. | 17 | # The DSO images are built using a special linker script. |
18 | quiet_cmd_syscall = SYSCALL $@ | 18 | quiet_cmd_syscall = SYSCALL $@ |
@@ -43,17 +43,6 @@ CFL := $(PROFILING) -mcmodel=small -fPIC -g0 -O2 -fasynchronous-unwind-tables -m | |||
43 | $(obj)/vclock_gettime.o: KBUILD_CFLAGS = $(CFL) | 43 | $(obj)/vclock_gettime.o: KBUILD_CFLAGS = $(CFL) |
44 | $(obj)/vgetcpu.o: KBUILD_CFLAGS = $(CFL) | 44 | $(obj)/vgetcpu.o: KBUILD_CFLAGS = $(CFL) |
45 | 45 | ||
46 | # We also create a special relocatable object that should mirror the symbol | ||
47 | # table and layout of the linked DSO. With ld -R we can then refer to | ||
48 | # these symbols in the kernel code rather than hand-coded addresses. | ||
49 | extra-y += vdso-syms.o | ||
50 | $(obj)/built-in.o: $(obj)/vdso-syms.o | ||
51 | $(obj)/built-in.o: ld_flags += -R $(obj)/vdso-syms.o | ||
52 | |||
53 | SYSCFLAGS_vdso-syms.o = -r -d | ||
54 | $(obj)/vdso-syms.o: $(src)/vdso.lds $(vobjs) FORCE | ||
55 | $(call if_changed,syscall) | ||
56 | |||
57 | targets += vdso-syms.lds | 46 | targets += vdso-syms.lds |
58 | obj-y += vdso-syms.lds | 47 | obj-y += vdso-syms.lds |
59 | 48 | ||