[WIP]

Author: bjorn3

src/bootstrap/bin/rustc.rs

@@ -57,6 +57,8 @@ fn main() {
     let mut cmd = Command::new(rustc);
     cmd.args(&args).env(bootstrap::util::dylib_path_var(), env::join_paths(&dylib_path).unwrap());
 
+    cmd.arg("-Clink-arg=-rdynamic"); // Export __cg_clif_global_atomic_mutex from rustc executable for proc macros
+
     // Get the name of the crate we're compiling, if any.
     let crate_name =
         args.windows(2).find(|args| args[0] == "--crate-name").and_then(|args| args[1].to_str());

src/rustc/rustc.rs

@@ -1,3 +1,9 @@
+extern crate libc;
+
+#[no_mangle]
+#[used]
+pub static mut __cg_clif_global_atomic_mutex: libc::pthread_mutex_t = libc::PTHREAD_MUTEX_INITIALIZER;
+
 fn main() {
     // Pull in jemalloc when enabled.
     //
@@ -26,6 +32,8 @@ fn main() {
         static _F6: unsafe extern "C" fn(*mut c_void) = jemalloc_sys::free;
     }
 
+    unsafe { libc::pthread_mutex_init(&mut __cg_clif_global_atomic_mutex, 0 as *const _); }
+
     rustc_driver::set_sigpipe_handler();
     rustc_driver::main()
 }