Delete duplicate unwind info files (#73129)

* Delete duplicate unwind info files * Add after prefix * Add RISC-V machine value in remote unwind
dotnet · Aug 1, 2022 · d2264b2 · d2264b2
1 parent e6d5bba
commit d2264b2
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 1,368 deletions.
diff --git a/src/mono/mono/mini/dwarfwriter.c b/src/mono/mono/mini/dwarfwriter.c
@@ -26,8 +26,8 @@
 #include <mono/metadata/abi-details.h>
 
 #ifndef HOST_WIN32
-#include <mono/utils/freebsd-elf32.h>
-#include <mono/utils/freebsd-elf64.h>
+#include <external/libunwind/include/remote/freebsd-elf32.h>
+#include <external/libunwind/include/remote/freebsd-elf64.h>
 #endif
 
 #include <mono/utils/freebsd-dwarf.h>

diff --git a/src/mono/mono/utils/CMakeLists.txt b/src/mono/mono/utils/CMakeLists.txt
@@ -85,9 +85,6 @@ set(utils_common_sources
     mono-property-hash.c
     mono-value-hash.h
     mono-value-hash.c
-    freebsd-elf_common.h
-    freebsd-elf32.h
-    freebsd-elf64.h
     freebsd-dwarf.h
     dtrace.h
     mono-error.c
@@ -227,6 +224,12 @@ endif()
 
 addprefix(utils_sources ../utils/ "${utils_platform_sources};${utils_arch_sources};${utils_common_sources}")
 
+set(utils_sources
+    ${utils_sources}
+    ${CLR_SRC_NATIVE_DIR}/external/libunwind/include/remote/freebsd-elf_common.h
+    ${CLR_SRC_NATIVE_DIR}/external/libunwind/include/remote/freebsd-elf32.h
+    ${CLR_SRC_NATIVE_DIR}/external/libunwind/include/remote/freebsd-elf64.h)
+
 if(ENABLE_DTRACE)
     find_program(DTRACE dtrace)
     if(TARGET_OSX)

diff --git a/src/mono/mono/utils/freebsd-elf32.h b/src/mono/mono/utils/freebsd-elf32.h