| Message ID | 6da6639d-f11b-47ac-af50-071d451fa60a@suse.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | x86emul: make run32 test harness goal work again | expand |
On 21/02/2024 10:27 am, Jan Beulich wrote: > 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>
--- a/tools/tests/x86_emulator/Makefile +++ b/tools/tests/x86_emulator/Makefile @@ -255,7 +255,8 @@ OBJS := x86-emulate.o cpuid.o test_x86_e 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 $@ $^
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>