diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 56d43681be9..7b19325f2f1 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,7 @@
+2006-12-02  Eric Botcazou  <ebotcazou@libertysurf.fr>
+
+	* configure.tgt: Force initial-exec TLS model on Linux only.
+
 2006-11-13  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* configure: Regenerated.
diff --git a/libgomp/configure.tgt b/libgomp/configure.tgt
index 7464d6a1cdf..89bae02e80a 100644
--- a/libgomp/configure.tgt
+++ b/libgomp/configure.tgt
@@ -13,9 +13,14 @@
 # Optimize TLS usage by avoiding the overhead of dynamic allocation.
 # This does require that the library be present during process 
 # startup, so mark the library as not to be dlopened.
-if test $have_tls = yes && test "$with_gnu_ld" = "yes"; then
+if test $have_tls = yes ; then
+  case "${target}" in
+
+    *-*-linux*)
 	XCFLAGS="${XCFLAGS} -ftls-model=initial-exec"
 	XLDFLAGS="${XLDFLAGS} -Wl,-z,nodlopen"
+	;;
+  esac
 fi
 
 # Since we require POSIX threads, assume a POSIX system by default.