From 6e94f6414ce56e9cb8885fa3ea1b30e1e3bb34f8 Mon Sep 17 00:00:00 2001
From: Adeel <3840695+am11@users.noreply.github.com>
Date: Tue, 19 Jul 2022 06:26:53 +0300
Subject: [PATCH] Move llvm-libunwind to src/native/external

---
 eng/native/functions.cmake                    |  3 +-
 src/coreclr/nativeaot/Runtime/CMakeLists.txt  | 43 ++++---------------
 .../nativeaot/Runtime/unix/UnwindHelpers.cpp  | 10 ++---
 .../external/llvm-libunwind-version.txt       |  5 +++
 src/native/external/llvm-libunwind.cmake      | 23 ++++++++++
 .../external/llvm-libunwind}/.arcconfig       |  0
 .../external/llvm-libunwind}/.clang-format    |  0
 .../external/llvm-libunwind}/CMakeLists.txt   |  0
 .../external/llvm-libunwind}/LICENSE.TXT      |  0
 .../cmake/Modules/HandleCompilerRT.cmake      |  0
 .../llvm-libunwind}/cmake/config-ix.cmake     |  0
 .../docs/BuildingLibunwind.rst                |  0
 .../llvm-libunwind}/docs/CMakeLists.txt       |  0
 .../external/llvm-libunwind}/docs/README.txt  |  0
 .../external/llvm-libunwind}/docs/conf.py     |  0
 .../external/llvm-libunwind}/docs/index.rst   |  0
 .../include/__libunwind_config.h              |  0
 .../llvm-libunwind}/include/libunwind.h       |  0
 .../include/mach-o/compact_unwind_encoding.h  |  0
 .../external/llvm-libunwind}/include/unwind.h |  0
 .../llvm-libunwind}/src/AddressSpace.hpp      |  0
 .../llvm-libunwind}/src/CMakeLists.txt        |  0
 .../llvm-libunwind}/src/CompactUnwinder.hpp   |  0
 .../llvm-libunwind}/src/DwarfInstructions.hpp |  0
 .../llvm-libunwind}/src/DwarfParser.hpp       |  0
 .../llvm-libunwind}/src/EHHeaderParser.hpp    |  0
 .../external/llvm-libunwind}/src/RWMutex.hpp  |  0
 .../llvm-libunwind}/src/Registers.hpp         |  0
 .../llvm-libunwind}/src/Unwind-EHABI.cpp      |  0
 .../llvm-libunwind}/src/Unwind-EHABI.h        |  0
 .../llvm-libunwind}/src/Unwind-seh.cpp        |  0
 .../llvm-libunwind}/src/Unwind-sjlj.c         |  0
 .../llvm-libunwind}/src/UnwindCursor.hpp      |  0
 .../src/UnwindLevel1-gcc-ext.c                |  0
 .../llvm-libunwind}/src/UnwindLevel1.c        |  0
 .../src/UnwindRegistersRestore.S              |  0
 .../llvm-libunwind}/src/UnwindRegistersSave.S |  0
 .../src/Unwind_AppleExtras.cpp                |  0
 .../external/llvm-libunwind}/src/assembly.h   |  0
 .../external/llvm-libunwind}/src/config.h     |  0
 .../external/llvm-libunwind}/src/dwarf2.h     |  0
 .../llvm-libunwind}/src/libunwind.cpp         |  0
 .../llvm-libunwind}/src/libunwind_ext.h       |  0
 .../external/llvm-libunwind}/src/unwind_ext.h |  0
 .../llvm-libunwind}/test/CMakeLists.txt       |  0
 .../llvm-libunwind}/test/alignment.pass.cpp   |  0
 .../test/libunwind/__init__.py                |  0
 .../test/libunwind/test/__init__.py           |  0
 .../test/libunwind/test/config.py             |  0
 .../test/libunwind_01.pass.cpp                |  0
 .../test/libunwind_02.pass.cpp                |  0
 .../external/llvm-libunwind}/test/lit.cfg     |  0
 .../llvm-libunwind}/test/lit.site.cfg.in      |  0
 .../test/unw_getcontext.pass.cpp              |  0
 54 files changed, 43 insertions(+), 41 deletions(-)
 create mode 100644 src/native/external/llvm-libunwind-version.txt
 create mode 100644 src/native/external/llvm-libunwind.cmake
 rename src/{coreclr/nativeaot/libunwind => native/external/llvm-libunwind}/.arcconfig (100%)
 rename src/{coreclr/nativeaot/libunwind => native/external/llvm-libunwind}/.clang-format (100%)
 rename src/{coreclr/nativeaot/libunwind => native/external/llvm-libunwind}/CMakeLists.txt (100%)
 rename src/{coreclr/nativeaot/libunwind => native/external/llvm-libunwind}/LICENSE.TXT (100%)
 rename src/{coreclr/nativeaot/libunwind => native/external/llvm-libunwind}/cmake/Modules/HandleCompilerRT.cmake (100%)
 rename src/{coreclr/nativeaot/libunwind => native/external/llvm-libunwind}/cmake/config-ix.cmake (100%)
 rename src/{coreclr/nativeaot/libunwind => native/external/llvm-libunwind}/docs/BuildingLibunwind.rst (100%)
 rename src/{coreclr/nativeaot/libunwind => native/external/llvm-libunwind}/docs/CMakeLists.txt (100%)
 rename src/{coreclr/nativeaot/libunwind => native/external/llvm-libunwind}/docs/README.txt (100%)
 rename src/{coreclr/nativeaot/libunwind => native/external/llvm-libunwind}/docs/conf.py (100%)
 rename src/{coreclr/nativeaot/libunwind => native/external/llvm-libunwind}/docs/index.rst (100%)
 rename src/{coreclr/nativeaot/libunwind => native/external/llvm-libunwind}/include/__libunwind_config.h (100%)
 rename src/{coreclr/nativeaot/libunwind => native/external/llvm-libunwind}/include/libunwind.h (100%)
 rename src/{coreclr/nativeaot/libunwind => native/external/llvm-libunwind}/include/mach-o/compact_unwind_encoding.h (100%)
 rename src/{coreclr/nativeaot/libunwind => native/external/llvm-libunwind}/include/unwind.h (100%)
 rename src/{coreclr/nativeaot/libunwind => native/external/llvm-libunwind}/src/AddressSpace.hpp (100%)
 rename src/{coreclr/nativeaot/libunwind => native/external/llvm-libunwind}/src/CMakeLists.txt (100%)
 rename src/{coreclr/nativeaot/libunwind => native/external/llvm-libunwind}/src/CompactUnwinder.hpp (100%)
 rename src/{coreclr/nativeaot/libunwind => native/external/llvm-libunwind}/src/DwarfInstructions.hpp (100%)
 rename src/{coreclr/nativeaot/libunwind => native/external/llvm-libunwind}/src/DwarfParser.hpp (100%)
 rename src/{coreclr/nativeaot/libunwind => native/external/llvm-libunwind}/src/EHHeaderParser.hpp (100%)
 rename src/{coreclr/nativeaot/libunwind => native/external/llvm-libunwind}/src/RWMutex.hpp (100%)
 rename src/{coreclr/nativeaot/libunwind => native/external/llvm-libunwind}/src/Registers.hpp (100%)
 rename src/{coreclr/nativeaot/libunwind => native/external/llvm-libunwind}/src/Unwind-EHABI.cpp (100%)
 rename src/{coreclr/nativeaot/libunwind => native/external/llvm-libunwind}/src/Unwind-EHABI.h (100%)
 rename src/{coreclr/nativeaot/libunwind => native/external/llvm-libunwind}/src/Unwind-seh.cpp (100%)
 rename src/{coreclr/nativeaot/libunwind => native/external/llvm-libunwind}/src/Unwind-sjlj.c (100%)
 rename src/{coreclr/nativeaot/libunwind => native/external/llvm-libunwind}/src/UnwindCursor.hpp (100%)
 rename src/{coreclr/nativeaot/libunwind => native/external/llvm-libunwind}/src/UnwindLevel1-gcc-ext.c (100%)
 rename src/{coreclr/nativeaot/libunwind => native/external/llvm-libunwind}/src/UnwindLevel1.c (100%)
 rename src/{coreclr/nativeaot/libunwind => native/external/llvm-libunwind}/src/UnwindRegistersRestore.S (100%)
 rename src/{coreclr/nativeaot/libunwind => native/external/llvm-libunwind}/src/UnwindRegistersSave.S (100%)
 rename src/{coreclr/nativeaot/libunwind => native/external/llvm-libunwind}/src/Unwind_AppleExtras.cpp (100%)
 rename src/{coreclr/nativeaot/libunwind => native/external/llvm-libunwind}/src/assembly.h (100%)
 rename src/{coreclr/nativeaot/libunwind => native/external/llvm-libunwind}/src/config.h (100%)
 rename src/{coreclr/nativeaot/libunwind => native/external/llvm-libunwind}/src/dwarf2.h (100%)
 rename src/{coreclr/nativeaot/libunwind => native/external/llvm-libunwind}/src/libunwind.cpp (100%)
 rename src/{coreclr/nativeaot/libunwind => native/external/llvm-libunwind}/src/libunwind_ext.h (100%)
 rename src/{coreclr/nativeaot/libunwind => native/external/llvm-libunwind}/src/unwind_ext.h (100%)
 rename src/{coreclr/nativeaot/libunwind => native/external/llvm-libunwind}/test/CMakeLists.txt (100%)
 rename src/{coreclr/nativeaot/libunwind => native/external/llvm-libunwind}/test/alignment.pass.cpp (100%)
 rename src/{coreclr/nativeaot/libunwind => native/external/llvm-libunwind}/test/libunwind/__init__.py (100%)
 rename src/{coreclr/nativeaot/libunwind => native/external/llvm-libunwind}/test/libunwind/test/__init__.py (100%)
 rename src/{coreclr/nativeaot/libunwind => native/external/llvm-libunwind}/test/libunwind/test/config.py (100%)
 rename src/{coreclr/nativeaot/libunwind => native/external/llvm-libunwind}/test/libunwind_01.pass.cpp (100%)
 rename src/{coreclr/nativeaot/libunwind => native/external/llvm-libunwind}/test/libunwind_02.pass.cpp (100%)
 rename src/{coreclr/nativeaot/libunwind => native/external/llvm-libunwind}/test/lit.cfg (100%)
 rename src/{coreclr/nativeaot/libunwind => native/external/llvm-libunwind}/test/lit.site.cfg.in (100%)
 rename src/{coreclr/nativeaot/libunwind => native/external/llvm-libunwind}/test/unw_getcontext.pass.cpp (100%)

