[SCM] archer-jankratochvil-watchpoint3: Merge branch 'cleanup-fork-multi-kernel' into archer-jankratochvil-watchpoint3

[jkratoch@sourceware.org]

The branch, archer-jankratochvil-watchpoint3 has been updated
       via  940fc080a370235a1b515265d066876193e7028e (commit)
       via  5b687cf72f4e7fa8ff259041a7e0e98aaf189d39 (commit)
       via  a702071b07fa366acaa1de4da1cc08df56753c2b (commit)
       via  373aebc8d95ae0bd1839444f28b7425572d263f3 (commit)
       via  dcad851e3161e2f23251c98d9a762e4af40bc3c8 (commit)
       via  af97d895e9c55e55bdd1e7f9a17a83e661a817ca (commit)
       via  c27b38bddf215d8cd81ac11c9968f71c5e106491 (commit)
       via  435ad6756ab87966ba6894cd1758562dcd50b88b (commit)
       via  51bb62e548a508defe39363cf6d3b2ac0c1decb8 (commit)
       via  6dbd6b5af3619569afddec9161705b12658668a3 (commit)
      from  4e7b069ea7a6e6a2e51da9155c7932b33e4334e8 (commit)

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

- Log -----------------------------------------------------------------
commit 940fc080a370235a1b515265d066876193e7028e
Merge: 4e7b069 5b687cf
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Sat Dec 11 06:16:26 2010 +0100

    Merge branch 'cleanup-fork-multi-kernel' into archer-jankratochvil-watchpoint3

commit 5b687cf72f4e7fa8ff259041a7e0e98aaf189d39
Merge: 373aebc a702071
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Sat Dec 11 06:13:33 2010 +0100

    Merge branch 'cleanup-fork-multi' into cleanup-fork-multi-kernel

commit a702071b07fa366acaa1de4da1cc08df56753c2b
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Sat Dec 11 06:13:25 2010 +0100

    +comments

commit 373aebc8d95ae0bd1839444f28b7425572d263f3
Merge: c27b38b dcad851
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Sat Dec 11 05:15:10 2010 +0100

    Merge branch 'cleanup-fork-multi' into cleanup-fork-multi-kernel

commit dcad851e3161e2f23251c98d9a762e4af40bc3c8
Merge: 435ad67 af97d89
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Sat Dec 11 05:15:09 2010 +0100

    Merge branch 'cleanup-fork' into cleanup-fork-multi

commit af97d895e9c55e55bdd1e7f9a17a83e661a817ca
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Sat Dec 11 05:15:06 2010 +0100

    fix

commit c27b38bddf215d8cd81ac11c9968f71c5e106491
Merge: adfee99 435ad67
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Sat Dec 11 05:14:40 2010 +0100

    Merge branch 'cleanup-fork-multi' into cleanup-fork-multi-kernel

commit 435ad6756ab87966ba6894cd1758562dcd50b88b
Merge: e739058 51bb62e
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Sat Dec 11 05:14:39 2010 +0100

    Merge branch 'cleanup-fork' into cleanup-fork-multi

commit 51bb62e548a508defe39363cf6d3b2ac0c1decb8
Merge: 5a2e2c8 6dbd6b5
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Sat Dec 11 05:14:37 2010 +0100

    Merge branch 'cleanup' into cleanup-fork

commit 6dbd6b5af3619569afddec9161705b12658668a3
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Sat Dec 11 05:14:25 2010 +0100

    foo

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

Summary of changes:
 gdb/breakpoint.c |    5 ++++-
 gdb/linux-nat.c  |    6 +++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

First 500 lines of diff:
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 38b2b25..be0d262 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -1910,7 +1910,10 @@ insert_breakpoint_locations (void)
       /* For targets that support global breakpoints, there's no need
 	 to select an inferior to insert breakpoint to.  In fact, even
 	 if we aren't attached to any process yet, we should still
-	 insert breakpoints.  */
+	 insert breakpoints.
+
+	 Also inserting breakpoints into inappropriate inferior must be
+	 prevented.  */
       if (!gdbarch_has_global_breakpoints (target_gdbarch)
 	  && (ptid_equal (inferior_ptid, null_ptid)
 	      || b->pspace != saved_current_program_space))
diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
index bfff6c5..c4d1c28 100644
--- a/gdb/linux-nat.c
+++ b/gdb/linux-nat.c
@@ -1286,13 +1286,17 @@ linux_nat_iterate_watchpoint_lwps
 
   if (inf->pid == inferior_pid)
     {
-      /* Standard mode.  */
+      /* Standard mode.  Iterate all the threads of the current inferior.
+	 Without specifying INFERIOR_PID it would iterate all the threads of
+	 all the inferiors, which is inappropriate for watchpoints.  */
+
       iterate_over_lwps (pid_to_ptid (inferior_pid),
 			 iterate_watchpoint_lwps_callback, &data);
     }
   else
     {
       /* Detaching a new child PID temporarily present in INFERIOR_PID.  */
+
       callback (inferior_pid, callback_data);
     }
 }


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