From 8f5f45bfe143b667a4d3bb41963ed130b13fdb7f Mon Sep 17 00:00:00 2001
From: Jyun-Yan You <jyyou@cs.nctu.edu.tw>
Date: Thu, 7 Jun 2012 16:38:10 +0800
Subject: [PATCH] fix compiletest deadlock on freebsd

---
 mk/platform.mk         |  6 ------
 src/rustc/back/link.rs | 13 +++++++------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/mk/platform.mk b/mk/platform.mk
index 7d2039acdead5..6208cb5463862 100644
--- a/mk/platform.mk
+++ b/mk/platform.mk
@@ -33,12 +33,6 @@ ifneq ($(findstring freebsd,$(CFG_OSTYPE)),)
   CFG_DEF_SUFFIX := .bsd.def
   CFG_INSTALL_NAME =
   CFG_PERF_TOOL := /usr/bin/time
-
-  # FIXME (1825): We're deadlocking on FreeBSD
-  ifndef RUST_THREADS
-    RUST_THREADS=1
-    export RUST_THREADS
-  endif
 endif
 
 ifneq ($(findstring linux,$(CFG_OSTYPE)),)
diff --git a/src/rustc/back/link.rs b/src/rustc/back/link.rs
index c3e1b4da77276..c9f1b706893df 100644
--- a/src/rustc/back/link.rs
+++ b/src/rustc/back/link.rs
@@ -645,12 +645,13 @@ fn link_binary(sess: session,
     }
 
     if sess.targ_cfg.os == session::os_freebsd {
-        cc_args += ["-lrt", "-L/usr/local/lib", "-lexecinfo",
-                     "-L/usr/local/lib/gcc46",
-                     "-L/usr/local/lib/gcc44", "-lstdc++",
-                     "-Wl,-z,origin",
-                     "-Wl,-rpath,/usr/local/lib/gcc46",
-                     "-Wl,-rpath,/usr/local/lib/gcc44"];
+        cc_args += ["-pthread", "-lrt",
+                    "-L/usr/local/lib", "-lexecinfo",
+                    "-L/usr/local/lib/gcc46",
+                    "-L/usr/local/lib/gcc44", "-lstdc++",
+                    "-Wl,-z,origin",
+                    "-Wl,-rpath,/usr/local/lib/gcc46",
+                    "-Wl,-rpath,/usr/local/lib/gcc44"];
     }
 
     // OS X 10.6 introduced 'compact unwind info', which is produced by the