---
 gdb/breakpoint.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Index: src/gdb/breakpoint.c
===================================================================
--- src.orig/gdb/breakpoint.c	2008-04-23 18:26:53.000000000 +0100
+++ src/gdb/breakpoint.c	2008-04-23 18:28:43.000000000 +0100
@@ -7019,12 +7019,12 @@ update_global_location_list (void)
 	      if (breakpoint_address_is_meaningful (loc->owner))
 		for (loc2 = bp_location_chain; loc2; loc2 = loc2->global_next)
 		  {
-		    /* For the sake of should_insert_location.  The
-		       call to check_duplicates will fix up this later.  */
-		    loc2->duplicate = 0;
-		    if (should_insert_location (loc2)
-			&& loc2 != loc && loc2->address == loc->address)
-		      {		  
+		    if (loc2 != loc
+			&& loc2->address == loc->address
+			&& breakpoint_enabled (loc2->owner)
+			&& loc2->enabled && !loc2->shlib_disabled
+			&& loc2->owner->disposition != disp_del_at_next_stop)
+		      {
 			loc2->inserted = 1;
 			loc2->target_info = loc->target_info;
 			keep = 1;