i386/x86_64: punt HAVE_CPP_ASM_DEBUGINFO

Pretty sure we require recent enough versions of gcc/binutils to make this
check pointless.  I can't any logs in the last few years where this check
didn't return "yes".

Signed-off-by: Mike Frysinger <vapier@gentoo.org>

diff --git a/ChangeLog b/ChangeLog
index 9f23a23..d6ef5e9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2012-08-14  Mike Frysinger  <vapier@gentoo.org>
+
+       * config.h.in (HAVE_CPP_ASM_DEBUGINFO): Delete.
+       * sysdeps/i386/configure.in: Remove assembler-with-cpp debug check.
+       * sysdeps/i386/configure: Regenerated.
+       * sysdeps/i386/sysdep.h (ENTRY): Remove calls to STABS_CURRENT_FILE1,
+       STABS_CURRENT_FILE, and STABS_FUN.
+       (END): Remove call to STABS_FUN_END.
+       (STABS_CURRENT_FILE1): Delete.
+       (STABS_CURRENT_FILE): Likewise.
+       (STABS_FUN): Likewise.
+       (STABS_FUN_END): Likewise.
+       (STABS_FUN2): Likewise.
+       * sysdeps/x86_64/configure.in: Remove assembler-with-cpp debug check.
+       * sysdeps/x86_64/configure: Regenerated.
+
 2012-08-14  Roland McGrath  <roland@hack.frob.com>
 
        * elf/dl-open.c: Include <atomic.h>.

diff --git a/config.h.in b/config.h.in
index 40b4717..e27e86d 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -46,9 +46,6 @@
 /* On powerpc64, use overlapping .opd entries.  */
 #undef  USE_PPC64_OVERLAPPING_OPD
 
-/* Define if the assembler generates debugging information directly.  */
-#undef HAVE_CPP_ASM_DEBUGINFO
-
 /* Define if _Unwind_Find_FDE should be exported from glibc.  */
 #undef  EXPORT_UNWIND_FIND_FDE
 

