Add support for the Haiku operating system on x86 and x86_64 machines

[rust.git] / src / libunwind / libunwind.rs

diff --git a/src/libunwind/libunwind.rs b/src/libunwind/libunwind.rs
index 8292a68417810064b85b66ec32ded4bf89ac08d1..30de859f1501aeee01176cba6daca382bbca09d5 100644 (file)
--- a/src/libunwind/libunwind.rs
+++ b/src/libunwind/libunwind.rs
@@ -62,6 +62,9 @@ pub enum _Unwind_Reason_Code {
 #[cfg(any(target_arch = "powerpc", target_arch = "powerpc64"))]
 pub const unwinder_private_data_size: usize = 2;
 
+#[cfg(target_arch = "s390x")]
+pub const unwinder_private_data_size: usize = 2;
+
 #[cfg(target_arch = "asmjs")]
 pub const unwinder_private_data_size: usize = 20;
 
@@ -238,6 +241,7 @@ pub unsafe fn _Unwind_RaiseException(exc: *mut _Unwind_Exception) -> _Unwind_Rea
 #[cfg_attr(any(all(target_os = "linux", not(target_env = "musl")),
                target_os = "freebsd",
                target_os = "solaris",
+               target_os = "haiku",
                all(target_os = "linux",
                    target_env = "musl",
                    not(target_arch = "x86"),