arch: use $(obj)/ instead of $(src)/ for preprocessed linker scripts
JIRA: https://issues.redhat.com/browse/RHEL-107194 Conflicts: dropped changes to parisc from the upstream commit, since RHEL 9 does not have "parisc: Add vDSO support" and later changes. commit b957df3b858d16ba3d4291233569bba09cfd08c7 Author: Masahiro Yamada <masahiroy@kernel.org> Date: Sat Apr 27 23:54:59 2024 +0900 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> Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
This commit is contained in:
parent
4763b1c733
commit
20d30d8fa5
|
@ -136,7 +136,7 @@ $(obj)/vdso.so.dbg: $(obj)/vdso.so.raw $(obj)/$(munge) FORCE
|
|||
$(call if_changed,vdsomunge)
|
||||
|
||||
# Link rule for the .so file, .lds has to be first
|
||||
$(obj)/vdso.so.raw: $(src)/vdso.lds $(obj-vdso) FORCE
|
||||
$(obj)/vdso.so.raw: $(obj)/vdso.lds $(obj-vdso) FORCE
|
||||
$(call if_changed,vdsold_and_vdso_check)
|
||||
|
||||
# Compilation rules for the vDSO sources
|
||||
|
|
|
@ -31,7 +31,7 @@ KCOV_INSTRUMENT := n
|
|||
$(obj)/vdso.o: $(obj)/vdso.so
|
||||
|
||||
SYSCFLAGS_vdso.so.dbg = $(c_flags)
|
||||
$(obj)/vdso.so.dbg: $(src)/vdso.lds $(obj-vdso) FORCE
|
||||
$(obj)/vdso.so.dbg: $(obj)/vdso.lds $(obj-vdso) FORCE
|
||||
$(call if_changed,vdsold)
|
||||
SYSCFLAGS_vdso.so.dbg = -shared -s -Wl,-soname=linux-vdso.so.1 \
|
||||
-Wl,--build-id=sha1 -Wl,--hash-style=both
|
||||
|
|
|
@ -61,9 +61,9 @@ targets += vdso64.lds
|
|||
CPPFLAGS_vdso64.lds += -P -C -U$(ARCH)
|
||||
|
||||
# link rule for the .so file, .lds has to be first
|
||||
$(obj)/vdso32.so.dbg: $(src)/vdso32.lds $(obj-vdso32) $(obj)/vgettimeofday-32.o FORCE
|
||||
$(obj)/vdso32.so.dbg: $(obj)/vdso32.lds $(obj-vdso32) $(obj)/vgettimeofday-32.o FORCE
|
||||
$(call if_changed,vdso32ld_and_check)
|
||||
$(obj)/vdso64.so.dbg: $(src)/vdso64.lds $(obj-vdso64) $(obj)/vgettimeofday-64.o FORCE
|
||||
$(obj)/vdso64.so.dbg: $(obj)/vdso64.lds $(obj-vdso64) $(obj)/vgettimeofday-64.o FORCE
|
||||
$(call if_changed,vdso64ld_and_check)
|
||||
|
||||
# assembly rules for the .S files
|
||||
|
|
|
@ -46,7 +46,7 @@ $(obj)/vdso32_wrapper.o : $(obj)/vdso32.so
|
|||
quiet_cmd_vdso_and_check = VDSO $@
|
||||
cmd_vdso_and_check = $(cmd_ld); $(cmd_vdso_check)
|
||||
|
||||
$(obj)/vdso32.so.dbg: $(src)/vdso32.lds $(obj-vdso32) FORCE
|
||||
$(obj)/vdso32.so.dbg: $(obj)/vdso32.lds $(obj-vdso32) FORCE
|
||||
$(call if_changed,vdso_and_check)
|
||||
|
||||
# strip rule for the .so file
|
||||
|
|
|
@ -52,7 +52,7 @@ quiet_cmd_vdso_and_check = VDSO $@
|
|||
cmd_vdso_and_check = $(cmd_ld); $(cmd_vdso_check)
|
||||
|
||||
# link rule for the .so file, .lds has to be first
|
||||
$(obj)/vdso64.so.dbg: $(src)/vdso64.lds $(obj-vdso64) $(obj-cvdso64) FORCE
|
||||
$(obj)/vdso64.so.dbg: $(obj)/vdso64.lds $(obj-vdso64) $(obj-cvdso64) FORCE
|
||||
$(call if_changed,vdso_and_check)
|
||||
|
||||
# strip rule for the .so file
|
||||
|
|
|
@ -20,14 +20,14 @@ vsyscall-flags = -shared -s -Wl,-soname=linux-gate.so.1 -Wl,--hash-style=sysv
|
|||
SYSCFLAGS_vsyscall-trapa.so = $(vsyscall-flags)
|
||||
|
||||
$(obj)/vsyscall-trapa.so: \
|
||||
$(obj)/vsyscall-%.so: $(src)/vsyscall.lds $(obj)/vsyscall-%.o FORCE
|
||||
$(obj)/vsyscall-%.so: $(obj)/vsyscall.lds $(obj)/vsyscall-%.o FORCE
|
||||
$(call if_changed,syscall)
|
||||
|
||||
# We also create a special relocatable object that should mirror the symbol
|
||||
# table and layout of the linked DSO. With ld -R we can then refer to
|
||||
# these symbols in the kernel code rather than hand-coded addresses.
|
||||
SYSCFLAGS_vsyscall-dummy.o = -r
|
||||
$(obj)/vsyscall-dummy.o: $(src)/vsyscall.lds \
|
||||
$(obj)/vsyscall-dummy.o: $(obj)/vsyscall.lds \
|
||||
$(obj)/vsyscall-trapa.o $(obj)/vsyscall-note.o FORCE
|
||||
$(call if_changed,syscall)
|
||||
|
||||
|
|
Loading…
Reference in New Issue