Skip to content

Commit

Permalink
Rollup merge of #104461 - mati865:gnullvm-aarch64-fixup, r=Mark-Simul…
Browse files Browse the repository at this point in the history
…acrum

Fix building of `aarch64-pc-windows-gnullvm`

That change had been lost during rebase of my last PR (#103894).
  • Loading branch information
matthiaskrgr authored Nov 20, 2022
2 parents b4513ce + c823537 commit 6a722aa
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion library/unwind/src/libunwind.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {}
Expand Down

0 comments on commit 6a722aa

Please sign in to comment.