From adb76ba9f14fce813ef95d1657935f4493efeeea Mon Sep 17 00:00:00 2001
From: Dan Gohman <sunfish@mozilla.com>
Date: Wed, 28 Nov 2018 13:53:19 -0800
Subject: [PATCH] Avoid casting to/from greg_t, which doesn't work consistently
 across platforms.

---
 lib/execute/signalhandlers/SignalHandlers.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/execute/signalhandlers/SignalHandlers.cpp b/lib/execute/signalhandlers/SignalHandlers.cpp
index 422b4446c9..59b8e45810 100644
--- a/lib/execute/signalhandlers/SignalHandlers.cpp
+++ b/lib/execute/signalhandlers/SignalHandlers.cpp
@@ -329,7 +329,7 @@ static void
 SetContextPC(CONTEXT* context, const uint8_t* pc)
 {
 #ifdef PC_sig
-    PC_sig(context) = reinterpret_cast<greg_t>(pc);
+    PC_sig(context) = reinterpret_cast<uintptr_t>(pc);
 #else
     abort();
 #endif
@@ -339,7 +339,7 @@ static const uint8_t*
 ContextToPC(CONTEXT* context)
 {
 #ifdef PC_sig
-    return reinterpret_cast<const uint8_t*>(PC_sig(context));
+    return reinterpret_cast<const uint8_t*>(static_cast<uintptr_t>(PC_sig(context)));
 #else
     abort();
 #endif