From e44877a4545d55332a9358f8b9e3468f5c1782f7 Mon Sep 17 00:00:00 2001
From: Adeel <3840695+am11@users.noreply.github.com>
Date: Wed, 1 Dec 2021 08:36:36 +0200
Subject: Skip init_mem_validate calls during remote unwind

---
 src/aarch64/Gglobal.c | 2 +-
 src/riscv/Gglobal.c   | 3 ++-
 src/s390x/Gglobal.c   | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/aarch64/Gglobal.c b/src/aarch64/Gglobal.c
index 2987f2af..23bececa 100644
--- a/src/aarch64/Gglobal.c
+++ b/src/aarch64/Gglobal.c
@@ -47,9 +47,9 @@ tdep_init (void)
 
     dwarf_init ();
 
+#ifndef UNW_REMOTE_ONLY
     tdep_init_mem_validate ();
 
-#ifndef UNW_REMOTE_ONLY
     aarch64_local_addr_space_init ();
 #endif
     atomic_store(&tdep_init_done, 1); /* signal that we're initialized... */
diff --git a/src/riscv/Gglobal.c b/src/riscv/Gglobal.c
index 65f11b35..cb8009e1 100644
--- a/src/riscv/Gglobal.c
+++ b/src/riscv/Gglobal.c
@@ -115,9 +115,10 @@ tdep_init (void)
 
   mi_init ();
   dwarf_init ();
-  tdep_init_mem_validate ();
 
 #ifndef UNW_REMOTE_ONLY
+  tdep_init_mem_validate ();
+
   riscv_local_addr_space_init ();
 #endif
   atomic_store(&tdep_init_done, 1);  /* signal that we're initialized... */
diff --git a/src/s390x/Gglobal.c b/src/s390x/Gglobal.c
index be49c3f6..20544a57 100644
--- a/src/s390x/Gglobal.c
+++ b/src/s390x/Gglobal.c
@@ -89,9 +89,9 @@ tdep_init (void)
 
     dwarf_init ();
 
+#ifndef UNW_REMOTE_ONLY
     tdep_init_mem_validate ();
 
-#ifndef UNW_REMOTE_ONLY
     s390x_local_addr_space_init ();
 #endif
     atomic_store(&tdep_init_done, 1); /* signal that we're initialized... */
-- 
cgit v1.2.1