summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog6
-rwxr-xr-xgcc/configure8
-rw-r--r--gcc/configure.ac8
3 files changed, 18 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index feef2ce8d63..53c52fd32d5 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
2014-03-07 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
+ * configure.ac (HAVE_AS_IX86_TLSLDMPLT): Improve test for Solaris
+ 11/x86 ld.
+ * configure: Regenerate.
+
+2014-03-07 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
+
* configure.ac (TLS_SECTION_ASM_FLAG): Save as tls_section_flag.
(LIB_TLS_SPEC): Save as ld_tls_libs.
(HAVE_AS_IX86_TLSLDMPLT): Define as 1/0.
diff --git a/gcc/configure b/gcc/configure
index 297238daef3..415377adc19 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -25183,6 +25183,11 @@ $as_echo "#define HAVE_AS_IX86_TLSGDPLT 1" >>confdefs.h
fi
+ conftest_s='
+ .section .tdata,"aw'$tls_section_flag'",@progbits
+tls_ld:
+ .section .text,"ax",@progbits
+ call tls_ld@tlsldmplt'
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler for R_386_TLS_LDM_PLT reloc" >&5
$as_echo_n "checking assembler for R_386_TLS_LDM_PLT reloc... " >&6; }
if test "${gcc_cv_as_ix86_tlsldmplt+set}" = set; then :
@@ -25190,8 +25195,7 @@ if test "${gcc_cv_as_ix86_tlsldmplt+set}" = set; then :
else
gcc_cv_as_ix86_tlsldmplt=no
if test x$gcc_cv_as != x; then
- $as_echo 'tls_ld:
- call tls_ld@tlsldmplt' > conftest.s
+ $as_echo "$conftest_s" > conftest.s
if { ac_try='$gcc_cv_as $gcc_cv_as_flags -o conftest.o conftest.s >&5'
{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
(eval $ac_try) 2>&5
diff --git a/gcc/configure.ac b/gcc/configure.ac
index 156d46c2ad6..0336066ccd2 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -3920,10 +3920,14 @@ foo: nop
[AC_DEFINE(HAVE_AS_IX86_TLSGDPLT, 1,
[Define if your assembler and linker support @tlsgdplt.])])
+ conftest_s='
+ .section .tdata,"aw'$tls_section_flag'",@progbits
+tls_ld:
+ .section .text,"ax",@progbits
+ call tls_ld@tlsldmplt'
gcc_GAS_CHECK_FEATURE([R_386_TLS_LDM_PLT reloc],
gcc_cv_as_ix86_tlsldmplt,,,
- [tls_ld:
- call tls_ld@tlsldmplt],
+ [$conftest_s],
[if test x$gcc_cv_ld != x \
&& $gcc_cv_ld -o conftest conftest.o -G > /dev/null 2>&1; then
gcc_cv_as_ix86_tlsldmplt=yes
OpenPOWER on IntegriCloud