[runtime] Add a configure check for unwind.h

diff --git a/configure.ac b/configure.ac
index 81ce8cdfcb2432a31287134c5a33e45205c5c1ac..9af2d600157119ad0d5370995c3020fcdf2bf8a2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -417,7 +417,7 @@ AC_PROG_LD_GNU
 AM_ICONV()
 
 AC_CHECK_HEADERS(sys/filio.h sys/sockio.h netdb.h utime.h sys/utime.h semaphore.h sys/un.h linux/rtc.h sys/syscall.h sys/mkdev.h sys/uio.h sys/param.h sys/sysctl.h libproc.h sys/prctl.h)
-AC_CHECK_HEADERS(sys/param.h sys/socket.h sys/ipc.h sys/sem.h sys/utsname.h alloca.h ucontext.h pwd.h sys/select.h netinet/tcp.h netinet/in.h unistd.h sys/types.h link.h asm/sigcontext.h sys/inotify.h arpa/inet.h complex.h)
+AC_CHECK_HEADERS(sys/param.h sys/socket.h sys/ipc.h sys/sem.h sys/utsname.h alloca.h ucontext.h pwd.h sys/select.h netinet/tcp.h netinet/in.h unistd.h sys/types.h link.h asm/sigcontext.h sys/inotify.h arpa/inet.h complex.h unwind.h)
 AC_CHECK_HEADERS([linux/netlink.h linux/rtnetlink.h],
                   [], [], [#include <stddef.h>
                  #include <sys/socket.h>

diff --git a/mono/mini/mini-exceptions.c b/mono/mini/mini-exceptions.c
index 51f5c9bbc949a20f8d24aa238e969db9dbfcae31..3b29192a5322028b7c0f72da3da9d58707c313c7 100644 (file)
--- a/mono/mini/mini-exceptions.c
+++ b/mono/mini/mini-exceptions.c
@@ -42,6 +42,10 @@
 #include <sys/prctl.h>
 #endif
 
+#ifdef HAVE_UNWIND_H
+#include <unwind.h>
+#endif
+
 #include <mono/metadata/appdomain.h>
 #include <mono/metadata/tabledefs.h>
 #include <mono/metadata/threads.h>
@@ -68,10 +72,6 @@
 #include "mini-llvm-cpp.h"
 #endif
 
-#ifdef MONO_ARCH_HAVE_UNWIND_BACKTRACE
-#include <unwind.h>
-#endif
-
 #ifdef ENABLE_EXTENSION_MODULE
 #include "../../../mono-extensions/mono/mini/mini-exceptions.c"
 #endif