[SCM] archer-jankratochvil-fedora12: Backport 4fa96a6246089e051109b2845caf5ad928594519 for F-12.

[jkratoch at sourceware dot org]

The branch, archer-jankratochvil-fedora12 has been updated
       via  b125345fb36abbb9bd00128e2093dc636a859da5 (commit)
       via  409343ac0351f4fcc3c5da07dca419bd76f3ae71 (commit)
      from  5b73ea6a0f74e63db3b504792fc1d37f548bdf5c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit b125345fb36abbb9bd00128e2093dc636a859da5
Author: Jan Kratochvil <jkratoch@host1.dyn.jankratochvil.net>
Date:   Wed Nov 25 11:13:45 2009 +0100

    Backport 4fa96a6246089e051109b2845caf5ad928594519 for F-12.

commit 409343ac0351f4fcc3c5da07dca419bd76f3ae71
Author: Jan Kratochvil <jkratoch@host1.dyn.jankratochvil.net>
Date:   Wed Nov 25 09:59:59 2009 +0100

    	* breakpoint.c (update_global_location_list): Fix duplicate
    	locations detection.
    
    Conflicts:
    
    	gdb/ChangeLog
    
    Conflicts:
    
    	gdb/breakpoint.c

-----------------------------------------------------------------------

Summary of changes:
 gdb/breakpoint.c |   44 ++++++++++++++++++++++++++++----------------
 1 files changed, 28 insertions(+), 16 deletions(-)

First 500 lines of diff:
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index b0bf314..0f35101 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -7997,10 +7997,11 @@ update_global_location_list (int should_insert)
        old_locp++)
     {
       struct bp_location *old_loc = *old_locp;
+      struct bp_location **loc2p;
 
       /* Tells if 'old_loc' is found amoung the new locations.  If not, we
 	 have to free it.  */
-      int found_object;
+      int found_object = 0;
       /* Tells if the location should remain inserted in the target.  */
       int keep_in_target = 0;
       int removed = 0;
@@ -8008,9 +8009,20 @@ update_global_location_list (int should_insert)
       /* Skip LOCP entries which will definitely never be needed.  Stop either
 	 at or being the one matching OLD_LOC.  */
       while (locp < bp_location + bp_location_count
-	     && bp_location_compare (*locp, old_loc) < 0)
+	     && (*locp)->address < old_loc->address)
 	locp++;
-      found_object = locp < bp_location + bp_location_count && *locp == old_loc;
+
+      for (loc2p = locp;
+	   (loc2p < bp_location + bp_location_count
+	    && (*loc2p)->address == old_loc->address);
+	   loc2p++)
+	{
+	  if (*loc2p == old_loc)
+	    {
+	      found_object = 1;
+	      break;
+	    }
+	}
 
       /* If this location is no longer present, and inserted, look if there's
 	 maybe a new location at the same address.  If so, mark that one 
@@ -8036,24 +8048,24 @@ update_global_location_list (int should_insert)
 
 	      if (breakpoint_address_is_meaningful (old_loc->owner))
 		{
-		  struct bp_location **loc2p;
-
 		  for (loc2p = locp;
-		       loc2p < bp_location + bp_location_count
-		       && (*loc2p)->address == old_loc->address;
+		       (loc2p < bp_location + bp_location_count
+			&& (*loc2p)->address == old_loc->address);
 		       loc2p++)
 		    {
 		      struct bp_location *loc2 = *loc2p;
 
-		      /* For the sake of should_be_inserted.
-			 Duplicates check below will fix up this later.  */
-		      loc2->duplicate = 0;
-		      if (loc2 != old_loc && should_be_inserted (loc2))
-			{		  
-			  loc2->inserted = 1;
-			  loc2->target_info = old_loc->target_info;
-			  keep_in_target = 1;
-			  break;
+			{
+			  /* For the sake of should_be_inserted.
+			     Duplicates check below will fix up this later.  */
+			  loc2->duplicate = 0;
+			  if (loc2 != old_loc && should_be_inserted (loc2))
+			    {
+			      loc2->inserted = 1;
+			      loc2->target_info = old_loc->target_info;
+			      keep_in_target = 1;
+			      break;
+			    }
 			}
 		    }
 		}


hooks/post-receive
--
Repository for Project Archer.