Fix remote unwinding on win-arm64

dotnet · Dec 10, 2021 · 22e93a0 · 22e93a0
1 parent 0e3e95c
commit 22e93a0
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/src/coreclr/pal/src/libunwind/libunwind-version.txt b/src/coreclr/pal/src/libunwind/libunwind-version.txt
@@ -4,3 +4,4 @@ https://github.com/libunwind/libunwind/commit/b3ca1b59a795a617877c01fe5d299ab7a0
 Replace CMakeLists.txt, src/CMakeLists.txt, configure.cmake with .NET custom version
 Keep .NET oop directory
 Reapply changes from https://github.com/dotnet/runtime/commit/1b5719c2e3dde393531eaeb5b5cde05dabeef5b8
+Apply https://github.com/libunwind/libunwind/pull/317
diff --git a/src/coreclr/pal/src/libunwind/src/aarch64/Gglobal.c b/src/coreclr/pal/src/libunwind/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/coreclr/pal/src/libunwind/src/riscv/Gglobal.c b/src/coreclr/pal/src/libunwind/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/coreclr/pal/src/libunwind/src/s390x/Gglobal.c b/src/coreclr/pal/src/libunwind/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... */