diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index cb7e716dee6..e07a91d86c5 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,10 @@
+2007-02-02  Jakub Jelinek  <jakub@redhat.com>
+
+	Revert:
+	2006-07-05  Eric Christopher  <echristo@apple.com>
+	* configure.ac: Depend addition of -pthread on host OS.
+	* configure: Regenerate.
+
 2007-01-31  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* libgomp.texi: Fix spacing after abbreviations.
diff --git a/libgomp/configure b/libgomp/configure
index 6301eeba4c2..fe7517bbafd 100755
--- a/libgomp/configure
+++ b/libgomp/configure
@@ -8464,8 +8464,7 @@ fi
 # Check to see if -pthread or -lpthread is needed.  Prefer the former.
 # In case the pthread.h system header is not found, this test will fail.
 XPCFLAGS=""
-
-# Darwin doesn't need the -pthread option since threads are in libSystem
+CFLAGS="$CFLAGS -pthread"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -8504,13 +8503,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  case $host in
-   *-darwin*)
-     ;;
-   default)
-     XPCFLAGS=" -Wc,-pthread"
-     ;;
-     esac
+  XPCFLAGS=" -Wc,-pthread"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
diff --git a/libgomp/configure.ac b/libgomp/configure.ac
index 69dd37e7a62..4ee96e2b3dd 100644
--- a/libgomp/configure.ac
+++ b/libgomp/configure.ac
@@ -166,20 +166,13 @@ GCC_HEADER_STDINT(gstdint.h)
 # Check to see if -pthread or -lpthread is needed.  Prefer the former.
 # In case the pthread.h system header is not found, this test will fail.
 XPCFLAGS=""
-
-# Darwin doesn't need the -pthread option since threads are in libSystem
+CFLAGS="$CFLAGS -pthread"
 AC_LINK_IFELSE(
  [AC_LANG_PROGRAM(
   [#include <pthread.h>
    void *g(void *d) { return NULL; }],
   [pthread_t t; pthread_create(&t,NULL,g,NULL);])],
- [case $host in
-   *-darwin*)
-     ;;
-   default)
-     XPCFLAGS=" -Wc,-pthread"
-     ;;
-     esac],
+ [XPCFLAGS=" -Wc,-pthread"],
  [CFLAGS="$save_CFLAGS" LIBS="-lpthread $LIBS"
   AC_LINK_IFELSE(
    [AC_LANG_PROGRAM(