diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2022-11-20 23:50:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-20 23:50:26 +0100 |
| commit | 6a722aa1700343f8eeb37895acdc0dc9aca77354 (patch) | |
| tree | bd013fd108ee96377b88c0f3ddf9750e931b925c | |
| parent | b4513ce6f835ed3f5c34a3ddc745d8cd3198cbf2 (diff) | |
| parent | c82353790a7f6198795a185f0fc16dbb7df5252a (diff) | |
| download | rust-6a722aa1700343f8eeb37895acdc0dc9aca77354.tar.gz rust-6a722aa1700343f8eeb37895acdc0dc9aca77354.zip | |
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 (https://github.com/rust-lang/rust/pull/103894).
| -rw-r--r-- | library/unwind/src/libunwind.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library/unwind/src/libunwind.rs b/library/unwind/src/libunwind.rs index 15500f7fd35..a218910f0ec 100644 --- a/library/unwind/src/libunwind.rs +++ b/library/unwind/src/libunwind.rs @@ -275,7 +275,7 @@ if #[cfg(not(all(target_os = "ios", target_arch = "arm")))] { } // cfg_if! cfg_if::cfg_if! { -if #[cfg(all(windows, target_arch = "x86_64", target_env = "gnu"))] { +if #[cfg(all(windows, any(target_arch = "aarch64", target_arch = "x86_64"), target_env = "gnu"))] { // We declare these as opaque types. This is fine since you just need to // pass them to _GCC_specific_handler and forget about them. pub enum EXCEPTION_RECORD {} |