Rollup merge of #68473 - nopsledder:rust_sanitizer_fuchsia, r=alexcrichton

[rust.git] / src / rustc / rustc.rs

diff --git a/src/rustc/rustc.rs b/src/rustc/rustc.rs
index fef6b830040b9e1c23269b3fb2a1dd6bfc6b229e..6bc5aa6382c4cd1a9bb3c43e64ab38b731f39f53 100644 (file)
--- a/src/rustc/rustc.rs
+++ b/src/rustc/rustc.rs
@@ -1,15 +1,3 @@
-#![feature(link_args)]
-
-// Set the stack size at link time on Windows. See rustc_driver::in_rustc_thread
-// for the rationale.
-#[allow(unused_attributes)]
-#[cfg_attr(all(windows, target_env = "msvc"), link_args = "/STACK:16777216")]
-// We only build for msvc and gnu now, but we use a exhaustive condition here
-// so we can expect either the stack size to be set or the build fails.
-#[cfg_attr(all(windows, not(target_env = "msvc")), link_args = "-Wl,--stack,16777216")]
-// Also, don't forget to set this for rustdoc.
-extern {}
-
 fn main() {
     // Pull in jemalloc when enabled.
     //
@@ -21,26 +9,21 @@ fn main() {
     // object code in the rustc executable).
     #[cfg(feature = "jemalloc-sys")]
     {
-        use std::os::raw::{c_void, c_int};
+        use std::os::raw::{c_int, c_void};
 
         #[used]
-        static _F1: unsafe extern fn(usize, usize) -> *mut c_void =
-            jemalloc_sys::calloc;
+        static _F1: unsafe extern "C" fn(usize, usize) -> *mut c_void = jemalloc_sys::calloc;
         #[used]
-        static _F2: unsafe extern fn(*mut *mut c_void, usize, usize) -> c_int =
+        static _F2: unsafe extern "C" fn(*mut *mut c_void, usize, usize) -> c_int =
             jemalloc_sys::posix_memalign;
         #[used]
-        static _F3: unsafe extern fn(usize, usize) -> *mut c_void =
-            jemalloc_sys::aligned_alloc;
+        static _F3: unsafe extern "C" fn(usize, usize) -> *mut c_void = jemalloc_sys::aligned_alloc;
         #[used]
-        static _F4: unsafe extern fn(usize) -> *mut c_void =
-            jemalloc_sys::malloc;
+        static _F4: unsafe extern "C" fn(usize) -> *mut c_void = jemalloc_sys::malloc;
         #[used]
-        static _F5: unsafe extern fn(*mut c_void, usize) -> *mut c_void =
-            jemalloc_sys::realloc;
+        static _F5: unsafe extern "C" fn(*mut c_void, usize) -> *mut c_void = jemalloc_sys::realloc;
         #[used]
-        static _F6: unsafe extern fn(*mut c_void) =
-            jemalloc_sys::free;
+        static _F6: unsafe extern "C" fn(*mut c_void) = jemalloc_sys::free;
     }
 
     rustc_driver::set_sigpipe_handler();