From 6551399088ae065e0f3c1c0b2be687652eacb561 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Sat, 15 Sep 2012 13:08:45 -0700
Subject: Remove $(have-cpp-asm-debuginfo) check

---
 ChangeLog      | 8 ++++++++
 Makeconfig     | 4 ----
 NEWS           | 3 ++-
 config.make.in | 1 -
 configure      | 2 --
 configure.in   | 1 -
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cc6cf649c7..b214afc0c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-09-14  H.J. Lu  <hongjiu.lu@intel.com>
+
+	[BZ #14587]
+	* Makeconfig (ASFLAGS): Remove $(have-cpp-asm-debuginfo) check.
+	* config.make.in (have-cpp-asm-debuginfo): Removed.
+	* configure.in: Don't substitute libc_cv_cpp_asm_debuginfo.
+	* configure: Regenerated.
+
 2012-09-14  Joseph Myers  <joseph@codesourcery.com>
 
 	[BZ #5044]
diff --git a/Makeconfig b/Makeconfig
index 3ed9746dcc..8d4f7b4404 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -801,11 +801,7 @@ endif
 
 # The assembler can generate debug information too.
 ifndef ASFLAGS
-ifeq ($(have-cpp-asm-debuginfo),yes)
 ASFLAGS := $(filter -g% -fdebug-prefix-map=%,$(CFLAGS))
-else
-ASFLAGS :=
-endif
 endif
 ASFLAGS += $(ASFLAGS-config) $(asflags-cpu)
 
diff --git a/NEWS b/NEWS
index c0ef036e75..adcb741b02 100644
--- a/NEWS
+++ b/NEWS
@@ -13,7 +13,8 @@ Version 2.17
   13542, 13717, 13696, 13939, 13966, 14042, 14090, 14166, 14150, 14151,
   14154, 14157, 14166, 14173, 14195, 14237, 14252, 14283, 14298, 14303,
   14307, 14328, 14331, 14336, 14337, 14347, 14349, 14459, 14476, 14505,
-  14510, 14516, 14518, 14519, 14532, 14538, 14544, 14545, 14576, 14583
+  14510, 14516, 14518, 14519, 14532, 14538, 14544, 14545, 14576, 14583,
+  14587
 
 * Support for STT_GNU_IFUNC symbols added for s390 and s390x.
   Optimized versions of memcpy, memset, and memcmp added for System z10 and
diff --git a/config.make.in b/config.make.in
index d84fe383c3..b6d1c945dc 100644
--- a/config.make.in
+++ b/config.make.in
@@ -55,7 +55,6 @@ have-Bgroup = @libc_cv_Bgroup@
 with-fp = @with_fp@
 old-glibc-headers = @old_glibc_headers@
 unwind-find-fde = @libc_cv_gcc_unwind_find_fde@
-have-cpp-asm-debuginfo = @libc_cv_cpp_asm_debuginfo@
 have-forced-unwind = @libc_cv_forced_unwind@
 have-fpie = @libc_cv_fpie@
 have-mfma4 = @libc_cv_cc_fma4@
diff --git a/configure b/configure
index d159ce0e7b..739d2bd8b5 100755
--- a/configure
+++ b/configure
@@ -589,7 +589,6 @@ libc_cv_cc_novzeroupper
 libc_cv_cc_sse2avx
 libc_cv_cc_avx
 libc_cv_cc_sse4
-libc_cv_cpp_asm_debuginfo
 libc_cv_forced_unwind
 libc_cv_rootsbindir
 libc_cv_localstatedir
@@ -7498,7 +7497,6 @@ fi
 
 
 
-
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -fPIC is default" >&5
diff --git a/configure.in b/configure.in
index a174646fab..878bf1aada 100644
--- a/configure.in
+++ b/configure.in
@@ -2147,7 +2147,6 @@ AC_SUBST(libc_cv_rootsbindir)
 AC_SUBST(libc_cv_forced_unwind)
 
 dnl sysdeps/CPU/configure.in checks set this via arch-specific asm tests
-AC_SUBST(libc_cv_cpp_asm_debuginfo)
 AC_SUBST(libc_cv_cc_sse4)
 AC_SUBST(libc_cv_cc_avx)
 AC_SUBST(libc_cv_cc_sse2avx)
-- 
cgit 1.4.1