Merge conflicts for GCC 3.4.4.

1 files changed, 16 insertions, 16 deletions

diff --git a/contrib/gcc/config/freebsd-spec.h b/contrib/gcc/config/freebsd-spec.h
index 5c27804..e0a5b66 100644
--- a/contrib/gcc/config/freebsd-spec.h
+++ b/contrib/gcc/config/freebsd-spec.h
@@ -130,15 +130,15 @@ Boston, MA 02111-1307, USA.  */
    required by the user-land thread model.  Before __FreeBSD_version
    500016, select the appropriate libc, depending on whether we're
    doing profiling or need threads support.  At __FreeBSD_version
-   500016 and later, thread libraries can be linked with libc.  To
-   make matters interesting, we can't actually use __FreeBSD_version
-   provided by <osreldate.h> directly since it breaks cross-compiling.
-   As a final twist, make it a hard error if -pthread is provided on
-   the command line and gcc was configured with --disable-threads
-   (this will help avoid bug reports from users complaining about
-   threading when they misconfigured the gcc bootstrap but are later
-   consulting FreeBSD manual pages that refer to the mythical -pthread
-   option).  */
+   500016 and later, when threads support is requested include both
+   -lc and the threading lib instead of only -lc_r.  To make matters
+   interesting, we can't actually use __FreeBSD_version provided by
+   <osreldate.h> directly since it breaks cross-compiling.  As a final
+   twist, make it a hard error if -pthread is provided on the command
+   line and gcc was configured with --disable-threads (this will help
+   avoid bug reports from users complaining about threading when they
+   misconfigured the gcc bootstrap but are later consulting FreeBSD
+   manual pages that refer to the mythical -pthread option).  */
 
 /* Provide a LIB_SPEC appropriate for FreeBSD.  Just select the appropriate
    libc, depending on whether we're doing profiling or need threads support.
@@ -154,13 +154,7 @@ is built with the --enable-threads configure-time option.}		\
   }"
 #else
 #include <sys/param.h>
-#if __FreeBSD_version >= 500016
-#define FBSD_LIB_SPEC "							\
-  %{!shared:								\
-    %{!pg: %{pthread:-lpthread} -lc}					\
-    %{pg:  %{pthread:-lpthread_p} -lc_p}					\
-  }"
-#else
+#if __FreeBSD_version < 500016
 #define FBSD_LIB_SPEC "							\
   %{!shared:								\
     %{!pg:								\
@@ -170,6 +164,12 @@ is built with the --enable-threads configure-time option.}		\
       %{!pthread:-lc_p}							\
       %{pthread:-lc_r_p}}						\
   }"
+#else
+#define FBSD_LIB_SPEC "							\
+  %{!shared:								\
+    %{!pg: %{pthread:-lpthread} -lc}					\
+    %{pg:  %{pthread:-lpthread_p} -lc_p}				\
+  }"
 #endif
 #endif