From 8c0c01dbe70e00b6b85425d0c5c22b30bd2fc1ac Mon Sep 17 00:00:00 2001
From: Joseph Myers <joseph@codesourcery.com>
Date: Mon, 26 Oct 2015 22:44:18 +0000
Subject: [PATCH] Remove configure test for assembler .text directive.

There is a configure test for assembler support for the .text
directive.

I suppose this test must have been aimed at some non-ELF platform or
non-GNU assembler.  Certainly the GNU assembler has had ELF-specific
architecture-independent handling for .text since version 2.2, and
generic non-ELF-specific support predates that.

This patch removes this test as obsolete.

Tested for x86_64 and x86 (testsuite, and that installed shared
libraries are unchanged by the patch).

	* configure.ac (libc_cv_dot_text): Remove configure test.
	(libc_cv_asm_set_directive): Use .text instead of
	${libc_cv_dot_text} in configure test.
	* configure: Regenerated.
---
 ChangeLog    |  7 +++++++
 configure    | 30 +-----------------------------
 configure.ac | 18 +-----------------
 3 files changed, 9 insertions(+), 46 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5b9be31b25..91f83c41c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-10-26  Joseph Myers  <joseph@codesourcery.com>
+
+	* configure.ac (libc_cv_dot_text): Remove configure test.
+	(libc_cv_asm_set_directive): Use .text instead of
+	${libc_cv_dot_text} in configure test.
+	* configure: Regenerated.
+
 2015-10-26  Florian Weimer  <fweimer@redhat.com>
 
 	[BZ #19168]
diff --git a/configure b/configure
index ff3ad55b1d..e375244488 100755
--- a/configure
+++ b/configure
@@ -3914,34 +3914,6 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_ld_gnu_indirect_function" >&5
 $as_echo "$libc_cv_ld_gnu_indirect_function" >&6; }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether .text pseudo-op must be used" >&5
-$as_echo_n "checking whether .text pseudo-op must be used... " >&6; }
-if ${libc_cv_dot_text+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat > conftest.s <<EOF
-.text
-EOF
-libc_cv_dot_text=
-if { ac_try='${CC-cc} $ASFLAGS -c 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_dot_text=.text
-fi
-rm -f conftest*
-fi
-
-if test -z "$libc_cv_dot_text"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-fi
-
 if test x"$libc_cv_ld_gnu_indirect_function" != xyes; then
   if test x"$multi_arch" = xyes; then
     as_fn_error $? "--enable-multi-arch support requires assembler and linker support" "$LINENO" 5
@@ -5335,7 +5307,7 @@ if ${libc_cv_asm_set_directive+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat > conftest.s <<EOF
-${libc_cv_dot_text}
+.text
 foo:
 .set glibc_conftest_frobozz,foo
 .globl glibc_conftest_frobozz
diff --git a/configure.ac b/configure.ac
index 3c7f6c0096..023f132ad3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -635,22 +635,6 @@ if ${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS \
 fi
 rm -f conftest*])
 
-AC_MSG_CHECKING(whether .text pseudo-op must be used)
-AC_CACHE_VAL(libc_cv_dot_text, [dnl
-cat > conftest.s <<EOF
-.text
-EOF
-libc_cv_dot_text=
-if AC_TRY_COMMAND(${CC-cc} $ASFLAGS -c conftest.s 1>&AS_MESSAGE_LOG_FD); then
-  libc_cv_dot_text=.text
-fi
-rm -f conftest*])
-if test -z "$libc_cv_dot_text"; then
-  AC_MSG_RESULT(no)
-else
-  AC_MSG_RESULT(yes)
-fi
-
 if test x"$libc_cv_ld_gnu_indirect_function" != xyes; then
   if test x"$multi_arch" = xyes; then
     AC_MSG_ERROR([--enable-multi-arch support requires assembler and linker support])
@@ -1115,7 +1099,7 @@ fi
 
 AC_CACHE_CHECK(for .set assembler directive, libc_cv_asm_set_directive, [dnl
 cat > conftest.s <<EOF
-${libc_cv_dot_text}
+.text
 foo:
 .set glibc_conftest_frobozz,foo
 .globl glibc_conftest_frobozz