Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16e48e7e authored by Roland McGrath's avatar Roland McGrath Committed by Ingo Molnar
Browse files

x86 vDSO: makefile cleanup 



This cleans up the arch/x86/vdso/Makefile rules for vdso.so to
share more code with the vdso32-*.so rules and remove old cruft.

Signed-off-by: default avatarRoland McGrath <roland@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 69d0627a

arch/x86/vdso/Makefile

+4 −15
Original line number Diff line number Diff line
@@ -23,25 +23,15 @@ $(obj)/vdso.o: $(obj)/vdso.so 


targets += vdso.so vdso.so.dbg vdso.lds $(vobjs-y)



# The DSO images are built using a special linker script.

quiet_cmd_syscall = SYSCALL $@

      cmd_syscall = $(CC) -m elf_x86_64 -nostdlib $(SYSCFLAGS_$(@F)) \

		          -Wl,-T,$(filter-out FORCE,$^) -o $@



export CPPFLAGS_vdso.lds += -P -C



vdso-flags = -fPIC -shared -Wl,-soname=linux-vdso.so.1 \

		 $(call ld-option, -Wl$(comma)--hash-style=sysv) \

VDSO_LDFLAGS_vdso.lds = -m elf_x86_64 -Wl,-soname=linux-vdso.so.1 \

		      	-Wl,-z,max-page-size=4096 -Wl,-z,common-page-size=4096

SYSCFLAGS_vdso.so = $(vdso-flags)

SYSCFLAGS_vdso.so.dbg = $(vdso-flags)



$(obj)/vdso.o: $(src)/vdso.S $(obj)/vdso.so



$(obj)/vdso.so: $(src)/vdso.lds $(vobjs) FORCE



$(obj)/vdso.so.dbg: $(src)/vdso.lds $(vobjs) FORCE

	$(call if_changed,syscall)

	$(call if_changed,vdso)



$(obj)/%.so: OBJCOPYFLAGS := -S

$(obj)/%.so: $(obj)/%.so.dbg FORCE
@@ -49,8 +39,7 @@ $(obj)/%.so: $(obj)/%.so.dbg FORCE 


CFL := $(PROFILING) -mcmodel=small -fPIC -g0 -O2 -fasynchronous-unwind-tables -m64



$(obj)/vclock_gettime.o: KBUILD_CFLAGS = $(CFL)

$(obj)/vgetcpu.o: KBUILD_CFLAGS = $(CFL)

$(vobjs): KBUILD_CFLAGS = $(CFL)



targets += vdso-syms.lds

obj-$(VDSO64-y)			+= vdso-syms.lds