New upstream version 1.14.0+dfsg1

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

diff --git a/src/libunwind/libunwind.rs b/src/libunwind/libunwind.rs
index 30de859f1501aeee01176cba6daca382bbca09d5..bbac6c07c570a7418b14d3570f9ddd490effb4b9 100644 (file)
--- a/src/libunwind/libunwind.rs
+++ b/src/libunwind/libunwind.rs
@@ -65,7 +65,7 @@ pub const unwinder_private_data_size: usize = 2;
 #[cfg(target_arch = "s390x")]
 pub const unwinder_private_data_size: usize = 2;
 
-#[cfg(target_arch = "asmjs")]
+#[cfg(target_os = "emscripten")]
 pub const unwinder_private_data_size: usize = 20;
 
 #[repr(C)]
@@ -252,6 +252,8 @@ if #[cfg(not(all(target_os = "ios", target_arch = "arm")))] {
                any(target_arch = "x86", target_arch = "x86_64"),
                not(test)),
            link(name = "unwind", kind = "static"))]
+#[cfg_attr(target_os = "fuchsia",
+           link(name = "unwind"))]
 #[cfg_attr(any(target_os = "android", target_os = "openbsd"),
            link(name = "gcc"))]
 #[cfg_attr(all(target_os = "netbsd", not(target_vendor = "rumprun")),