mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-17 09:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

ltp: fix builds when host ld doesn't know about target ELF formats

Browse Source 
The kvm tests use the host ld, which doesn't necessarily know about the
target ELF format.  It should be using the cross ld we built, so call
$(LD) instead.

(From OE-Core rev: 4065c5b69830ea81fbde23263ece55f6f12e5d71)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2022-07-12 15:37:34 +01:00
committed by Richard Purdie
parent d22eb3c31a
commit e65ee81d62
2 changed files with 38 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
meta/recipes-extended/ltp/ltp/0001-kvm-use-LD-instead-of-hardcoding-ld.patch Normal file
View File

@@ -0,0 +1,37 @@
Upstream-Status: Submitted [https://github.com/linux-test-project/ltp/pull/948]
Signed-off-by: Ross Burton <ross.burton@arm.com>
From 7670233e43df2aed6d44b96c51b034f8e2d28a19 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.
Signed-off-by: Ross Burton <ross.burton@arm.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 69a9946fe..4ddef9f95 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 -r -T $(abs_srcdir)/linker/payload.lds --oformat=$(BIN_FORMAT) -o $@ $*-payload.bin
+ $(LD) -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 -r -T $(abs_srcdir)/linker/payload.lds --oformat=$(BIN_FORMAT) -o $@ $*-payload.bin
+ @$(LD) -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
--
2.34.1

1
meta/recipes-extended/ltp/ltp_20220527.bb
View File

@@ -28,6 +28,7 @@ SRCREV = "6f88e0f6f1d6eb12c48c902f50f47ecbd3b0f18a"
SRC_URI = "git://github.com/linux-test-project/ltp.git;branch=master;protocol=https \
file://0001-Remove-OOM-tests-from-runtest-mm.patch \
file://disable_hanging_tests.patch \
file://0001-kvm-use-LD-instead-of-hardcoding-ld.patch \
"
S = "${WORKDIR}/git"