From 18ce6a6f23f78cb14a8833f008342a892d8925f9 Mon Sep 17 00:00:00 2001 From: Andrew Cooper Date: Wed, 9 May 2018 18:06:46 +0100 Subject: [PATCH] x86/emul: Fix emulator test harness build following a backport of 7c508612 The x86 emulator doesn't need to employ any Spectre v2 mitigations. Signed-off-by: Andrew Cooper (cherry picked from commit 44c709e6304b199352a8574738cb4a8c549491c2) Gbp-Pq: Name x86emul-fix-emulator-test-harness-build-.patch1 --- tools/tests/x86_emulator/x86_emulate.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/tests/x86_emulator/x86_emulate.c b/tools/tests/x86_emulator/x86_emulate.c index 58cfd8ae7d..ed3280b9dc 100644 --- a/tools/tests/x86_emulator/x86_emulate.c +++ b/tools/tests/x86_emulator/x86_emulate.c @@ -53,4 +53,9 @@ typedef bool bool_t; #define likely(x) __builtin_expect(!!(x), true) #define unlikely(x) __builtin_expect(!!(x), false) +/* No Spectre mitigations needed for the test harness. */ +asm (".macro INDIRECT_CALL arg:req\n\t" + "call *\\arg\n\t" + ".endm"); + #include "x86_emulate/x86_emulate.c" -- 2.30.2