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

Commit 1742ed20 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Ingo Molnar
Browse files

x86/build/vdso: Put generated linker scripts to $(obj)/ 



Let's put generated files to $(obj)/ rather than $(src)/ although
this is just a matter of taste because both are the same.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Richard Weinberger <richard@nod.at>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: user-mode-linux-devel@lists.sourceforge.net
Cc: user-mode-linux-user@lists.sourceforge.net
Link: http://lkml.kernel.org/r/1526352744-28229-4-git-send-email-yamada.masahiro@socionext.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 61615faf

arch/x86/entry/vdso/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ VDSO_LDFLAGS_vdso.lds = -m64 -Wl,-soname=linux-vdso.so.1 \ 
			-Wl,-z,max-page-size=4096 -Wl,-z,common-page-size=4096 \

			$(DISABLE_LTO)



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

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

	$(call if_changed,vdso)



HOST_EXTRACFLAGS += -I$(srctree)/tools/include -I$(srctree)/include/uapi -I$(srctree)/arch/$(SUBARCH)/include/uapi
@@ -119,7 +119,7 @@ $(obj)/%.so: OBJCOPYFLAGS := -S 
$(obj)/%.so: $(obj)/%.so.dbg

	$(call if_changed,objcopy)



$(obj)/vdsox32.so.dbg: $(src)/vdsox32.lds $(vobjx32s) FORCE

$(obj)/vdsox32.so.dbg: $(obj)/vdsox32.lds $(vobjx32s) FORCE

	$(call if_changed,vdso)



CPPFLAGS_vdso32.lds = $(CPPFLAGS_vdso.lds)

arch/x86/um/vdso/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ VDSO_LDFLAGS_vdso.lds = -m64 -Wl,-soname=linux-vdso.so.1 \ 


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



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

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

	$(call if_changed,vdso)



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