* configure.ac (HAVE_AS_TLS): Swap powerpc64 and powerpc cases.

	(HAVE_LD_LARGE_TOC): Don't mention AIX in help text.
	* configure: Regenerate.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@198766 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f1ffb43..b6101ba 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
 2013-05-10  Alan Modra  <amodra@gmail.com>
 
+       * configure.ac (HAVE_AS_TLS): Swap powerpc64 and powerpc cases.
+       (HAVE_LD_LARGE_TOC): Don't mention AIX in help text.
+       * configure: Regenerate.
+
+2013-05-10  Alan Modra  <amodra@gmail.com>
+
        PR target/55033
        * varasm.c (default_elf_select_section): Move !DECL_P check..
        (get_named_section): ..to here before calling get_section_name.

diff --git a/gcc/configure b/gcc/configure
index b21b9ff..def377f 100755 (executable)
--- a/gcc/configure
+++ b/gcc/configure
@@ -23286,32 +23286,6 @@ a:
        tls_first_major=0
        tls_first_minor=0
        ;;
-  powerpc*-*-*)
-    conftest_s='
-       .section ".tdata","awT",@progbits
-       .align 2
-ld0:   .space 4
-ld1:   .space 4
-x1:    .space 4
-x2:    .space 4
-x3:    .space 4
-       .text
-       addi 3,31,ld0@got@tlsgd
-       bl __tls_get_addr
-       addi 3,31,x1@got@tlsld
-       bl __tls_get_addr
-       addi 9,3,x1@dtprel
-       addis 9,3,x2@dtprel@ha
-       addi 9,9,x2@dtprel@l
-       lwz 9,x3@got@tprel(31)
-       add 9,9,x@tls
-       addi 9,2,x1@tprel
-       addis 9,2,x2@tprel@ha
-       addi 9,9,x2@tprel@l'
-       tls_first_major=2
-       tls_first_minor=14
-       tls_as_opt="-a32 --fatal-warnings"
-       ;;
   powerpc64*-*-*)
     conftest_s='
        .section ".tdata","awT",@progbits
@@ -23346,6 +23320,32 @@ x3:    .space 8
        tls_first_minor=14
        tls_as_opt="-a64 --fatal-warnings"
        ;;
+  powerpc*-*-*)
+    conftest_s='
+       .section ".tdata","awT",@progbits
+       .align 2
+ld0:   .space 4
+ld1:   .space 4
+x1:    .space 4
+x2:    .space 4
+x3:    .space 4
+       .text
+       addi 3,31,ld0@got@tlsgd
+       bl __tls_get_addr
+       addi 3,31,x1@got@tlsld
+       bl __tls_get_addr
+       addi 9,3,x1@dtprel
+       addis 9,3,x2@dtprel@ha
+       addi 9,9,x2@dtprel@l
+       lwz 9,x3@got@tprel(31)
+       add 9,9,x@tls
+       addi 9,2,x1@tprel
+       addis 9,2,x2@tprel@ha
+       addi 9,9,x2@tprel@l'
+       tls_first_major=2
+       tls_first_minor=14
+       tls_as_opt="-a32 --fatal-warnings"
+       ;;
   s390-*-*)
     conftest_s='
        .section ".tdata","awT",@progbits

diff --git a/gcc/configure.ac b/gcc/configure.ac
index 7f900aa..effae81 100644 (file)
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -3045,32 +3045,6 @@ a:
        tls_first_major=0
        tls_first_minor=0
        ;;
-  powerpc*-*-*)
-    conftest_s='
-       .section ".tdata","awT",@progbits
-       .align 2
-ld0:   .space 4
-ld1:   .space 4
-x1:    .space 4
-x2:    .space 4
-x3:    .space 4
-       .text
-       addi 3,31,ld0@got@tlsgd
-       bl __tls_get_addr
-       addi 3,31,x1@got@tlsld
-       bl __tls_get_addr
-       addi 9,3,x1@dtprel
-       addis 9,3,x2@dtprel@ha
-       addi 9,9,x2@dtprel@l
-       lwz 9,x3@got@tprel(31)
-       add 9,9,x@tls
-       addi 9,2,x1@tprel
-       addis 9,2,x2@tprel@ha
-       addi 9,9,x2@tprel@l'
-       tls_first_major=2
-       tls_first_minor=14
-       tls_as_opt="-a32 --fatal-warnings"
-       ;;
   powerpc64*-*-*)
     conftest_s='
        .section ".tdata","awT",@progbits
@@ -3105,6 +3079,32 @@ x3:      .space 8
        tls_first_minor=14
        tls_as_opt="-a64 --fatal-warnings"
        ;;
+  powerpc*-*-*)
+    conftest_s='
+       .section ".tdata","awT",@progbits
+       .align 2
+ld0:   .space 4
+ld1:   .space 4
+x1:    .space 4
+x2:    .space 4
+x3:    .space 4
+       .text
+       addi 3,31,ld0@got@tlsgd
+       bl __tls_get_addr
+       addi 3,31,x1@got@tlsld
+       bl __tls_get_addr
+       addi 9,3,x1@dtprel
+       addis 9,3,x2@dtprel@ha
+       addi 9,9,x2@dtprel@l
+       lwz 9,x3@got@tprel(31)
+       add 9,9,x@tls
+       addi 9,2,x1@tprel
+       addis 9,2,x2@tprel@ha
+       addi 9,9,x2@tprel@l'
+       tls_first_major=2
+       tls_first_minor=14
+       tls_as_opt="-a32 --fatal-warnings"
+       ;;
   s390-*-*)
     conftest_s='
        .section ".tdata","awT",@progbits
@@ -4680,7 +4680,7 @@ EOF
     ])
     if test x"$gcc_cv_ld_large_toc" = xyes; then
       AC_DEFINE(HAVE_LD_LARGE_TOC, 1,
-    [Define if your AIX linker supports a large TOC.])
+    [Define if your PowerPC64 linker supports a large TOC.])
     fi
     ;;
 esac