3 files changed, 2 insertions, 79 deletions
diff --git a/src/libsyntax/diagnostic.rs b/src/libsyntax/diagnostic.rs
index 736f92910af..838ce4a6309 100644
--- a/src/libsyntax/diagnostic.rs
+++ b/src/libsyntax/diagnostic.rs
@@ -201,7 +201,6 @@ fn print_maybe_styled(msg: &str, color: term::attr::Attr) {
 
     let stderr = @mut io::stderr() as @mut io::Writer;
     fn is_stderr_screen() -> bool {
-        #[fixed_stack_segment];
         use std::libc;
         unsafe { libc::isatty(libc::STDERR_FILENO) != 0 }
     }
diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs
index b74349da2a9..f8155ae2e6b 100644
--- a/src/libsyntax/ext/expand.rs
+++ b/src/libsyntax/ext/expand.rs
@@ -959,84 +959,6 @@ pub fn std_macros() -> @str {
             pub static $name: ::std::local_data::Key<$ty> = &::std::local_data::Key;
         )
     )
-
-    /// externfn! declares a wrapper for an external function.
-    /// It is intended to be used like:
-    ///
-    /// externfn!(#[nolink]
-    ///           fn memcmp(cx: *u8, ct: *u8, n: u32) -> u32)
-    ///
-    /// Due to limitations in the macro parser, this pattern must be
-    /// implemented with 4 distinct patterns (with attrs / without
-    /// attrs CROSS with args / without ARGS).
-    ///
-    /// Also, this macro grammar allows for any number of return types
-    /// because I couldn't figure out the syntax to specify at most one.
-    macro_rules! externfn(
-        (fn $name:ident () $(-> $ret_ty:ty),*) => (
-            pub unsafe fn $name() $(-> $ret_ty),* {
-                // Note: to avoid obscure bug in macros, keep these
-                // attributes *internal* to the fn
-                #[fixed_stack_segment];
-                #[inline(never)];
-                #[allow(missing_doc)];
-
-                return $name();
-
-                extern {
-                    fn $name() $(-> $ret_ty),*;
-                }
-            }
-        );
-        (fn $name:ident ($($arg_name:ident : $arg_ty:ty),*) $(-> $ret_ty:ty),*) => (
-            pub unsafe fn $name($($arg_name : $arg_ty),*) $(-> $ret_ty),* {
-                // Note: to avoid obscure bug in macros, keep these
-                // attributes *internal* to the fn
-                #[fixed_stack_segment];
-                #[inline(never)];
-                #[allow(missing_doc)];
-
-                return $name($($arg_name),*);
-
-                extern {
-                    fn $name($($arg_name : $arg_ty),*) $(-> $ret_ty),*;
-                }
-            }
-        );
-        ($($attrs:attr)* fn $name:ident () $(-> $ret_ty:ty),*) => (
-            pub unsafe fn $name() $(-> $ret_ty),* {
-                // Note: to avoid obscure bug in macros, keep these
-                // attributes *internal* to the fn
-                #[fixed_stack_segment];
-                #[inline(never)];
-                #[allow(missing_doc)];
-
-                return $name();
-
-                $($attrs)*
-                extern {
-                    fn $name() $(-> $ret_ty),*;
-                }
-            }
-        );
-        ($($attrs:attr)* fn $name:ident ($($arg_name:ident : $arg_ty:ty),*) $(-> $ret_ty:ty),*) => (
-            pub unsafe fn $name($($arg_name : $arg_ty),*) $(-> $ret_ty),* {
-                // Note: to avoid obscure bug in macros, keep these
-                // attributes *internal* to the fn
-                #[fixed_stack_segment];
-                #[inline(never)];
-                #[allow(missing_doc)];
-
-                return $name($($arg_name),*);
-
-                $($attrs)*
-                extern {
-                    fn $name($($arg_name : $arg_ty),*) $(-> $ret_ty),*;
-                }
-            }
-        )
-    )
-
 }"#
 }
 
diff --git a/src/libsyntax/lib.rs b/src/libsyntax/lib.rs
index 3673d3719ad..247be194b90 100644
--- a/src/libsyntax/lib.rs
+++ b/src/libsyntax/lib.rs
@@ -22,6 +22,8 @@
 #[crate_type = "lib"];
 
 #[feature(macro_rules, globs, managed_boxes)];
+#[allow(unrecognized_lint)]; // NOTE: remove after the next snapshot
+#[allow(cstack)]; // NOTE: remove after the next snapshot.
 
 extern mod extra;