Skip to content

Commit 60ea177

Browse files
authored
Rollup merge of #104461 - mati865:gnullvm-aarch64-fixup, r=Mark-Simulacrum
Fix building of `aarch64-pc-windows-gnullvm` That change had been lost during rebase of my last PR (rust-lang/rust#103894).
2 parents 37f73e6 + 9999867 commit 60ea177

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

unwind/src/libunwind.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ if #[cfg(not(all(target_os = "ios", target_arch = "arm")))] {
275275
} // cfg_if!
276276

277277
cfg_if::cfg_if! {
278-
if #[cfg(all(windows, target_arch = "x86_64", target_env = "gnu"))] {
278+
if #[cfg(all(windows, any(target_arch = "aarch64", target_arch = "x86_64"), target_env = "gnu"))] {
279279
// We declare these as opaque types. This is fine since you just need to
280280
// pass them to _GCC_specific_handler and forget about them.
281281
pub enum EXCEPTION_RECORD {}

0 commit comments

Comments
 (0)