about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-05-23 21:04:41 -0700
committerbors <bors@rust-lang.org>2013-05-23 21:04:41 -0700
commit7c0cc9c47a3d95e058b3684c7ed14924f64ff808 (patch)
tree655b139619e9de29a847a7db776744b1e2226af9 /src/libstd
parenta776d65b4d8e5eaad501af2b147cfbe1dbf10d3c (diff)
parentabb2823c35f24d526d05f6757288e272d65fd42e (diff)
downloadrust-7c0cc9c47a3d95e058b3684c7ed14924f64ff808.tar.gz
rust-7c0cc9c47a3d95e058b3684c7ed14924f64ff808.zip
auto merge of #6684 : crabtw/rust/arm, r=ILyoan
It seems to fix #6231.
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/cleanup.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/cleanup.rs b/src/libstd/cleanup.rs
index 5796be7b1e4..d1460b7a3c9 100644
--- 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]