* configure.ac (common): Make the default "yes" for all targets

[deliverable/binutils-gdb.git] / gdb / breakpoint.c

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index a2a4d196cbcf698bdb17f98b37ca7a599ffc38d1..ed91c1e0b6faba8d362e177f71cc727221750d80 100644 (file)
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -850,7 +850,7 @@ insert_bp_location (struct bp_location *bpt,
                      if (!said)
                        {
                          fprintf_filtered (gdb_stdout, _("\
-Note: automatically using hardware breakpoints for read-only addresses."));
+Note: automatically using hardware breakpoints for read-only addresses.\n"));
                          said = 1;
                        }
                    }
@@ -2564,6 +2564,13 @@ watchpoint_check (void *p)
       reinit_frame_cache ();
       fr = frame_find_by_id (b->watchpoint_frame);
       within_current_scope = (fr != NULL);
+
+      /* If we've gotten confused in the unwinder, we might have
+        returned a frame that can't describe this variable.  */
+      if (within_current_scope
+         && block_function (b->exp_valid_block) != get_frame_function (fr))
+       within_current_scope = 0;
+
       /* in_function_epilogue_p() returns a non-zero value if we're still
         in the function but the stack frame has already been invalidated.
         Since we can't rely on the values of local variables after the