Unrolled build for rust-lang#122797

rust-timer · web-flow · commit c77c0d032e3a · 2024-03-24T07:14:49.000-04:00
Rollup merge of rust-lang#122797 - alexcrichton:fix-compile-wasm64, r=Mark-Simulacrum Fix compile of wasm64-unknown-unknown target This target is a Tier 3 target so it's not tested on CI, and it's broken since last used so this commit fixes a small unwind-related issue that cropped up in the meantime.
diff --git a/library/unwind/src/lib.rs b/library/unwind/src/lib.rs
@@ -4,6 +4,7 @@
 #![feature(staged_api)]
 #![feature(c_unwind)]
 #![feature(strict_provenance)]
+#![cfg_attr(target_arch = "wasm64", feature(simd_wasm64))]
 #![cfg_attr(not(target_env = "msvc"), feature(libc))]
 #![cfg_attr(
     all(target_family = "wasm", not(target_os = "emscripten")),
diff --git a/library/unwind/src/wasm.rs b/library/unwind/src/wasm.rs
@@ -59,7 +59,10 @@ pub unsafe fn _Unwind_RaiseException(exception: *mut _Unwind_Exception) -> _Unwi
             wasm_throw(0, exception.cast())
         } else {
             let _ = exception;
-            core::arch::wasm32::unreachable()
+            #[cfg(target_arch = "wasm32")]
+            core::arch::wasm32::unreachable();
+            #[cfg(target_arch = "wasm64")]
+            core::arch::wasm64::unreachable();
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,10 @@ pub unsafe fn _Unwind_RaiseException(exception: *mut _Unwind_Exception) -> _Unwi`
`59`	`59`	`wasm_throw(0, exception.cast())`
`60`	`60`	`} else {`
`61`	`61`	`let _ = exception;`
`62`		`- core::arch::wasm32::unreachable()`
	`62`	`+ #[cfg(target_arch = "wasm32")]`
	`63`	`+ core::arch::wasm32::unreachable();`
	`64`	`+ #[cfg(target_arch = "wasm64")]`
	`65`	`+ core::arch::wasm64::unreachable();`
`63`	`66`	`}`
`64`	`67`	`}`
`65`	`68`	`}`