Skip to content

Commit b957df3

Browse files
committed
arch: use $(obj)/ instead of $(src)/ for preprocessed linker scripts
These are generated files. Prefix them with $(obj)/ instead of $(src)/. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Acked-by: Helge Deller <deller@gmx.de> Reviewed-by: Nicolas Schier <nicolas@fjasle.eu>
1 parent a7c79cf commit b957df3

File tree

8 files changed

+10
-10
lines changed

8 files changed

+10
-10
lines changed

arch/arm64/kernel/vdso32/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ $(obj)/vdso32.so.dbg: $(obj)/vdso.so.raw $(obj)/$(munge) FORCE
136136
$(call if_changed,vdsomunge)
137137

138138
# Link rule for the .so file, .lds has to be first
139-
$(obj)/vdso.so.raw: $(src)/vdso.lds $(obj-vdso) FORCE
139+
$(obj)/vdso.so.raw: $(obj)/vdso.lds $(obj-vdso) FORCE
140140
$(call if_changed,vdsold_and_vdso_check)
141141

142142
# Compilation rules for the vDSO sources

arch/csky/kernel/vdso/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ KCOV_INSTRUMENT := n
3131
$(obj)/vdso.o: $(obj)/vdso.so
3232

3333
SYSCFLAGS_vdso.so.dbg = $(c_flags)
34-
$(obj)/vdso.so.dbg: $(src)/vdso.lds $(obj-vdso) FORCE
34+
$(obj)/vdso.so.dbg: $(obj)/vdso.lds $(obj-vdso) FORCE
3535
$(call if_changed,vdsold)
3636
SYSCFLAGS_vdso.so.dbg = -shared -s -Wl,-soname=linux-vdso.so.1 \
3737
-Wl,--build-id=sha1 -Wl,--hash-style=both

arch/parisc/kernel/vdso32/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ $(obj)/vdso32_wrapper.o : $(obj)/vdso32.so FORCE
2626

2727
# Force dependency (incbin is bad)
2828
# link rule for the .so file, .lds has to be first
29-
$(obj)/vdso32.so: $(src)/vdso32.lds $(obj-vdso32) $(VDSO_LIBGCC) FORCE
29+
$(obj)/vdso32.so: $(obj)/vdso32.lds $(obj-vdso32) $(VDSO_LIBGCC) FORCE
3030
$(call if_changed,vdso32ld)
3131

3232
# assembly rules for the .S files

arch/parisc/kernel/vdso64/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ $(obj)/vdso64_wrapper.o : $(obj)/vdso64.so FORCE
2626

2727
# Force dependency (incbin is bad)
2828
# link rule for the .so file, .lds has to be first
29-
$(obj)/vdso64.so: $(src)/vdso64.lds $(obj-vdso64) $(VDSO_LIBGCC) FORCE
29+
$(obj)/vdso64.so: $(obj)/vdso64.lds $(obj-vdso64) $(VDSO_LIBGCC) FORCE
3030
$(call if_changed,vdso64ld)
3131

3232
# assembly rules for the .S files

arch/powerpc/kernel/vdso/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@ targets += vdso64.lds
7474
CPPFLAGS_vdso64.lds += -P -C
7575

7676
# link rule for the .so file, .lds has to be first
77-
$(obj)/vdso32.so.dbg: $(src)/vdso32.lds $(obj-vdso32) $(obj)/vgettimeofday-32.o FORCE
77+
$(obj)/vdso32.so.dbg: $(obj)/vdso32.lds $(obj-vdso32) $(obj)/vgettimeofday-32.o FORCE
7878
$(call if_changed,vdso32ld_and_check)
79-
$(obj)/vdso64.so.dbg: $(src)/vdso64.lds $(obj-vdso64) $(obj)/vgettimeofday-64.o FORCE
79+
$(obj)/vdso64.so.dbg: $(obj)/vdso64.lds $(obj-vdso64) $(obj)/vgettimeofday-64.o FORCE
8080
$(call if_changed,vdso64ld_and_check)
8181

8282
# assembly rules for the .S files

arch/s390/kernel/vdso32/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ $(obj)/vdso32_wrapper.o : $(obj)/vdso32.so
4444
quiet_cmd_vdso_and_check = VDSO $@
4545
cmd_vdso_and_check = $(cmd_ld); $(cmd_vdso_check)
4646

47-
$(obj)/vdso32.so.dbg: $(src)/vdso32.lds $(obj-vdso32) FORCE
47+
$(obj)/vdso32.so.dbg: $(obj)/vdso32.lds $(obj-vdso32) FORCE
4848
$(call if_changed,vdso_and_check)
4949

5050
# strip rule for the .so file

arch/s390/kernel/vdso64/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ quiet_cmd_vdso_and_check = VDSO $@
5050
cmd_vdso_and_check = $(cmd_ld); $(cmd_vdso_check)
5151

5252
# link rule for the .so file, .lds has to be first
53-
$(obj)/vdso64.so.dbg: $(src)/vdso64.lds $(obj-vdso64) $(obj-cvdso64) FORCE
53+
$(obj)/vdso64.so.dbg: $(obj)/vdso64.lds $(obj-vdso64) $(obj-cvdso64) FORCE
5454
$(call if_changed,vdso_and_check)
5555

5656
# strip rule for the .so file

arch/sh/kernel/vsyscall/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ vsyscall-flags = -shared -s -Wl,-soname=linux-gate.so.1 -Wl,--hash-style=sysv
1919
SYSCFLAGS_vsyscall-trapa.so = $(vsyscall-flags)
2020

2121
$(obj)/vsyscall-trapa.so: \
22-
$(obj)/vsyscall-%.so: $(src)/vsyscall.lds $(obj)/vsyscall-%.o FORCE
22+
$(obj)/vsyscall-%.so: $(obj)/vsyscall.lds $(obj)/vsyscall-%.o FORCE
2323
$(call if_changed,syscall)
2424

2525
# We also create a special relocatable object that should mirror the symbol
2626
# table and layout of the linked DSO. With ld -R we can then refer to
2727
# these symbols in the kernel code rather than hand-coded addresses.
2828
SYSCFLAGS_vsyscall-dummy.o = -r
29-
$(obj)/vsyscall-dummy.o: $(src)/vsyscall.lds \
29+
$(obj)/vsyscall-dummy.o: $(obj)/vsyscall.lds \
3030
$(obj)/vsyscall-trapa.o $(obj)/vsyscall-note.o FORCE
3131
$(call if_changed,syscall)
3232

0 commit comments

Comments
 (0)