re PR target/49541 (TLS support partially broken in 64-bit mode)

	PR target/49541
	* config/sol2.h (LIB_SPEC): Simplify.
	Move LIB_THREAD_LDFLAGS_SPEC ...
	(LINK_SPEC): ... here.

From-SVN: r176244

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cd02017211ecb792333609f22e6729cc2d9925d8..ba7196647da6ec289228961156d49ce643ea1271 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2011-07-13  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+       PR target/49541
+       * config/sol2.h (LIB_SPEC): Simplify.
+       Move LIB_THREAD_LDFLAGS_SPEC ...
+       (LINK_SPEC): ... here.
+
 2011-07-13  Bernd Schmidt  <bernds@codesourcery.com>
 
        * haifa-sched.c (struct sched_block_state): New.

diff --git a/gcc/config/sol2.h b/gcc/config/sol2.h
index 3867c7dd2453e6f6709b7acc879f90d37e7ce3de..99f0382b64448c08388d34adef49b93f8001d66a 100644 (file)
--- a/gcc/config/sol2.h
+++ b/gcc/config/sol2.h
@@ -109,10 +109,8 @@ along with GCC; see the file COPYING3.  If not see
 #undef LIB_SPEC
 #define LIB_SPEC \
   "%{!symbolic:\
-     %{pthreads|pthread:" \
-        LIB_THREAD_LDFLAGS_SPEC " -lpthread " LIB_TLS_SPEC "} \
-     %{fprofile-generate*:" \
-        LIB_THREAD_LDFLAGS_SPEC " " LIB_TLS_SPEC "} \
+     %{pthreads|pthread:-lpthread} \
+     %{pthreads|pthread|fprofile-generate*:" LIB_TLS_SPEC "} \
      %{p|pg:-ldl} -lc}"
 
 #ifndef CROSS_DIRECTORY_STRUCTURE
@@ -175,6 +173,7 @@ along with GCC; see the file COPYING3.  If not see
    %{static:-dn -Bstatic} \
    %{shared:-G -dy %{!mimpure-text:-z text}} \
    %{symbolic:-Bsymbolic -G -dy -z text} \
+   %{pthreads|pthread|fprofile-generate*:" LIB_THREAD_LDFLAGS_SPEC "} \
    %(link_arch) \
    %{Qy:} %{!Qn:-Qy}"