diff --git a/eng/native/functions.cmake b/eng/native/functions.cmake
index 9831cad8ab5eb..8c497259ad221 100644
--- a/eng/native/functions.cmake
+++ b/eng/native/functions.cmake
@@ -204,7 +204,8 @@ endfunction(find_unwind_libs)
 function(convert_to_absolute_path RetSources)
     set(Sources ${ARGN})
     foreach(Source IN LISTS Sources)
-        list(APPEND AbsolutePathSources ${CMAKE_CURRENT_SOURCE_DIR}/${Source})
+      get_filename_component(AbsolutePathSource ${Source} ABSOLUTE BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+      list(APPEND AbsolutePathSources ${AbsolutePathSource})
     endforeach()
     set(${RetSources} ${AbsolutePathSources} PARENT_SCOPE)
 endfunction(convert_to_absolute_path)
diff --git a/src/coreclr/nativeaot/Runtime/CMakeLists.txt b/src/coreclr/nativeaot/Runtime/CMakeLists.txt
index 20f8430d04878..65308e781d4c9 100644
--- a/src/coreclr/nativeaot/Runtime/CMakeLists.txt
+++ b/src/coreclr/nativeaot/Runtime/CMakeLists.txt
@@ -62,12 +62,6 @@ set(FULL_RUNTIME_SOURCES
     ThunksMapping.cpp
 )
 
-set(RUNTIME_SOURCES_ARCH_ASM
-)
-
-set(PORTABLE_RUNTIME_SOURCES
-)
-
 include_directories(inc)
 
 include_directories(.)
@@ -124,18 +118,13 @@ if(WIN32)
     rheventtrace.cpp
   )
 
