diff --git a/src/librustc/middle/typeck/check/mod.rs b/src/librustc/middle/typeck/check/mod.rs
index 00ebca5abc147..55efb76dd1325 100644
--- a/src/librustc/middle/typeck/check/mod.rs
+++ b/src/librustc/middle/typeck/check/mod.rs
@@ -3476,29 +3476,31 @@ pub fn check_intrinsic_type(ccx: @mut CrateCtxt, it: @ast::foreign_item) {
 
         //We only care about the operation here
         match split[1] {
-            "cxchg" => (0, ~[ty::mk_mut_rptr(tcx,
-                                             ty::re_bound(ty::br_anon(0)),
-                                             ty::mk_int()),
-                        ty::mk_int(),
-                        ty::mk_int()
-                        ], ty::mk_int()),
-            "load" => (0,
-               ~[
-                  ty::mk_imm_rptr(tcx, ty::re_bound(ty::br_anon(0)), ty::mk_int())
-               ],
-              ty::mk_int()),
-            "store" => (0,
-               ~[
-                  ty::mk_mut_rptr(tcx, ty::re_bound(ty::br_anon(0)), ty::mk_int()),
-                  ty::mk_int()
-               ],
-               ty::mk_nil()),
+            "cxchg" => {
+                (0,
+                 ~[
+                     ty::mk_mut_ptr(tcx, ty::mk_int()),
+                     ty::mk_int(),
+                     ty::mk_int()
+                 ],
+                 ty::mk_int())
+            }
+            "load" => {
+                (0,
+                 ~[ty::mk_imm_ptr(tcx, ty::mk_int())],
+                 ty::mk_int())
+            }
+            "store" => {
+                (0,
+                 ~[ty::mk_mut_ptr(tcx, ty::mk_int()), ty::mk_int()],
+                 ty::mk_nil())
+            }
 
             "xchg" | "xadd" | "xsub" | "and"  | "nand" | "or"   | "xor"  | "max"  |
             "min"  | "umax" | "umin" => {
-                (0, ~[ty::mk_mut_rptr(tcx,
-                                      ty::re_bound(ty::br_anon(0)),
-                                      ty::mk_int()), ty::mk_int() ], ty::mk_int())
+                (0,
+                 ~[ty::mk_mut_ptr(tcx, ty::mk_int()), ty::mk_int()],
+                 ty::mk_int())
             }
 
             op => {
diff --git a/src/libstd/rt/comm.rs b/src/libstd/rt/comm.rs
index 72907f40a0744..eb7176eb79e15 100644
--- a/src/libstd/rt/comm.rs
+++ b/src/libstd/rt/comm.rs
@@ -210,7 +210,7 @@ impl<T> Peekable<T> for PortOne<T> {
     fn peek(&self) -> bool {
         unsafe {
             let packet: *mut Packet<T> = self.inner.packet();
-            let oldstate = atomic_load(&mut (*packet).state);
+            let oldstate = atomic_load(&(*packet).state);
             match oldstate {
                 STATE_BOTH => false,
                 STATE_ONE => (*packet).payload.is_some(),
diff --git a/src/libstd/unstable/intrinsics.rs b/src/libstd/unstable/intrinsics.rs
index 97e3cba92db2f..5eeb9a8028439 100644
--- a/src/libstd/unstable/intrinsics.rs
+++ b/src/libstd/unstable/intrinsics.rs
@@ -158,105 +158,343 @@ pub trait TyVisitor {
 
 #[abi = "rust-intrinsic"]
 pub extern "rust-intrinsic" {
+    // XXX: Remove stage0 cfg attributes and borrowed pointer versions
+    // of atomics after next snapshot.
 
     /// Atomic compare and exchange, sequentially consistent.
+    #[cfg(not(stage0))]
+    pub fn atomic_cxchg(dst: *mut int, old: int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_cxchg(dst: &mut int, old: int, src: int) -> int;
     /// Atomic compare and exchange, acquire ordering.
+    #[cfg(not(stage0))]
+    pub fn atomic_cxchg_acq(dst: *mut int, old: int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_cxchg_acq(dst: &mut int, old: int, src: int) -> int;
     /// Atomic compare and exchange, release ordering.
+    #[cfg(not(stage0))]
+    pub fn atomic_cxchg_rel(dst: *mut int, old: int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_cxchg_rel(dst: &mut int, old: int, src: int) -> int;
 
+    #[cfg(not(stage0))]
+    pub fn atomic_cxchg_acqrel(dst: *mut int, old: int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_cxchg_acqrel(dst: &mut int, old: int, src: int) -> int;
-    pub fn atomic_cxchg_relaxed(dst: &mut int, old: int, src: int) -> int;
 
+    #[cfg(not(stage0))]
+    pub fn atomic_cxchg_relaxed(dst: *mut int, old: int, src: int) -> int;
+    #[cfg(stage0)]
+    pub fn atomic_cxchg_relaxed(dst: &mut int, old: int, src: int) -> int;
 
     /// Atomic load, sequentially consistent.
+    #[cfg(not(stage0))]
+    pub fn atomic_load(src: *int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_load(src: &int) -> int;
     /// Atomic load, acquire ordering.
+    #[cfg(not(stage0))]
+    pub fn atomic_load_acq(src: *int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_load_acq(src: &int) -> int;
 
+    #[cfg(not(stage0))]
+    pub fn atomic_load_relaxed(src: *int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_load_relaxed(src: &int) -> int;
 
     /// Atomic store, sequentially consistent.
+    #[cfg(not(stage0))]
+    pub fn atomic_store(dst: *mut int, val: int);
+    #[cfg(stage0)]
     pub fn atomic_store(dst: &mut int, val: int);
     /// Atomic store, release ordering.
+    #[cfg(not(stage0))]
+    pub fn atomic_store_rel(dst: *mut int, val: int);
+    #[cfg(stage0)]
     pub fn atomic_store_rel(dst: &mut int, val: int);
 
+    #[cfg(not(stage0))]
+    pub fn atomic_store_relaxed(dst: *mut int, val: int);
+    #[cfg(stage0)]
     pub fn atomic_store_relaxed(dst: &mut int, val: int);
 
     /// Atomic exchange, sequentially consistent.
+    #[cfg(not(stage0))]
+    pub fn atomic_xchg(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_xchg(dst: &mut int, src: int) -> int;
     /// Atomic exchange, acquire ordering.
+    #[cfg(not(stage0))]
+    pub fn atomic_xchg_acq(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_xchg_acq(dst: &mut int, src: int) -> int;
     /// Atomic exchange, release ordering.
+    #[cfg(not(stage0))]
+    pub fn atomic_xchg_rel(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_xchg_rel(dst: &mut int, src: int) -> int;
+
+    #[cfg(not(stage0))]
+    pub fn atomic_xchg_acqrel(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_xchg_acqrel(dst: &mut int, src: int) -> int;
+
+    #[cfg(not(stage0))]
+    pub fn atomic_xchg_relaxed(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_xchg_relaxed(dst: &mut int, src: int) -> int;
 
     /// Atomic addition, sequentially consistent.
+    #[cfg(not(stage0))]
+    pub fn atomic_xadd(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_xadd(dst: &mut int, src: int) -> int;
     /// Atomic addition, acquire ordering.
+    #[cfg(not(stage0))]
+    pub fn atomic_xadd_acq(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_xadd_acq(dst: &mut int, src: int) -> int;
     /// Atomic addition, release ordering.
+    #[cfg(not(stage0))]
+    pub fn atomic_xadd_rel(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_xadd_rel(dst: &mut int, src: int) -> int;
+
+    #[cfg(not(stage0))]
+    pub fn atomic_xadd_acqrel(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_xadd_acqrel(dst: &mut int, src: int) -> int;
+
+    #[cfg(not(stage0))]
+    pub fn atomic_xadd_relaxed(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_xadd_relaxed(dst: &mut int, src: int) -> int;
 
     /// Atomic subtraction, sequentially consistent.
+    #[cfg(not(stage0))]
+    pub fn atomic_xsub(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_xsub(dst: &mut int, src: int) -> int;
     /// Atomic subtraction, acquire ordering.
+    #[cfg(not(stage0))]
+    pub fn atomic_xsub_acq(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_xsub_acq(dst: &mut int, src: int) -> int;
     /// Atomic subtraction, release ordering.
+    #[cfg(not(stage0))]
+    pub fn atomic_xsub_rel(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_xsub_rel(dst: &mut int, src: int) -> int;
+
+    #[cfg(not(stage0))]
+    pub fn atomic_xsub_acqrel(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_xsub_acqrel(dst: &mut int, src: int) -> int;
+
+    #[cfg(not(stage0))]
+    pub fn atomic_xsub_relaxed(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_xsub_relaxed(dst: &mut int, src: int) -> int;
 
+    #[cfg(not(stage0))]
+    pub fn atomic_and(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_and(dst: &mut int, src: int) -> int;
+
+    #[cfg(not(stage0))]
+    pub fn atomic_and_acq(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_and_acq(dst: &mut int, src: int) -> int;
+
+    #[cfg(not(stage0))]
+    pub fn atomic_and_rel(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_and_rel(dst: &mut int, src: int) -> int;
+
+    #[cfg(not(stage0))]
+    pub fn atomic_and_acqrel(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_and_acqrel(dst: &mut int, src: int) -> int;
+
+    #[cfg(not(stage0))]
+    pub fn atomic_and_relaxed(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_and_relaxed(dst: &mut int, src: int) -> int;
 
+    #[cfg(not(stage0))]
+    pub fn atomic_nand(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_nand(dst: &mut int, src: int) -> int;
+
+    #[cfg(not(stage0))]
+    pub fn atomic_nand_acq(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_nand_acq(dst: &mut int, src: int) -> int;
+
+    #[cfg(not(stage0))]
+    pub fn atomic_nand_rel(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_nand_rel(dst: &mut int, src: int) -> int;
+
+    #[cfg(not(stage0))]
+    pub fn atomic_nand_acqrel(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_nand_acqrel(dst: &mut int, src: int) -> int;
+
+    #[cfg(not(stage0))]
+    pub fn atomic_nand_relaxed(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_nand_relaxed(dst: &mut int, src: int) -> int;
 
+    #[cfg(not(stage0))]
+    pub fn atomic_or(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_or(dst: &mut int, src: int) -> int;
+
+    #[cfg(not(stage0))]
+    pub fn atomic_or_acq(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_or_acq(dst: &mut int, src: int) -> int;
+
+    #[cfg(not(stage0))]
+    pub fn atomic_or_rel(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_or_rel(dst: &mut int, src: int) -> int;
+
+    #[cfg(not(stage0))]
+    pub fn atomic_or_acqrel(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_or_acqrel(dst: &mut int, src: int) -> int;
+
+    #[cfg(not(stage0))]
+    pub fn atomic_or_relaxed(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_or_relaxed(dst: &mut int, src: int) -> int;
 
+    #[cfg(not(stage0))]
+    pub fn atomic_xor(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_xor(dst: &mut int, src: int) -> int;
+
+    #[cfg(not(stage0))]
+    pub fn atomic_xor_acq(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_xor_acq(dst: &mut int, src: int) -> int;
+
+    #[cfg(not(stage0))]
+    pub fn atomic_xor_rel(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_xor_rel(dst: &mut int, src: int) -> int;
+
+    #[cfg(not(stage0))]
+    pub fn atomic_xor_acqrel(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_xor_acqrel(dst: &mut int, src: int) -> int;
+
+    #[cfg(not(stage0))]
+    pub fn atomic_xor_relaxed(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_xor_relaxed(dst: &mut int, src: int) -> int;
 
+    #[cfg(not(stage0))]
+    pub fn atomic_max(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_max(dst: &mut int, src: int) -> int;
+
+    #[cfg(not(stage0))]
+    pub fn atomic_max_acq(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_max_acq(dst: &mut int, src: int) -> int;
+
+    #[cfg(not(stage0))]
+    pub fn atomic_max_rel(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_max_rel(dst: &mut int, src: int) -> int;
+
+    #[cfg(not(stage0))]
+    pub fn atomic_max_acqrel(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_max_acqrel(dst: &mut int, src: int) -> int;
+
+    #[cfg(not(stage0))]
+    pub fn atomic_max_relaxed(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_max_relaxed(dst: &mut int, src: int) -> int;
 
+    #[cfg(not(stage0))]
+    pub fn atomic_min(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_min(dst: &mut int, src: int) -> int;
+
+    #[cfg(not(stage0))]
+    pub fn atomic_min_acq(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_min_acq(dst: &mut int, src: int) -> int;
+
+    #[cfg(not(stage0))]
+    pub fn atomic_min_rel(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_min_rel(dst: &mut int, src: int) -> int;
+
+    #[cfg(not(stage0))]
+    pub fn atomic_min_acqrel(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_min_acqrel(dst: &mut int, src: int) -> int;
+
+    #[cfg(not(stage0))]
+    pub fn atomic_min_relaxed(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_min_relaxed(dst: &mut int, src: int) -> int;
 
+    #[cfg(not(stage0))]
+    pub fn atomic_umin(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_umin(dst: &mut int, src: int) -> int;
+
+    #[cfg(not(stage0))]
+    pub fn atomic_umin_acq(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_umin_acq(dst: &mut int, src: int) -> int;
+
+    #[cfg(not(stage0))]
+    pub fn atomic_umin_rel(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_umin_rel(dst: &mut int, src: int) -> int;
+
+    #[cfg(not(stage0))]
+    pub fn atomic_umin_acqrel(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_umin_acqrel(dst: &mut int, src: int) -> int;
+
+    #[cfg(not(stage0))]
+    pub fn atomic_umin_relaxed(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_umin_relaxed(dst: &mut int, src: int) -> int;
 
+    #[cfg(not(stage0))]
+    pub fn atomic_umax(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_umax(dst: &mut int, src: int) -> int;
+
+    #[cfg(not(stage0))]
+    pub fn atomic_umax_acq(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_umax_acq(dst: &mut int, src: int) -> int;
+
+    #[cfg(not(stage0))]
+    pub fn atomic_umax_rel(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_umax_rel(dst: &mut int, src: int) -> int;
+
+    #[cfg(not(stage0))]
+    pub fn atomic_umax_acqrel(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_umax_acqrel(dst: &mut int, src: int) -> int;
+
+    #[cfg(not(stage0))]
+    pub fn atomic_umax_relaxed(dst: *mut int, src: int) -> int;
+    #[cfg(stage0)]
     pub fn atomic_umax_relaxed(dst: &mut int, src: int) -> int;
 
     /// The size of a type in bytes.
diff --git a/src/test/auxiliary/cci_intrinsic.rs b/src/test/auxiliary/cci_intrinsic.rs
index e98fc4aac0a93..710499a9d9adb 100644
--- a/src/test/auxiliary/cci_intrinsic.rs
+++ b/src/test/auxiliary/cci_intrinsic.rs
@@ -11,26 +11,26 @@
 pub mod rusti {
     #[abi = "rust-intrinsic"]
     pub extern "rust-intrinsic" {
-        fn atomic_cxchg(dst: &mut int, old: int, src: int) -> int;
-        fn atomic_cxchg_acq(dst: &mut int, old: int, src: int) -> int;
-        fn atomic_cxchg_rel(dst: &mut int, old: int, src: int) -> int;
+        fn atomic_cxchg(dst: *mut int, old: int, src: int) -> int;
+        fn atomic_cxchg_acq(dst: *mut int, old: int, src: int) -> int;
+        fn atomic_cxchg_rel(dst: *mut int, old: int, src: int) -> int;
 
-        fn atomic_xchg(dst: &mut int, src: int) -> int;
-        fn atomic_xchg_acq(dst: &mut int, src: int) -> int;
-        fn atomic_xchg_rel(dst: &mut int, src: int) -> int;
+        fn atomic_xchg(dst: *mut int, src: int) -> int;
+        fn atomic_xchg_acq(dst: *mut int, src: int) -> int;
+        fn atomic_xchg_rel(dst: *mut int, src: int) -> int;
 
-        fn atomic_xadd(dst: &mut int, src: int) -> int;
-        fn atomic_xadd_acq(dst: &mut int, src: int) -> int;
-        fn atomic_xadd_rel(dst: &mut int, src: int) -> int;
+        fn atomic_xadd(dst: *mut int, src: int) -> int;
+        fn atomic_xadd_acq(dst: *mut int, src: int) -> int;
+        fn atomic_xadd_rel(dst: *mut int, src: int) -> int;
 
-        fn atomic_xsub(dst: &mut int, src: int) -> int;
-        fn atomic_xsub_acq(dst: &mut int, src: int) -> int;
-        fn atomic_xsub_rel(dst: &mut int, src: int) -> int;
+        fn atomic_xsub(dst: *mut int, src: int) -> int;
+        fn atomic_xsub_acq(dst: *mut int, src: int) -> int;
+        fn atomic_xsub_rel(dst: *mut int, src: int) -> int;
     }
 }
 
 #[inline(always)]
-pub fn atomic_xchg(dst: &mut int, src: int) -> int {
+pub fn atomic_xchg(dst: *mut int, src: int) -> int {
     unsafe {
         rusti::atomic_xchg(dst, src)
     }
diff --git a/src/test/run-pass/intrinsic-atomics.rs b/src/test/run-pass/intrinsic-atomics.rs
index e5ab980cc8d84..dba9357024a89 100644
--- a/src/test/run-pass/intrinsic-atomics.rs
+++ b/src/test/run-pass/intrinsic-atomics.rs
@@ -11,69 +11,69 @@
 mod rusti {
     #[abi = "rust-intrinsic"]
     pub extern "rust-intrinsic" {
-        pub fn atomic_cxchg(dst: &mut int, old: int, src: int) -> int;
-        pub fn atomic_cxchg_acq(dst: &mut int, old: int, src: int) -> int;
-        pub fn atomic_cxchg_rel(dst: &mut int, old: int, src: int) -> int;
+        pub fn atomic_cxchg(dst: *mut int, old: int, src: int) -> int;
+        pub fn atomic_cxchg_acq(dst: *mut int, old: int, src: int) -> int;
+        pub fn atomic_cxchg_rel(dst: *mut int, old: int, src: int) -> int;
 
-        pub fn atomic_load(src: &int) -> int;
-        pub fn atomic_load_acq(src: &int) -> int;
+        pub fn atomic_load(src: *int) -> int;
+        pub fn atomic_load_acq(src: *int) -> int;
 
-        pub fn atomic_store(dst: &mut int, val: int);
-        pub fn atomic_store_rel(dst: &mut int, val: int);
+        pub fn atomic_store(dst: *mut int, val: int);
+        pub fn atomic_store_rel(dst: *mut int, val: int);
 
-        pub fn atomic_xchg(dst: &mut int, src: int) -> int;
-        pub fn atomic_xchg_acq(dst: &mut int, src: int) -> int;
-        pub fn atomic_xchg_rel(dst: &mut int, src: int) -> int;
+        pub fn atomic_xchg(dst: *mut int, src: int) -> int;
+        pub fn atomic_xchg_acq(dst: *mut int, src: int) -> int;
+        pub fn atomic_xchg_rel(dst: *mut int, src: int) -> int;
 
-        pub fn atomic_xadd(dst: &mut int, src: int) -> int;
-        pub fn atomic_xadd_acq(dst: &mut int, src: int) -> int;
-        pub fn atomic_xadd_rel(dst: &mut int, src: int) -> int;
+        pub fn atomic_xadd(dst: *mut int, src: int) -> int;
+        pub fn atomic_xadd_acq(dst: *mut int, src: int) -> int;
+        pub fn atomic_xadd_rel(dst: *mut int, src: int) -> int;
 
-        pub fn atomic_xsub(dst: &mut int, src: int) -> int;
-        pub fn atomic_xsub_acq(dst: &mut int, src: int) -> int;
-        pub fn atomic_xsub_rel(dst: &mut int, src: int) -> int;
+        pub fn atomic_xsub(dst: *mut int, src: int) -> int;
+        pub fn atomic_xsub_acq(dst: *mut int, src: int) -> int;
+        pub fn atomic_xsub_rel(dst: *mut int, src: int) -> int;
     }
 }
 
 pub fn main() {
     unsafe {
-        let mut x = ~1;
+        let mut x = 1;
+        assert_eq!(rusti::atomic_load(&x), 1);
+        x = 5;
+        assert_eq!(rusti::atomic_load_acq(&x), 5);
 
-        assert_eq!(rusti::atomic_load(x), 1);
-        *x = 5;
-        assert_eq!(rusti::atomic_load_acq(x), 5);
 
-        rusti::atomic_store(x,3);
-        assert_eq!(*x, 3);
-        rusti::atomic_store_rel(x,1);
-        assert_eq!(*x, 1);
+        rusti::atomic_store(&mut x,3);
+        assert_eq!(x, 3);
+        rusti::atomic_store_rel(&mut x,1);
+        assert_eq!(x, 1);
 
-        assert_eq!(rusti::atomic_cxchg(x, 1, 2), 1);
-        assert_eq!(*x, 2);
+        assert_eq!(rusti::atomic_cxchg(&mut x, 1, 2), 1);
+        assert_eq!(x, 2);
 
-        assert_eq!(rusti::atomic_cxchg_acq(x, 1, 3), 2);
-        assert_eq!(*x, 2);
+        assert_eq!(rusti::atomic_cxchg_acq(&mut x, 1, 3), 2);
+        assert_eq!(x, 2);
 
-        assert_eq!(rusti::atomic_cxchg_rel(x, 2, 1), 2);
-        assert_eq!(*x, 1);
+        assert_eq!(rusti::atomic_cxchg_rel(&mut x, 2, 1), 2);
+        assert_eq!(x, 1);
 
-        assert_eq!(rusti::atomic_xchg(x, 0), 1);
-        assert_eq!(*x, 0);
+        assert_eq!(rusti::atomic_xchg(&mut x, 0), 1);
+        assert_eq!(x, 0);
 
-        assert_eq!(rusti::atomic_xchg_acq(x, 1), 0);
-        assert_eq!(*x, 1);
+        assert_eq!(rusti::atomic_xchg_acq(&mut x, 1), 0);
+        assert_eq!(x, 1);
 
-        assert_eq!(rusti::atomic_xchg_rel(x, 0), 1);
-        assert_eq!(*x, 0);
+        assert_eq!(rusti::atomic_xchg_rel(&mut x, 0), 1);
+        assert_eq!(x, 0);
 
-        assert_eq!(rusti::atomic_xadd(x, 1), 0);
-        assert_eq!(rusti::atomic_xadd_acq(x, 1), 1);
-        assert_eq!(rusti::atomic_xadd_rel(x, 1), 2);
-        assert_eq!(*x, 3);
+        assert_eq!(rusti::atomic_xadd(&mut x, 1), 0);
+        assert_eq!(rusti::atomic_xadd_acq(&mut x, 1), 1);
+        assert_eq!(rusti::atomic_xadd_rel(&mut x, 1), 2);
+        assert_eq!(x, 3);
 
-        assert_eq!(rusti::atomic_xsub(x, 1), 3);
-        assert_eq!(rusti::atomic_xsub_acq(x, 1), 2);
-        assert_eq!(rusti::atomic_xsub_rel(x, 1), 1);
-        assert_eq!(*x, 0);
+        assert_eq!(rusti::atomic_xsub(&mut x, 1), 3);
+        assert_eq!(rusti::atomic_xsub_acq(&mut x, 1), 2);
+        assert_eq!(rusti::atomic_xsub_rel(&mut x, 1), 1);
+        assert_eq!(x, 0);
     }
 }