Skip to content

Commit 1742ed2

Browse files
masahir0yIngo Molnar
authored andcommitted
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: Masahiro Yamada <[email protected]> Cc: Andy Lutomirski <[email protected]> Cc: Jeff Dike <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Richard Weinberger <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: [email protected] Cc: [email protected] Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]>
1 parent 61615fa commit 1742ed2

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

arch/x86/entry/vdso/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ VDSO_LDFLAGS_vdso.lds = -m64 -Wl,-soname=linux-vdso.so.1 \
5151
-Wl,-z,max-page-size=4096 -Wl,-z,common-page-size=4096 \
5252
$(DISABLE_LTO)
5353

54-
$(obj)/vdso64.so.dbg: $(src)/vdso.lds $(vobjs) FORCE
54+
$(obj)/vdso64.so.dbg: $(obj)/vdso.lds $(vobjs) FORCE
5555
$(call if_changed,vdso)
5656

5757
HOST_EXTRACFLAGS += -I$(srctree)/tools/include -I$(srctree)/include/uapi -I$(srctree)/arch/$(SUBARCH)/include/uapi
@@ -119,7 +119,7 @@ $(obj)/%.so: OBJCOPYFLAGS := -S
119119
$(obj)/%.so: $(obj)/%.so.dbg
120120
$(call if_changed,objcopy)
121121

122-
$(obj)/vdsox32.so.dbg: $(src)/vdsox32.lds $(vobjx32s) FORCE
122+
$(obj)/vdsox32.so.dbg: $(obj)/vdsox32.lds $(vobjx32s) FORCE
123123
$(call if_changed,vdso)
124124

125125
CPPFLAGS_vdso32.lds = $(CPPFLAGS_vdso.lds)

arch/x86/um/vdso/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ VDSO_LDFLAGS_vdso.lds = -m64 -Wl,-soname=linux-vdso.so.1 \
3030

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

33-
$(obj)/vdso.so.dbg: $(src)/vdso.lds $(vobjs) FORCE
33+
$(obj)/vdso.so.dbg: $(obj)/vdso.lds $(vobjs) FORCE
3434
$(call if_changed,vdso)
3535

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

0 commit comments

Comments
 (0)