-  list(APPEND FULL_RUNTIME_SOURCES
-    windows/CoffNativeCodeManager.cpp
-  )
+  list(APPEND FULL_RUNTIME_SOURCES windows/CoffNativeCodeManager.cpp)
 
   set(ASM_SUFFIX asm)
 
   if (CLR_CMAKE_TARGET_ARCH_I386 OR CLR_CMAKE_TARGET_ARCH_AMD64)
-    list(APPEND RUNTIME_SOURCES_ARCH_ASM
-      ${ARCH_SOURCES_DIR}/GC.${ASM_SUFFIX}
-    )
+    set(RUNTIME_SOURCES_ARCH_ASM ${ARCH_SOURCES_DIR}/GC.${ASM_SUFFIX})
   endif()
-
 else()
 
   include_directories(unix)
@@ -148,16 +137,11 @@ else()
   include(CheckLibraryExists)
 
   include(${GC_DIR}/unix/configure.cmake)
-  
-  if(NOT CLR_CMAKE_TARGET_ARCH_WASM)
-    include_directories(../libunwind/include)
-  else()
+
+  if(CLR_CMAKE_TARGET_ARCH_WASM)
     include_directories($ENV{EMSCRIPTEN/system/lib/libcxxabi/include})
   endif()
 
-  include_directories(../libunwind/include)
-  include_directories(../libunwind)
-
   # Disable building _Unwind_XXX style APIs of libunwind, since we don't use them.
   add_definitions(-D_LIBUNWIND_DISABLE_ZERO_COST_APIS=1)
 
