From: Richard Henderson <richard.henderson@linaro.org>
Date: Fri, 30 Nov 2018 20:31:59 +0000 (-0800)
Subject: tcg/i386: Return false on failure from patch_reloc
X-Git-Tag: v4.0.0-rc0~205^2~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bec3afd5fc6ab0b6e9d8a01575d58db8d1ad82ce;p=thirdparty%2Fqemu.git

tcg/i386: Return false on failure from patch_reloc

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---

diff --git a/tcg/i386/tcg-target.inc.c b/tcg/i386/tcg-target.inc.c
index 5c88f1f36be..28192f46083 100644
--- a/tcg/i386/tcg-target.inc.c
+++ b/tcg/i386/tcg-target.inc.c
@@ -175,7 +175,7 @@ static bool patch_reloc(tcg_insn_unit *code_ptr, int type,
     case R_386_PC32:
         value -= (uintptr_t)code_ptr;
         if (value != (int32_t)value) {
-            tcg_abort();
+            return false;
         }
         /* FALLTHRU */
     case R_386_32:
@@ -184,7 +184,7 @@ static bool patch_reloc(tcg_insn_unit *code_ptr, int type,
     case R_386_PC8:
         value -= (uintptr_t)code_ptr;
         if (value != (int8_t)value) {
-            tcg_abort();
+            return false;
         }
         tcg_patch8(code_ptr, value);
         break;