* solib-svr4.c (BKPT_AT_SYMBOL): Remove, always defined.

	(bkpt_names): Remove SOLIB_BKPT_NAME, never defined.
	(enable_break): Remove test of BKPT_AT_SYMBOL.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6d78071..7d18289 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-04  Stan Shebs  <stan@codesourcery.com>
+
+       * solib-svr4.c (BKPT_AT_SYMBOL): Remove, always defined.
+       (bkpt_names): Remove SOLIB_BKPT_NAME, never defined.
+       (enable_break): Remove test of BKPT_AT_SYMBOL.
+
 2008-08-02  Keith Seitz  <keiths@redhat.com>
 
        * acinclude.m4: Include ../config/tcl.m4 to pick up

diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c
index 70e8802..f988ae1 100644 (file)
--- a/gdb/solib-svr4.c
+++ b/gdb/solib-svr4.c
@@ -85,20 +85,13 @@ static char *solib_break_names[] =
   NULL
 };
 
-#define BKPT_AT_SYMBOL 1
-
-#if defined (BKPT_AT_SYMBOL)
 static char *bkpt_names[] =
 {
-#ifdef SOLIB_BKPT_NAME
-  SOLIB_BKPT_NAME,             /* Prefer configured name if it exists. */
-#endif
   "_start",
   "__start",
   "main",
   NULL
 };
-#endif
 
 static char *main_name_list[] =
 {
@@ -967,8 +960,6 @@ exec_entry_point (struct bfd *abfd, struct target_ops *targ)
 static int
 enable_break (void)
 {
-#ifdef BKPT_AT_SYMBOL
-
   struct minimal_symbol *msymbol;
   char **bkpt_namep;
   asection *interp_sect;
@@ -1203,8 +1194,6 @@ enable_break (void)
          return 1;
        }
     }
-#endif /* BKPT_AT_SYMBOL */
-
   return 0;
 }