auto merge of #6684 : crabtw/rust/arm, r=ILyoan

It seems to fix #6231.
2013-05-23 21:04:41 -07:00 · 2013-05-23 21:04:41 -07:00 · 7c0cc9c47a
commit 7c0cc9c47a
parent a776d65b4d abb2823c35
1 changed files with 1 additions and 1 deletions
--- a/src/libstd/cleanup.rs
+++ b/src/libstd/cleanup.rs
@ -39,11 +39,11 @@ struct AllocHeader { priv opaque: () }
 struct MemoryRegion { priv opaque: () }

 #[cfg(target_arch="x86")]
-#[cfg(target_arch="arm")]
 struct Registers {
    data: [u32, ..16]
 }

+#[cfg(target_arch="arm")]
 #[cfg(target_arch="mips")]
 struct Registers {
    data: [u32, ..32]