Consolidate Sparc ELF configure fragments to one spot.

	* sysdeps/sparc/sparc32/elf/configure.in: Delete.
	* sysdeps/sparc/sparc32/elf/configure: Delete.
	* sysdeps/sparc/sparc64/elf/configure.in: Delete.
	* sysdeps/sparc/sparc64/elf/configure: Delete.
	* sysdeps/sparc/elf/configure.in: New file.
	* sysdeps/sparc/elf/configure: Generate.

ChangeLog

@@ -1,5 +1,12 @@
 2012-02-20  David S. Miller  <davem@davemloft.net>
 
+	* sysdeps/sparc/sparc32/elf/configure.in: Delete.
+	* sysdeps/sparc/sparc32/elf/configure: Delete.
+	* sysdeps/sparc/sparc64/elf/configure.in: Delete.
+	* sysdeps/sparc/sparc64/elf/configure: Delete.
+	* sysdeps/sparc/elf/configure.in: New file.
+	* sysdeps/sparc/elf/configure: Generate.
+
 	* sysdeps/sparc/sparc32/elf/configure.in: Delete WDISP22 check.
 	* sysdeps/sparc/sparc32/elf/configure: Regenerate.
 	* sysdeps/sparc/sparc64/elf/configure.in: Likewise.

sysdeps/sparc/sparc32/elf/configure → sysdeps/sparc/elf/configure

@@ -81,15 +81,15 @@ $as_echo X/"$0" |
 }
 
 # This file is generated from configure.in by Autoconf.  DO NOT EDIT!
- # Local configure fragment for sysdeps/sparc/sparc32/elf.
+ # Local configure fragment for sysdeps/sparc/elf.
 
 # Check for support of thread-local storage handling in assembler and linker.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sparc32 TLS support" >&5
-$as_echo_n "checking for sparc32 TLS support... " >&6; }
-if ${libc_cv_sparc32_tls+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sparc TLS support" >&5
+$as_echo_n "checking for sparc TLS support... " >&6; }
+if ${libc_cv_sparc_tls+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  cat > conftest.s <<\EOF
+  cat > conftest.S <<\EOF
 	.section ".tdata", "awT", @progbits
 	.globl foo
 foo:	.word	1
@@ -110,25 +110,29 @@ baz:	sethi	%tgd_hi22(foo), %l1
 	add	%o0, %l1, %l1, %tldo_add(bar)
 	sethi	%tie_hi22(foo), %l1
 	add	%l1, %tie_lo10(foo), %l1
+#ifdef __arch64__
+	ldx	[%l7 + %l1], %l1, %tie_ldx(foo)
+#else
 	ld	[%l7 + %l1], %l1, %tie_ld(foo)
+#endif
 	add	%g7, %l1, %l1, %tie_add(foo)
 	sethi	%tle_hix22(foo), %l1
 	xor	%l1, %tle_lox10(foo), %l1
 EOF
-if { ac_try='${CC-cc} -c $CFLAGS conftest.s 1>&5'
+if { ac_try='${CC-cc} -c $CFLAGS conftest.S 1>&5'
   { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }; then
-  libc_cv_sparc32_tls=yes
+  libc_cv_sparc_tls=yes
 else
-  libc_cv_sparc32_tls=no
+  libc_cv_sparc_tls=no
 fi
 rm -f conftest*
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_sparc32_tls" >&5
-$as_echo "$libc_cv_sparc32_tls" >&6; }
-if test $libc_cv_sparc32_tls = no; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_sparc_tls" >&5
+$as_echo "$libc_cv_sparc_tls" >&6; }
+if test $libc_cv_sparc_tls = no; then
   as_fn_error $? "the assembler must support TLS" "$LINENO" 5
 fi

sysdeps/sparc/sparc32/elf/configure.in → sysdeps/sparc/elf/configure.in

@@ -1,10 +1,10 @@
 GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
-# Local configure fragment for sysdeps/sparc/sparc32/elf.
+# Local configure fragment for sysdeps/sparc/elf.
 
 # Check for support of thread-local storage handling in assembler and linker.
-AC_CACHE_CHECK(for sparc32 TLS support, libc_cv_sparc32_tls, [dnl
+AC_CACHE_CHECK(for sparc TLS support, libc_cv_sparc_tls, [dnl
 changequote(,)dnl
-cat > conftest.s <<\EOF
+cat > conftest.S <<\EOF
 	.section ".tdata", "awT", @progbits
 	.globl foo
 foo:	.word	1
@@ -25,19 +25,23 @@ baz:	sethi	%tgd_hi22(foo), %l1
 	add	%o0, %l1, %l1, %tldo_add(bar)
 	sethi	%tie_hi22(foo), %l1
 	add	%l1, %tie_lo10(foo), %l1
+#ifdef __arch64__
+	ldx	[%l7 + %l1], %l1, %tie_ldx(foo)
+#else
 	ld	[%l7 + %l1], %l1, %tie_ld(foo)
+#endif
 	add	%g7, %l1, %l1, %tie_add(foo)
 	sethi	%tle_hix22(foo), %l1
 	xor	%l1, %tle_lox10(foo), %l1
 EOF
 changequote([,])dnl
 dnl
-if AC_TRY_COMMAND(${CC-cc} -c $CFLAGS conftest.s 1>&AS_MESSAGE_LOG_FD); then
-  libc_cv_sparc32_tls=yes
+if AC_TRY_COMMAND(${CC-cc} -c $CFLAGS conftest.S 1>&AS_MESSAGE_LOG_FD); then
+  libc_cv_sparc_tls=yes
 else
-  libc_cv_sparc32_tls=no
+  libc_cv_sparc_tls=no
 fi
 rm -f conftest*])
-if test $libc_cv_sparc32_tls = no; then
+if test $libc_cv_sparc_tls = no; then
   AC_MSG_ERROR([the assembler must support TLS])
 fi