@@ -178,22 +162,14 @@ else()
     unix/UnixSignals.cpp
     unix/UnwindHelpers.cpp
     unix/UnixNativeCodeManager.cpp
-    ../libunwind/src/Unwind-EHABI.cpp
-    ../libunwind/src/libunwind.cpp
   )
 
-  if(CLR_CMAKE_TARGET_OSX)
-    list(APPEND FULL_RUNTIME_SOURCES
-      ../libunwind/src/Unwind_AppleExtras.cpp
-    )
-  endif()
+  include(${CLR_SRC_NATIVE_DIR}/external/llvm-libunwind.cmake)
 
-  set(ASM_SUFFIX S)
+  list(APPEND FULL_RUNTIME_SOURCES ${LLVM_LIBUNWIND_SOURCES})
+  set(RUNTIME_SOURCES_ARCH_ASM ${LLVM_LIBUNWIND_ASM_SOURCES})
 
-  list(APPEND RUNTIME_SOURCES_ARCH_ASM
-    ../libunwind/src/UnwindRegistersRestore.S
-    ../libunwind/src/UnwindRegistersSave.S
-  )
+  set(ASM_SUFFIX S)
 endif()
 
 if (CLR_CMAKE_TARGET_ARCH_AMD64 AND CLR_CMAKE_TARGET_WIN32)
