about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-10-21 13:11:37 -0700
committerbors <bors@rust-lang.org>2013-10-21 13:11:37 -0700
commitece5028a8be4183ccb203dac59e734f1ca753714 (patch)
treebe7a6fca1703297b67f81fbba0522dc677322688 /src/libstd
parentd65dbe230d6e3aac8fa3aef675e56fd906a8083e (diff)
parent1122d6ab4aec4c2b0bc805499cef43e7d8641d0f (diff)
downloadrust-ece5028a8be4183ccb203dac59e734f1ca753714.tar.gz
rust-ece5028a8be4183ccb203dac59e734f1ca753714.zip
auto merge of #10000 : cmr/rust/snapshot, r=alexcrichton
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/unstable/intrinsics.rs3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/libstd/unstable/intrinsics.rs b/src/libstd/unstable/intrinsics.rs
index c9e1b5b3b00..68fdfd73013 100644
--- a/src/libstd/unstable/intrinsics.rs
+++ b/src/libstd/unstable/intrinsics.rs
@@ -330,9 +330,6 @@ extern "rust-intrinsic" {
 
     pub fn visit_tydesc(td: *TyDesc, tv: &mut TyVisitor);
 
-    #[cfg(not(stage0))]
-    pub fn frame_address(f: &fn(*u8));
-
     /// Get the address of the `__morestack` stack growth function.
     pub fn morestack_addr() -> *();