* configure.ac (DEBUGGER_SEES_C_MACROS): Remove.

* src/lisp.h (DEBUGGER_SEES_C_MACROS): Likewise.
It apparently doesn't work for GCC 3, and I suppose it's more
trouble than it's worth to worry about this.

4 files changed, 11 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index 506fa045864..30c87c3e613 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-11-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * configure.ac (DEBUGGER_SEES_C_MACROS): Remove.
+        It apparently doesn't work for GCC 3, and I suppose it's more
+        trouble than it's worth to worry about this.
+
 2013-11-15  Paul Eggert  <eggert@cs.ucla.edu>
 
         * configure.ac (DEBUGGER_SEES_C_MACROS): New macro.
diff --git a/configure.ac b/configure.ac
index 9c66a7d2d85..a9baf608bf3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -697,16 +697,6 @@ if test "$ac_test_CFLAGS" != set; then
   esac
 fi
 
-for flag in $CFLAGS -; do
-  case $flag in
-    -g*3)
-      AC_DEFINE([DEBUGGER_SEES_C_MACROS], 1,
-        [Define to 1 if C macros are visible to the debugger, as with
-         GCC's -g3 option.])
-      break;;
-  esac
-done
-
 AC_ARG_ENABLE([gcc-warnings],
   [AS_HELP_STRING([--enable-gcc-warnings],
                   [turn on lots of GCC warnings/errors. This is intended for
diff --git a/src/ChangeLog b/src/ChangeLog
index 60a965e0d2f..de4c1dc6531 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * lisp.h (DEBUGGER_SEES_C_MACROS): Remove.
+
 2013-11-16  Eli Zaretskii  <eliz@gnu.org>
 
         * doc.c (Fsubstitute_command_keys): Inhibit modification hooks
diff --git a/src/lisp.h b/src/lisp.h
index 50b0f75c471..926b83d7ce0 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -45,14 +45,7 @@ INLINE_HEADER_BEGIN
    definitions visible to the debugger.  It's used for symbols that
    .gdbinit needs, symbols whose values may not fit in 'int' (where an
    enum would suffice).  */
-#if defined DEBUGGER_SEES_C_MACROS && defined __GNUC__
-/* GCC versions before 3.5 have unreliable support for C macros in
-   debug info.  */
-# if __GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 5)
-#  undef DEBUGGER_SEES_C_MACROS
-# endif
-#endif
-#if defined MAIN_PROGRAM && !defined DEBUGGER_SEES_C_MACROS
+#if defined MAIN_PROGRAM
 # define DEFINE_GDB_SYMBOL_BEGIN(type, id) type const id EXTERNALLY_VISIBLE
 # define DEFINE_GDB_SYMBOL_END(id) = id;
 #else