diff --git a/sysdeps/i386/configure b/sysdeps/i386/configure
index 44bdb20..608ff29 100644 (file)
--- a/sysdeps/i386/configure
+++ b/sysdeps/i386/configure
@@ -162,57 +162,6 @@ else
 fi
 
 
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if -g produces usable source locations for assembler-with-cpp" >&5
-$as_echo_n "checking if -g produces usable source locations for assembler-with-cpp... " >&6; }
-if ${libc_cv_cpp_asm_debuginfo+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat > conftest.S <<EOF
-#include "confdefs.h"
-
-/* comment on
-   two lines */
-       ${libc_cv_dot_text}
-       .globl foo
-foo:
-       /* Unfortunately this test only works for a real instruction,
-          not for any of the machine-independent pseudo-ops.
-          So we just have to assume everybody has a "nop".  */
-       nop
-       /* comment */
-       nop
-       /* comment */
-       nop
-EOF
-if { ac_try='${CC-cc} $CPPFLAGS $ASFLAGS -g -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; }; } && {
-   ac_pattern='conftest\.S'
-   { ac_try='readelf --debug-dump=line conftest.o |
-                  grep $ac_pattern 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_cpp_asm_debuginfo=yes
-else
-  libc_cv_cpp_asm_debuginfo=no
-fi
-rm -f conftest*
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_cpp_asm_debuginfo" >&5
-$as_echo "$libc_cv_cpp_asm_debuginfo" >&6; }
-if test $libc_cv_cpp_asm_debuginfo = yes; then
-  $as_echo "#define HAVE_CPP_ASM_DEBUGINFO 1" >>confdefs.h
-
-fi
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSE4 support" >&5
 $as_echo_n "checking for SSE4 support... " >&6; }
 if ${libc_cv_cc_sse4+:} false; then :

diff --git a/sysdeps/i386/configure.in b/sysdeps/i386/configure.in
index 399f737..36cb3e4 100644 (file)
--- a/sysdeps/i386/configure.in
+++ b/sysdeps/i386/configure.in
@@ -5,39 +5,6 @@ AC_CHECK_HEADER([cpuid.h], ,
   [AC_MSG_ERROR([gcc must provide the <cpuid.h> header])],
   [/* No default includes.  */])
 
-AC_CACHE_CHECK(if -g produces usable source locations for assembler-with-cpp,
-              libc_cv_cpp_asm_debuginfo, [dnl
-cat > conftest.S <<EOF
-#include "confdefs.h"
-
-/* comment on
-   two lines */
-       ${libc_cv_dot_text}
-       .globl foo
-foo:
-       /* Unfortunately this test only works for a real instruction,
-          not for any of the machine-independent pseudo-ops.
-          So we just have to assume everybody has a "nop".  */
-       nop
-       /* comment */
-       nop
-       /* comment */
-       nop
-EOF
-if AC_TRY_COMMAND([${CC-cc} $CPPFLAGS $ASFLAGS -g -c conftest.S 1>&AS_MESSAGE_LOG_FD]) && {
-   ac_pattern='conftest\.S'
-   AC_TRY_COMMAND([readelf --debug-dump=line conftest.o |
-                  grep $ac_pattern 1>&AS_MESSAGE_LOG_FD])
-  }; then
-  libc_cv_cpp_asm_debuginfo=yes
-else
-  libc_cv_cpp_asm_debuginfo=no
-fi
-rm -f conftest*])AC_SUBST(libc_cv_cpp_asm_debuginfo)
-if test $libc_cv_cpp_asm_debuginfo = yes; then
-  AC_DEFINE(HAVE_CPP_ASM_DEBUGINFO)
-fi
-
 dnl Check if -msse4 works.
 AC_CACHE_CHECK(for SSE4 support, libc_cv_cc_sse4, [dnl
 LIBC_TRY_CC_OPTION([-msse4], [libc_cv_cc_sse4=yes], [libc_cv_cc_sse4=no])

diff --git a/sysdeps/i386/sysdep.h b/sysdeps/i386/sysdep.h
index 2e547e6..4ea7202 100644 (file)
--- a/sysdeps/i386/sysdep.h
+++ b/sysdeps/i386/sysdep.h
@@ -59,12 +59,9 @@
    incomplete stabs information.  Fake some entries here which specify
    the current source file.  */
 #define        ENTRY(name)                                                           \
-  STABS_CURRENT_FILE1("")                                                    \
-  STABS_CURRENT_FILE(name)                                                   \
   .globl C_SYMBOL_NAME(name);                                                \
   .type C_SYMBOL_NAME(name),@function;                                       \
   .align ALIGNARG(4);                                                        \
-  STABS_FUN(name)                                                            \
   C_LABEL(name)                                                                      \
   cfi_startproc;                                                             \
   CALL_MCOUNT
@@ -72,35 +69,11 @@
 #undef END
 #define END(name)                                                            \
   cfi_endproc;                                                               \
-  ASM_SIZE_DIRECTIVE(name)                                                   \
-  STABS_FUN_END(name)
+  ASM_SIZE_DIRECTIVE(name)
 
 #define ENTRY_CHK(name) ENTRY (name)
 #define END_CHK(name) END (name)
 
-#ifdef HAVE_CPP_ASM_DEBUGINFO
-/* Disable that goop, because we just pass -g through to the assembler
-   and it generates proper line number information directly.  */
-# define STABS_CURRENT_FILE1(name)
-# define STABS_CURRENT_FILE(name)
-# define STABS_FUN(name)
-# define STABS_FUN_END(name)
-#else
-/* Remove the following two lines once the gdb bug is fixed.  */
-#define STABS_CURRENT_FILE(name)                                             \
-  STABS_CURRENT_FILE1 (#name)
-#define STABS_CURRENT_FILE1(name)                                            \
-  1: .stabs name,100,0,0,1b;
-/* Emit stabs definition lines.  We use F(0,1) and define t(0,1) as `int',
-   the same way gcc does it.  */
-#define STABS_FUN(name) STABS_FUN2(name, name##:F(0,1))
-#define STABS_FUN2(name, namestr)                                            \
-  .stabs "int:t(0,1)=r(0,1);-2147483648;2147483647;",128,0,0,0;                      \
-  .stabs #namestr,36,0,0,name;
-#define STABS_FUN_END(name)                                                  \
-  1: .stabs "",36,0,0,1b-name;
-#endif
-
 /* If compiled for profiling, call `mcount' at the start of each function.  */
 #ifdef PROF
 /* The mcount code relies on a normal frame pointer being on the stack

diff --git a/sysdeps/x86_64/configure b/sysdeps/x86_64/configure
index b87c0b1..adbaeee 100644 (file)
--- a/sysdeps/x86_64/configure
+++ b/sysdeps/x86_64/configure
@@ -72,6 +72,10 @@ $as_echo X/"$0" |
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -163,56 +167,6 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if -g produces usable source locations for assembler-with-cpp" >&5
-$as_echo_n "checking if -g produces usable source locations for assembler-with-cpp... " >&6; }
-if ${libc_cv_cpp_asm_debuginfo+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat > conftest.S <<EOF
-#include "confdefs.h"
-
-/* comment on
-   two lines */
-       ${libc_cv_dot_text}
-       .globl foo
-foo:
-       /* Unfortunately this test only works for a real instruction,
-          not for any of the machine-independent pseudo-ops.
-          So we just have to assume everybody has a "nop".  */
-       nop
-       /* comment */
-       nop
-       /* comment */
-       nop
-EOF
-if { ac_try='${CC-cc} $CPPFLAGS $ASFLAGS -g -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; }; } && {
-   ac_pattern='conftest\.S'
-   { ac_try='readelf --debug-dump=line conftest.o |
-                  grep $ac_pattern 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_cpp_asm_debuginfo=yes
-else
-  libc_cv_cpp_asm_debuginfo=no
-fi
-rm -f conftest*
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_cpp_asm_debuginfo" >&5
-$as_echo "$libc_cv_cpp_asm_debuginfo" >&6; }
-if test $libc_cv_cpp_asm_debuginfo = yes; then
-  $as_echo "#define HAVE_CPP_ASM_DEBUGINFO 1" >>confdefs.h
-
-fi
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSE4 support" >&5
 $as_echo_n "checking for SSE4 support... " >&6; }
 if ${libc_cv_cc_sse4+:} false; then :

diff --git a/sysdeps/x86_64/configure.in b/sysdeps/x86_64/configure.in
index a95dc8d..94bcd19 100644 (file)
--- a/sysdeps/x86_64/configure.in
+++ b/sysdeps/x86_64/configure.in
@@ -5,39 +5,6 @@ AC_CHECK_HEADER([cpuid.h], ,
   [AC_MSG_ERROR([gcc must provide the <cpuid.h> header])],
   [/* No default includes.  */])
 
-AC_CACHE_CHECK(if -g produces usable source locations for assembler-with-cpp,
-              libc_cv_cpp_asm_debuginfo, [dnl
-cat > conftest.S <<EOF
-#include "confdefs.h"
-
-/* comment on
-   two lines */
-       ${libc_cv_dot_text}
-       .globl foo
-foo:
-       /* Unfortunately this test only works for a real instruction,
-          not for any of the machine-independent pseudo-ops.
-          So we just have to assume everybody has a "nop".  */
-       nop
-       /* comment */
-       nop
-       /* comment */
-       nop
-EOF
-if AC_TRY_COMMAND([${CC-cc} $CPPFLAGS $ASFLAGS -g -c conftest.S 1>&AS_MESSAGE_LOG_FD]) && {
-   ac_pattern='conftest\.S'
-   AC_TRY_COMMAND([readelf --debug-dump=line conftest.o |
-                  grep $ac_pattern 1>&AS_MESSAGE_LOG_FD])
-  }; then
-  libc_cv_cpp_asm_debuginfo=yes
-else
-  libc_cv_cpp_asm_debuginfo=no
-fi
-rm -f conftest*])AC_SUBST(libc_cv_cpp_asm_debuginfo)
-if test $libc_cv_cpp_asm_debuginfo = yes; then
-  AC_DEFINE(HAVE_CPP_ASM_DEBUGINFO)
-fi
-
 dnl Check if -msse4 works.
 AC_CACHE_CHECK(for SSE4 support, libc_cv_cc_sse4, [dnl
 LIBC_TRY_CC_OPTION([-msse4], [libc_cv_cc_sse4=yes], [libc_cv_cc_sse4=no])