| From 1cea308a647c2a2f9790b0bac7c523de7aa83270 Mon Sep 17 00:00:00 2001 |
| From: Ross Burton <ross.burton@arm.com> |
| Date: Tue, 12 Jul 2022 15:03:54 +0100 |
| Subject: [PATCH] kvm: use $(LD) instead of hardcoding ld |
| |
| In cross-compiled builds the host ld may not know the required ELF format, |
| so ensure we use $(LD) which will be the cross-capable ld binary. |
| |
| Closes: https://github.com/linux-test-project/ltp/pull/948 |
| |
| Upstream-Status: Backport [https://github.com/linux-test-project/ltp/commit/f94e0ef3b7280f886384703ef9019aaf2f2dfebb] |
| Signed-off-by: Ross Burton <ross.burton@arm.com> |
| |
| Reviewed-by: Petr Vorel <pvorel@suse.cz> |
| Reviewed-by: Martin Doucha <mdoucha@suse.cz> |
| Signed-off-by: Ross Burton <ross.burton@arm.com> |
| Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
| --- |
| testcases/kernel/kvm/Makefile | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/testcases/kernel/kvm/Makefile b/testcases/kernel/kvm/Makefile |
| index adab56952..d67230735 100644 |
| --- a/testcases/kernel/kvm/Makefile |
| +++ b/testcases/kernel/kvm/Makefile |
| @@ -50,11 +50,11 @@ include $(top_srcdir)/include/mk/generic_leaf_target.mk |
| ifdef VERBOSE |
| $(CC) $(GUEST_CPPFLAGS) $(GUEST_CFLAGS) $(GUEST_LDFLAGS) -o $*-payload.elf $^ $(GUEST_LDLIBS) |
| 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 |
| - ld -z noexecstack -r -T $(abs_srcdir)/linker/payload.lds --oformat=$(BIN_FORMAT) -o $@ $*-payload.bin |
| + $(LD) -z noexecstack -r -T $(abs_srcdir)/linker/payload.lds --oformat=$(BIN_FORMAT) -o $@ $*-payload.bin |
| else |
| @$(CC) $(GUEST_CPPFLAGS) $(GUEST_CFLAGS) $(GUEST_LDFLAGS) -o $*-payload.elf $^ $(GUEST_LDLIBS) |
| @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 |
| - @ld -z noexecstack -r -T $(abs_srcdir)/linker/payload.lds --oformat=$(BIN_FORMAT) -o $@ $*-payload.bin |
| + @$(LD) -z noexecstack -r -T $(abs_srcdir)/linker/payload.lds --oformat=$(BIN_FORMAT) -o $@ $*-payload.bin |
| @echo KVM_CC $(target_rel_dir)$@ |
| endif |
| @rm $*-payload.elf $*-payload.bin |