aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/vdso/Makefile15
1 files changed, 2 insertions, 13 deletions
diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
index d2ec17044ad..6a665dd0984 100644
--- a/arch/x86/vdso/Makefile
+++ b/arch/x86/vdso/Makefile
@@ -6,13 +6,13 @@
6vobjs-y := vdso-note.o vclock_gettime.o vgetcpu.o vvar.o 6vobjs-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
9obj-y := vma.o vdso.o vdso-syms.o 9obj-y := vma.o vdso.o
10 10
11vobjs := $(foreach F,$(vobjs-y),$(obj)/$F) 11vobjs := $(foreach F,$(vobjs-y),$(obj)/$F)
12 12
13$(obj)/vdso.o: $(obj)/vdso.so 13$(obj)/vdso.o: $(obj)/vdso.so
14 14
15targets += vdso.so vdso.so.dbg vdso.lds $(vobjs-y) vdso-syms.o 15targets += 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.
18quiet_cmd_syscall = SYSCALL $@ 18quiet_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.
49extra-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
53SYSCFLAGS_vdso-syms.o = -r -d
54$(obj)/vdso-syms.o: $(src)/vdso.lds $(vobjs) FORCE
55 $(call if_changed,syscall)
56
57targets += vdso-syms.lds 46targets += vdso-syms.lds
58obj-y += vdso-syms.lds 47obj-y += vdso-syms.lds
59 48