Mailing List Archive

[xen staging] x86emul: make run32 test harness goal work again
commit 9ee7dc877b8754ce2fc82500feea52c04d4e6409
Author: Jan Beulich <jbeulich@suse.com>
AuthorDate: Thu Feb 22 11:54:32 2024 +0100
Commit: Jan Beulich <jbeulich@suse.com>
CommitDate: Thu Feb 22 11:54:32 2024 +0100

x86emul: make run32 test harness goal work again

When re-working library call wrapping the sed invocation didn't account
for all sources living in the parent directory when building the 32-bit
harness binary.

Fixes: 6fba45ca3be1 ("x86emul: rework wrapping of libc functions in test and fuzzing harnesses")
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
tools/tests/x86_emulator/Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/tests/x86_emulator/Makefile b/tools/tests/x86_emulator/Makefile
index b45ad09c28..834b2112e7 100644
--- a/tools/tests/x86_emulator/Makefile
+++ b/tools/tests/x86_emulator/Makefile
@@ -255,7 +255,8 @@ OBJS := x86-emulate.o cpuid.o test_x86_emulator.o evex-disp8.o predicates.o wrap
OBJS += x86_emulate/0f01.o x86_emulate/0fae.o x86_emulate/0fc7.o
OBJS += x86_emulate/blk.o x86_emulate/decode.o x86_emulate/fpu.o x86_emulate/util.o

-WRAPPED := $(shell sed -n 's,^ *WRAP(\([[:alnum:]_]*\));,\1,p' x86-emulate.h)
+WRAPPED := $(shell sed -n 's,^ *WRAP(\([[:alnum:]_]*\));,\1,p' \
+ $(firstword $(wildcard ../x86-emulate.h) x86-emulate.h))

$(TARGET): $(OBJS)
$(HOSTCC) $(HOSTCFLAGS) $(addprefix -Wl$(comma)--wrap=,$(WRAPPED)) -o $@ $^
--
generated by git-patchbot for /home/xen/git/xen.git#staging