diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 16:13:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 16:13:16 -0400 |
| commit | d20ead9e86881bc7ae84e385f47b5196b7d93aac (patch) | |
| tree | ed27dd5db5f8447e4b3f541f0ec38219085d2f32 /arch/x86/vdso/Makefile | |
| parent | c56ec7639288f3e5d6371b0c48d37da93642fc93 (diff) | |
| parent | 88e4d250234fc9e64d6ce51df95efdcf8334fd95 (diff) | |
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86
* ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86: (114 commits)
x86: delete vsyscall files during make clean
kbuild: fix typo SRCARCH in find_sources
x86: fix kernel rebuild due to vsyscall fallout
.gitignore update for x86 arch
x86: unify include/asm/debugreg_32/64.h
x86: unify include/asm/unwind_32/64.h
x86: unify include/asm/types_32/64.h
x86: unify include/asm/tlb_32/64.h
x86: unify include/asm/siginfo_32/64.h
x86: unify include/asm/bug_32/64.h
x86: unify include/asm/mman_32/64.h
x86: unify include/asm/agp_32/64.h
x86: unify include/asm/kdebug_32/64.h
x86: unify include/asm/ioctls_32/64.h
x86: unify include/asm/floppy_32/64.h
x86: apply missing DMA/OOM prevention to floppy_32.h
x86: unify include/asm/cache_32/64.h
x86: unify include/asm/cache_32/64.h
x86: unify include/asm/dmi_32/64.h
x86: unify include/asm/delay_32/64.h
...
Diffstat (limited to 'arch/x86/vdso/Makefile')
| -rw-r--r-- | arch/x86/vdso/Makefile | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile index dcd6bb9e0bb3..7a2ba4583939 100644 --- a/arch/x86/vdso/Makefile +++ b/arch/x86/vdso/Makefile | |||
| @@ -13,7 +13,7 @@ vobjs := $(foreach F,$(vobjs-y),$(obj)/$F) | |||
| 13 | 13 | ||
| 14 | $(obj)/vdso.o: $(obj)/vdso.so | 14 | $(obj)/vdso.o: $(obj)/vdso.so |
| 15 | 15 | ||
| 16 | targets += vdso.so vdso.lds $(vobjs-y) vdso-syms.o | 16 | targets += vdso.so vdso.so.dbg vdso.lds $(vobjs-y) vdso-syms.o |
| 17 | 17 | ||
| 18 | # The DSO images are built using a special linker script. | 18 | # The DSO images are built using a special linker script. |
| 19 | quiet_cmd_syscall = SYSCALL $@ | 19 | quiet_cmd_syscall = SYSCALL $@ |
| @@ -26,12 +26,19 @@ vdso-flags = -fPIC -shared -Wl,-soname=linux-vdso.so.1 \ | |||
| 26 | $(call ld-option, -Wl$(comma)--hash-style=sysv) \ | 26 | $(call ld-option, -Wl$(comma)--hash-style=sysv) \ |
| 27 | -Wl,-z,max-page-size=4096 -Wl,-z,common-page-size=4096 | 27 | -Wl,-z,max-page-size=4096 -Wl,-z,common-page-size=4096 |
| 28 | SYSCFLAGS_vdso.so = $(vdso-flags) | 28 | SYSCFLAGS_vdso.so = $(vdso-flags) |
| 29 | SYSCFLAGS_vdso.so.dbg = $(vdso-flags) | ||
| 29 | 30 | ||
| 30 | $(obj)/vdso.o: $(src)/vdso.S $(obj)/vdso.so | 31 | $(obj)/vdso.o: $(src)/vdso.S $(obj)/vdso.so |
| 31 | 32 | ||
| 32 | $(obj)/vdso.so: $(src)/vdso.lds $(vobjs) FORCE | 33 | $(obj)/vdso.so: $(src)/vdso.lds $(vobjs) FORCE |
| 34 | |||
| 35 | $(obj)/vdso.so.dbg: $(src)/vdso.lds $(vobjs) FORCE | ||
| 33 | $(call if_changed,syscall) | 36 | $(call if_changed,syscall) |
| 34 | 37 | ||
| 38 | $(obj)/%.so: OBJCOPYFLAGS := -S | ||
| 39 | $(obj)/%.so: $(obj)/%.so.dbg FORCE | ||
| 40 | $(call if_changed,objcopy) | ||
| 41 | |||
| 35 | CFL := $(PROFILING) -mcmodel=small -fPIC -g0 -O2 -fasynchronous-unwind-tables -m64 | 42 | CFL := $(PROFILING) -mcmodel=small -fPIC -g0 -O2 -fasynchronous-unwind-tables -m64 |
| 36 | 43 | ||
| 37 | $(obj)/vclock_gettime.o: KBUILD_CFLAGS = $(CFL) | 44 | $(obj)/vclock_gettime.o: KBUILD_CFLAGS = $(CFL) |
| @@ -47,3 +54,11 @@ $(obj)/built-in.o: ld_flags += -R $(obj)/vdso-syms.o | |||
| 47 | SYSCFLAGS_vdso-syms.o = -r -d | 54 | SYSCFLAGS_vdso-syms.o = -r -d |
| 48 | $(obj)/vdso-syms.o: $(src)/vdso.lds $(vobjs) FORCE | 55 | $(obj)/vdso-syms.o: $(src)/vdso.lds $(vobjs) FORCE |
| 49 | $(call if_changed,syscall) | 56 | $(call if_changed,syscall) |
| 57 | |||
| 58 | quiet_cmd_vdso_install = INSTALL $@ | ||
| 59 | cmd_vdso_install = cp $(obj)/$@.dbg $(MODLIB)/vdso/$@ | ||
| 60 | vdso.so: | ||
| 61 | @mkdir -p $(MODLIB)/vdso | ||
| 62 | $(call cmd,vdso_install) | ||
| 63 | |||
| 64 | vdso_install: vdso.so | ||