blob: 060ba058358f33380099d9184540fef6c8428b71 [file] [log] [blame]
Patrick Williamsdb4c27e2022-08-05 08:10:29 -05001From 1cea308a647c2a2f9790b0bac7c523de7aa83270 Mon Sep 17 00:00:00 2001
Andrew Geissler615f2f12022-07-15 14:00:58 -05002From: Ross Burton <ross.burton@arm.com>
3Date: Tue, 12 Jul 2022 15:03:54 +0100
4Subject: [PATCH] kvm: use $(LD) instead of hardcoding ld
5
6In cross-compiled builds the host ld may not know the required ELF format,
7so ensure we use $(LD) which will be the cross-capable ld binary.
8
Patrick Williamsdb4c27e2022-08-05 08:10:29 -05009Closes: https://github.com/linux-test-project/ltp/pull/948
10
11Upstream-Status: Backport [https://github.com/linux-test-project/ltp/commit/f94e0ef3b7280f886384703ef9019aaf2f2dfebb]
Andrew Geissler615f2f12022-07-15 14:00:58 -050012Signed-off-by: Ross Burton <ross.burton@arm.com>
Patrick Williamsdb4c27e2022-08-05 08:10:29 -050013
14Reviewed-by: Petr Vorel <pvorel@suse.cz>
15Reviewed-by: Martin Doucha <mdoucha@suse.cz>
16Signed-off-by: Ross Burton <ross.burton@arm.com>
17Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Andrew Geissler615f2f12022-07-15 14:00:58 -050018---
19 testcases/kernel/kvm/Makefile | 4 ++--
20 1 file changed, 2 insertions(+), 2 deletions(-)
21
22diff --git a/testcases/kernel/kvm/Makefile b/testcases/kernel/kvm/Makefile
Patrick Williamsdb4c27e2022-08-05 08:10:29 -050023index adab56952..d67230735 100644
Andrew Geissler615f2f12022-07-15 14:00:58 -050024--- a/testcases/kernel/kvm/Makefile
25+++ b/testcases/kernel/kvm/Makefile
26@@ -50,11 +50,11 @@ include $(top_srcdir)/include/mk/generic_leaf_target.mk
27 ifdef VERBOSE
28 $(CC) $(GUEST_CPPFLAGS) $(GUEST_CFLAGS) $(GUEST_LDFLAGS) -o $*-payload.elf $^ $(GUEST_LDLIBS)
29 objcopy -O binary -j .init.boot -j .text -j .data -j .init -j .preinit_array -j .init_array --gap-fill=0 $*-payload.elf $*-payload.bin
Patrick Williamsdb4c27e2022-08-05 08:10:29 -050030- ld -z noexecstack -r -T $(abs_srcdir)/linker/payload.lds --oformat=$(BIN_FORMAT) -o $@ $*-payload.bin
31+ $(LD) -z noexecstack -r -T $(abs_srcdir)/linker/payload.lds --oformat=$(BIN_FORMAT) -o $@ $*-payload.bin
Andrew Geissler615f2f12022-07-15 14:00:58 -050032 else
33 @$(CC) $(GUEST_CPPFLAGS) $(GUEST_CFLAGS) $(GUEST_LDFLAGS) -o $*-payload.elf $^ $(GUEST_LDLIBS)
34 @objcopy -O binary -j .init.boot -j .text -j .data -j .init -j .preinit_array -j .init_array --gap-fill=0 $*-payload.elf $*-payload.bin
Patrick Williamsdb4c27e2022-08-05 08:10:29 -050035- @ld -z noexecstack -r -T $(abs_srcdir)/linker/payload.lds --oformat=$(BIN_FORMAT) -o $@ $*-payload.bin
36+ @$(LD) -z noexecstack -r -T $(abs_srcdir)/linker/payload.lds --oformat=$(BIN_FORMAT) -o $@ $*-payload.bin
Andrew Geissler615f2f12022-07-15 14:00:58 -050037 @echo KVM_CC $(target_rel_dir)$@
38 endif
39 @rm $*-payload.elf $*-payload.bin