about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-07-22 00:29:08 +0000
committerbors <bors@rust-lang.org>2015-07-22 00:29:08 +0000
commitd33cab1b1fa4943a4bf37baa8c7421e672df10c7 (patch)
treebd623d33a0795fcfeda8e8de7ea5135120714013 /src/liballoc
parent39a780dcbe5f64a1fa51a5a36e2acdf41b04671f (diff)
parent24c5e492751489280f446f4efff1740a6c3e5aa1 (diff)
downloadrust-d33cab1b1fa4943a4bf37baa8c7421e672df10c7.tar.gz
rust-d33cab1b1fa4943a4bf37baa8c7421e672df10c7.zip
Auto merge of #27172 - alexcrichton:snapshots, r=brson
Enables bootstrapping a 32-bit MSVC host compiler!

Closes #26602
Diffstat (limited to 'src/liballoc')
-rw-r--r--src/liballoc/lib.rs17
1 files changed, 0 insertions, 17 deletions
diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs
index 5c1fd2a1aa1..ead0b4259a9 100644
--- a/src/liballoc/lib.rs
+++ b/src/liballoc/lib.rs
@@ -135,20 +135,3 @@ pub fn oom() -> ! {
     //                allocate.
     unsafe { core::intrinsics::abort() }
 }
-
-// FIXME(#14344): When linking liballoc with libstd, this library will be linked
-//                as an rlib (it only exists as an rlib). It turns out that an
-//                optimized standard library doesn't actually use *any* symbols
-//                from this library. Everything is inlined and optimized away.
-//                This means that linkers will actually omit the object for this
-//                file, even though it may be needed in the future.
-//
-//                To get around this for now, we define a dummy symbol which
-//                will never get inlined so the stdlib can call it. The stdlib's
-//                reference to this symbol will cause this library's object file
-//                to get linked in to libstd successfully (the linker won't
-//                optimize it out).
-#[doc(hidden)]
-#[unstable(feature = "issue_14344_fixme")]
-#[cfg(stage0)]
-pub fn fixme_14344_be_sure_to_link_to_collections() {}