@@ -270,11 +246,8 @@ set(RUNTIME_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 list(APPEND COMMON_RUNTIME_SOURCES ${GC_HEADERS})
 
 convert_to_absolute_path(COMMON_RUNTIME_SOURCES ${COMMON_RUNTIME_SOURCES})
-
 convert_to_absolute_path(FULL_RUNTIME_SOURCES ${FULL_RUNTIME_SOURCES})
-convert_to_absolute_path(PORTABLE_RUNTIME_SOURCES ${PORTABLE_RUNTIME_SOURCES})
 convert_to_absolute_path(SERVER_GC_SOURCES ${SERVER_GC_SOURCES})
-
 convert_to_absolute_path(RUNTIME_SOURCES_ARCH_ASM ${RUNTIME_SOURCES_ARCH_ASM})
 
 if(NOT CLR_CMAKE_TARGET_ARCH_WASM)
diff --git a/src/coreclr/nativeaot/Runtime/unix/UnwindHelpers.cpp b/src/coreclr/nativeaot/Runtime/unix/UnwindHelpers.cpp
index 6fdd94d6bd0c8..cdcae7041f2bf 100644
--- a/src/coreclr/nativeaot/Runtime/unix/UnwindHelpers.cpp
+++ b/src/coreclr/nativeaot/Runtime/unix/UnwindHelpers.cpp
@@ -17,13 +17,13 @@
 
 // libunwind headers
 #include <libunwind.h>
-#include <src/config.h>
-#include <src/Registers.hpp>
-#include <src/AddressSpace.hpp>
+#include <external/llvm-libunwind/src/config.h>
+#include <external/llvm-libunwind/src/Registers.hpp>
+#include <external/llvm-libunwind/src/AddressSpace.hpp>
 #if defined(TARGET_ARM)
-#include <src/libunwind_ext.h>
+#include <external/llvm-libunwind/src/libunwind_ext.h>
 #endif
-#include <src/UnwindCursor.hpp>
+#include <external/llvm-libunwind/src/UnwindCursor.hpp>
 
 
 #if defined(TARGET_AMD64)
diff --git a/src/native/external/llvm-libunwind-version.txt b/src/native/external/llvm-libunwind-version.txt
new file mode 100644
index 0000000000000..aaddb2928c02b
--- /dev/null
+++ b/src/native/external/llvm-libunwind-version.txt
@@ -0,0 +1,5 @@
+v9.0.0
+https://github.com/llvm/llvm-project/releases/tag/llvmorg-9.0.0
+
+Apply https://github.com/dotnet/runtime/commit/371905898f2c036cc30d662e8a6df162a21967a5
+Reapply changes from https://github.com/dotnet/runtime/commit/62075f115efeecaee9d94f87d0766d657a72fa76
diff --git a/src/native/external/llvm-libunwind.cmake b/src/native/external/llvm-libunwind.cmake
new file mode 100644
index 0000000000000..a30f03027f8c7
--- /dev/null
+++ b/src/native/external/llvm-libunwind.cmake
@@ -0,0 +1,23 @@
+if(NOT CLR_CMAKE_TARGET_ARCH_WASM)
+  include_directories(BEFORE "${CMAKE_CURRENT_LIST_DIR}/llvm-libunwind/include")
+endif()
+
+set (LLVM_LIBUNWIND_SOURCES_BASE
+    src/Unwind-EHABI.cpp
+    src/libunwind.cpp
+)
+
+if(CLR_CMAKE_TARGET_OSX)
+    set(LLVM_LIBUNWIND_SOURCES_BASE
+        ${LLVM_LIBUNWIND_SOURCES_BASE}
+        src/Unwind_AppleExtras.cpp
+    )
+endif()
+
+set(LLVM_LIBUNWIND_ASM_SOURCES_BASE
+    src/UnwindRegistersRestore.S
+    src/UnwindRegistersSave.S
+)
+
+addprefix(LLVM_LIBUNWIND_SOURCES "${CMAKE_CURRENT_LIST_DIR}/llvm-libunwind" "${LLVM_LIBUNWIND_SOURCES_BASE}")
+addprefix(LLVM_LIBUNWIND_ASM_SOURCES "${CMAKE_CURRENT_LIST_DIR}/llvm-libunwind" "${LLVM_LIBUNWIND_ASM_SOURCES_BASE}")
diff --git a/src/coreclr/nativeaot/libunwind/.arcconfig b/src/native/external/llvm-libunwind/.arcconfig
similarity index 100%
rename from src/coreclr/nativeaot/libunwind/.arcconfig
rename to src/native/external/llvm-libunwind/.arcconfig
diff --git a/src/coreclr/nativeaot/libunwind/.clang-format b/src/native/external/llvm-libunwind/.clang-format
similarity index 100%
rename from src/coreclr/nativeaot/libunwind/.clang-format
rename to src/native/external/llvm-libunwind/.clang-format
diff --git a/src/coreclr/nativeaot/libunwind/CMakeLists.txt b/src/native/external/llvm-libunwind/CMakeLists.txt
similarity index 100%
rename from src/coreclr/nativeaot/libunwind/CMakeLists.txt
rename to src/native/external/llvm-libunwind/CMakeLists.txt
diff --git a/src/coreclr/nativeaot/libunwind/LICENSE.TXT b/src/native/external/llvm-libunwind/LICENSE.TXT
similarity index 100%
rename from src/coreclr/nativeaot/libunwind/LICENSE.TXT
rename to src/native/external/llvm-libunwind/LICENSE.TXT
diff --git a/src/coreclr/nativeaot/libunwind/cmake/Modules/HandleCompilerRT.cmake b/src/native/external/llvm-libunwind/cmake/Modules/HandleCompilerRT.cmake
similarity index 100%
rename from src/coreclr/nativeaot/libunwind/cmake/Modules/HandleCompilerRT.cmake
rename to src/native/external/llvm-libunwind/cmake/Modules/HandleCompilerRT.cmake
diff --git a/src/coreclr/nativeaot/libunwind/cmake/config-ix.cmake b/src/native/external/llvm-libunwind/cmake/config-ix.cmake
similarity index 100%
rename from src/coreclr/nativeaot/libunwind/cmake/config-ix.cmake
rename to src/native/external/llvm-libunwind/cmake/config-ix.cmake
diff --git a/src/coreclr/nativeaot/libunwind/docs/BuildingLibunwind.rst b/src/native/external/llvm-libunwind/docs/BuildingLibunwind.rst
similarity index 100%
rename from src/coreclr/nativeaot/libunwind/docs/BuildingLibunwind.rst
rename to src/native/external/llvm-libunwind/docs/BuildingLibunwind.rst
diff --git a/src/coreclr/nativeaot/libunwind/docs/CMakeLists.txt b/src/native/external/llvm-libunwind/docs/CMakeLists.txt
similarity index 100%
rename from src/coreclr/nativeaot/libunwind/docs/CMakeLists.txt
rename to src/native/external/llvm-libunwind/docs/CMakeLists.txt
diff --git a/src/coreclr/nativeaot/libunwind/docs/README.txt b/src/native/external/llvm-libunwind/docs/README.txt
similarity index 100%
rename from src/coreclr/nativeaot/libunwind/docs/README.txt
rename to src/native/external/llvm-libunwind/docs/README.txt
diff --git a/src/coreclr/nativeaot/libunwind/docs/conf.py b/src/native/external/llvm-libunwind/docs/conf.py
similarity index 100%
rename from src/coreclr/nativeaot/libunwind/docs/conf.py
rename to src/native/external/llvm-libunwind/docs/conf.py
diff --git a/src/coreclr/nativeaot/libunwind/docs/index.rst b/src/native/external/llvm-libunwind/docs/index.rst
similarity index 100%
rename from src/coreclr/nativeaot/libunwind/docs/index.rst
rename to src/native/external/llvm-libunwind/docs/index.rst
diff --git a/src/coreclr/nativeaot/libunwind/include/__libunwind_config.h b/src/native/external/llvm-libunwind/include/__libunwind_config.h
similarity index 100%
rename from src/coreclr/nativeaot/libunwind/include/__libunwind_config.h
rename to src/native/external/llvm-libunwind/include/__libunwind_config.h
diff --git a/src/coreclr/nativeaot/libunwind/include/libunwind.h b/src/native/external/llvm-libunwind/include/libunwind.h
similarity index 100%
rename from src/coreclr/nativeaot/libunwind/include/libunwind.h
rename to src/native/external/llvm-libunwind/include/libunwind.h
diff --git a/src/coreclr/nativeaot/libunwind/include/mach-o/compact_unwind_encoding.h b/src/native/external/llvm-libunwind/include/mach-o/compact_unwind_encoding.h
similarity index 100%
rename from src/coreclr/nativeaot/libunwind/include/mach-o/compact_unwind_encoding.h
rename to src/native/external/llvm-libunwind/include/mach-o/compact_unwind_encoding.h
diff --git a/src/coreclr/nativeaot/libunwind/include/unwind.h b/src/native/external/llvm-libunwind/include/unwind.h
similarity index 100%
rename from src/coreclr/nativeaot/libunwind/include/unwind.h
rename to src/native/external/llvm-libunwind/include/unwind.h
diff --git a/src/coreclr/nativeaot/libunwind/src/AddressSpace.hpp b/src/native/external/llvm-libunwind/src/AddressSpace.hpp
similarity index 100%
rename from src/coreclr/nativeaot/libunwind/src/AddressSpace.hpp
rename to src/native/external/llvm-libunwind/src/AddressSpace.hpp
diff --git a/src/coreclr/nativeaot/libunwind/src/CMakeLists.txt b/src/native/external/llvm-libunwind/src/CMakeLists.txt
similarity index 100%
rename from src/coreclr/nativeaot/libunwind/src/CMakeLists.txt
rename to src/native/external/llvm-libunwind/src/CMakeLists.txt
diff --git a/src/coreclr/nativeaot/libunwind/src/CompactUnwinder.hpp b/src/native/external/llvm-libunwind/src/CompactUnwinder.hpp
similarity index 100%
rename from src/coreclr/nativeaot/libunwind/src/CompactUnwinder.hpp
rename to src/native/external/llvm-libunwind/src/CompactUnwinder.hpp
diff --git a/src/coreclr/nativeaot/libunwind/src/DwarfInstructions.hpp b/src/native/external/llvm-libunwind/src/DwarfInstructions.hpp
similarity index 100%
rename from src/coreclr/nativeaot/libunwind/src/DwarfInstructions.hpp
rename to src/native/external/llvm-libunwind/src/DwarfInstructions.hpp
diff --git a/src/coreclr/nativeaot/libunwind/src/DwarfParser.hpp b/src/native/external/llvm-libunwind/src/DwarfParser.hpp
similarity index 100%
rename from src/coreclr/nativeaot/libunwind/src/DwarfParser.hpp
rename to src/native/external/llvm-libunwind/src/DwarfParser.hpp
diff --git a/src/coreclr/nativeaot/libunwind/src/EHHeaderParser.hpp b/src/native/external/llvm-libunwind/src/EHHeaderParser.hpp
similarity index 100%
rename from src/coreclr/nativeaot/libunwind/src/EHHeaderParser.hpp
rename to src/native/external/llvm-libunwind/src/EHHeaderParser.hpp
diff --git a/src/coreclr/nativeaot/libunwind/src/RWMutex.hpp b/src/native/external/llvm-libunwind/src/RWMutex.hpp
similarity index 100%
rename from src/coreclr/nativeaot/libunwind/src/RWMutex.hpp
rename to src/native/external/llvm-libunwind/src/RWMutex.hpp
diff --git a/src/coreclr/nativeaot/libunwind/src/Registers.hpp b/src/native/external/llvm-libunwind/src/Registers.hpp
similarity index 100%
rename from src/coreclr/nativeaot/libunwind/src/Registers.hpp
rename to src/native/external/llvm-libunwind/src/Registers.hpp
diff --git a/src/coreclr/nativeaot/libunwind/src/Unwind-EHABI.cpp b/src/native/external/llvm-libunwind/src/Unwind-EHABI.cpp
similarity index 100%
rename from src/coreclr/nativeaot/libunwind/src/Unwind-EHABI.cpp
rename to src/native/external/llvm-libunwind/src/Unwind-EHABI.cpp
diff --git a/src/coreclr/nativeaot/libunwind/src/Unwind-EHABI.h b/src/native/external/llvm-libunwind/src/Unwind-EHABI.h
similarity index 100%
rename from src/coreclr/nativeaot/libunwind/src/Unwind-EHABI.h
rename to src/native/external/llvm-libunwind/src/Unwind-EHABI.h
diff --git a/src/coreclr/nativeaot/libunwind/src/Unwind-seh.cpp b/src/native/external/llvm-libunwind/src/Unwind-seh.cpp
similarity index 100%
rename from src/coreclr/nativeaot/libunwind/src/Unwind-seh.cpp
rename to src/native/external/llvm-libunwind/src/Unwind-seh.cpp
diff --git a/src/coreclr/nativeaot/libunwind/src/Unwind-sjlj.c b/src/native/external/llvm-libunwind/src/Unwind-sjlj.c
similarity index 100%
rename from src/coreclr/nativeaot/libunwind/src/Unwind-sjlj.c
rename to src/native/external/llvm-libunwind/src/Unwind-sjlj.c
diff --git a/src/coreclr/nativeaot/libunwind/src/UnwindCursor.hpp b/src/native/external/llvm-libunwind/src/UnwindCursor.hpp
similarity index 100%
rename from src/coreclr/nativeaot/libunwind/src/UnwindCursor.hpp
rename to src/native/external/llvm-libunwind/src/UnwindCursor.hpp
diff --git a/src/coreclr/nativeaot/libunwind/src/UnwindLevel1-gcc-ext.c b/src/native/external/llvm-libunwind/src/UnwindLevel1-gcc-ext.c
similarity index 100%
rename from src/coreclr/nativeaot/libunwind/src/UnwindLevel1-gcc-ext.c
rename to src/native/external/llvm-libunwind/src/UnwindLevel1-gcc-ext.c
diff --git a/src/coreclr/nativeaot/libunwind/src/UnwindLevel1.c b/src/native/external/llvm-libunwind/src/UnwindLevel1.c
similarity index 100%
rename from src/coreclr/nativeaot/libunwind/src/UnwindLevel1.c
rename to src/native/external/llvm-libunwind/src/UnwindLevel1.c
diff --git a/src/coreclr/nativeaot/libunwind/src/UnwindRegistersRestore.S b/src/native/external/llvm-libunwind/src/UnwindRegistersRestore.S
similarity index 100%
rename from src/coreclr/nativeaot/libunwind/src/UnwindRegistersRestore.S
rename to src/native/external/llvm-libunwind/src/UnwindRegistersRestore.S
diff --git a/src/coreclr/nativeaot/libunwind/src/UnwindRegistersSave.S b/src/native/external/llvm-libunwind/src/UnwindRegistersSave.S
similarity index 100%
rename from src/coreclr/nativeaot/libunwind/src/UnwindRegistersSave.S
rename to src/native/external/llvm-libunwind/src/UnwindRegistersSave.S
diff --git a/src/coreclr/nativeaot/libunwind/src/Unwind_AppleExtras.cpp b/src/native/external/llvm-libunwind/src/Unwind_AppleExtras.cpp
similarity index 100%
rename from src/coreclr/nativeaot/libunwind/src/Unwind_AppleExtras.cpp
rename to src/native/external/llvm-libunwind/src/Unwind_AppleExtras.cpp
diff --git a/src/coreclr/nativeaot/libunwind/src/assembly.h b/src/native/external/llvm-libunwind/src/assembly.h
similarity index 100%
rename from src/coreclr/nativeaot/libunwind/src/assembly.h
rename to src/native/external/llvm-libunwind/src/assembly.h
diff --git a/src/coreclr/nativeaot/libunwind/src/config.h b/src/native/external/llvm-libunwind/src/config.h
similarity index 100%
rename from src/coreclr/nativeaot/libunwind/src/config.h
rename to src/native/external/llvm-libunwind/src/config.h
diff --git a/src/coreclr/nativeaot/libunwind/src/dwarf2.h b/src/native/external/llvm-libunwind/src/dwarf2.h
similarity index 100%
rename from src/coreclr/nativeaot/libunwind/src/dwarf2.h
rename to src/native/external/llvm-libunwind/src/dwarf2.h
diff --git a/src/coreclr/nativeaot/libunwind/src/libunwind.cpp b/src/native/external/llvm-libunwind/src/libunwind.cpp
similarity index 100%
rename from src/coreclr/nativeaot/libunwind/src/libunwind.cpp
rename to src/native/external/llvm-libunwind/src/libunwind.cpp
diff --git a/src/coreclr/nativeaot/libunwind/src/libunwind_ext.h b/src/native/external/llvm-libunwind/src/libunwind_ext.h
similarity index 100%
rename from src/coreclr/nativeaot/libunwind/src/libunwind_ext.h
rename to src/native/external/llvm-libunwind/src/libunwind_ext.h
diff --git a/src/coreclr/nativeaot/libunwind/src/unwind_ext.h b/src/native/external/llvm-libunwind/src/unwind_ext.h
similarity index 100%
rename from src/coreclr/nativeaot/libunwind/src/unwind_ext.h
rename to src/native/external/llvm-libunwind/src/unwind_ext.h
diff --git a/src/coreclr/nativeaot/libunwind/test/CMakeLists.txt b/src/native/external/llvm-libunwind/test/CMakeLists.txt
similarity index 100%
rename from src/coreclr/nativeaot/libunwind/test/CMakeLists.txt
rename to src/native/external/llvm-libunwind/test/CMakeLists.txt
diff --git a/src/coreclr/nativeaot/libunwind/test/alignment.pass.cpp b/src/native/external/llvm-libunwind/test/alignment.pass.cpp
similarity index 100%
rename from src/coreclr/nativeaot/libunwind/test/alignment.pass.cpp
rename to src/native/external/llvm-libunwind/test/alignment.pass.cpp
diff --git a/src/coreclr/nativeaot/libunwind/test/libunwind/__init__.py b/src/native/external/llvm-libunwind/test/libunwind/__init__.py
similarity index 100%
rename from src/coreclr/nativeaot/libunwind/test/libunwind/__init__.py
rename to src/native/external/llvm-libunwind/test/libunwind/__init__.py
diff --git a/src/coreclr/nativeaot/libunwind/test/libunwind/test/__init__.py b/src/native/external/llvm-libunwind/test/libunwind/test/__init__.py
similarity index 100%
rename from src/coreclr/nativeaot/libunwind/test/libunwind/test/__init__.py
rename to src/native/external/llvm-libunwind/test/libunwind/test/__init__.py
diff --git a/src/coreclr/nativeaot/libunwind/test/libunwind/test/config.py b/src/native/external/llvm-libunwind/test/libunwind/test/config.py
similarity index 100%
rename from src/coreclr/nativeaot/libunwind/test/libunwind/test/config.py
rename to src/native/external/llvm-libunwind/test/libunwind/test/config.py
diff --git a/src/coreclr/nativeaot/libunwind/test/libunwind_01.pass.cpp b/src/native/external/llvm-libunwind/test/libunwind_01.pass.cpp
similarity index 100%
rename from src/coreclr/nativeaot/libunwind/test/libunwind_01.pass.cpp
rename to src/native/external/llvm-libunwind/test/libunwind_01.pass.cpp
diff --git a/src/coreclr/nativeaot/libunwind/test/libunwind_02.pass.cpp b/src/native/external/llvm-libunwind/test/libunwind_02.pass.cpp
similarity index 100%
rename from src/coreclr/nativeaot/libunwind/test/libunwind_02.pass.cpp
rename to src/native/external/llvm-libunwind/test/libunwind_02.pass.cpp
diff --git a/src/coreclr/nativeaot/libunwind/test/lit.cfg b/src/native/external/llvm-libunwind/test/lit.cfg
similarity index 100%
rename from src/coreclr/nativeaot/libunwind/test/lit.cfg
rename to src/native/external/llvm-libunwind/test/lit.cfg
diff --git a/src/coreclr/nativeaot/libunwind/test/lit.site.cfg.in b/src/native/external/llvm-libunwind/test/lit.site.cfg.in
similarity index 100%
rename from src/coreclr/nativeaot/libunwind/test/lit.site.cfg.in
rename to src/native/external/llvm-libunwind/test/lit.site.cfg.in
diff --git a/src/coreclr/nativeaot/libunwind/test/unw_getcontext.pass.cpp b/src/native/external/llvm-libunwind/test/unw_getcontext.pass.cpp
similarity index 100%
rename from src/coreclr/nativeaot/libunwind/test/unw_getcontext.pass.cpp
rename to src/native/external/llvm-libunwind/test/unw_getcontext.pass.cpp