Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc

mk/config.mk.in

@@ -134,6 +134,10 @@ DYNAMIC_TOO = YES
 ifeq "$(TargetOS_CPP)" "mingw32"
 # This doesn't work on Windows yet
 DYNAMIC_GHC_PROGRAMS = NO
+else ifeq "$(TargetOS_CPP)" "freebsd"
+# FreeBSD cannot do proper resolution for $ORIGIN (due to a bug in
+# rtld(1)), so disable it by default (see #7819).
+DYNAMIC_GHC_PROGRAMS = NO
 else
 DYNAMIC_GHC_PROGRAMS = YES
 endif

rts/package.conf.in

@@ -41,6 +41,9 @@ extra-libraries:
 			      ,"gdi32"      /* for the linker */
 			      ,"winmm"      /* for the linker */
 #endif
+#ifdef freebsd_HOST_OS
+			      , "pthread" /* for pthread_getthreadid_np() */
+#endif
 #if defined(DEBUG) && defined(HAVE_LIBBFD)
 			      ,"bfd", "iberty"	/* for debugging */
 #endif