From 231f3ae68d79bfa2dbfd447bf6116a663ad73512 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Tue, 24 May 2011 10:58:09 +0000 Subject: [PATCH] 2011-05-24 Pedro Alves gdb/ * solib-svr4.c (svr4_solib_create_inferior_hook): Skip setting shared library event breakpoint if there's no execution. gdb/testsuite/ * gdb.trace/tfile.exp: Add test that opening the basic.tf trace file doesn't error, using MI. --- gdb/ChangeLog | 5 +++++ gdb/solib-svr4.c | 5 +++++ gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.trace/tfile.exp | 5 +++++ 4 files changed, 20 insertions(+) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 32b4559b760..9ffd3660305 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2011-05-24 Pedro Alves + + * solib-svr4.c (svr4_solib_create_inferior_hook): Skip setting + shared library event breakpoint if there's no execution. + 2011-05-23 Tom Tromey * c-lang.c (evaluate_subexp_c): Use expect_type if it is not diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c index 78c6b1c3ee1..30abaa7c81e 100644 --- a/gdb/solib-svr4.c +++ b/gdb/solib-svr4.c @@ -2177,6 +2177,11 @@ svr4_solib_create_inferior_hook (int from_tty) /* Relocate the main executable if necessary. */ svr4_relocate_main_executable (); + /* No point setting a breakpoint in the dynamic linker if we can't + hit it (e.g., a core file, or a trace file). */ + if (!target_has_execution) + return; + if (!svr4_have_link_map_offsets ()) return; diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index f90fd156b12..89a2de6815c 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-05-24 Pedro Alves + + * gdb.trace/tfile.exp: Add test that opening the basic.tf trace + file doesn't error, using MI. + 2011-05-23 Tom Tromey * gdb.base/charset.exp (string_display): Add tests to assign to diff --git a/gdb/testsuite/gdb.trace/tfile.exp b/gdb/testsuite/gdb.trace/tfile.exp index 0614423d6bc..0a89873e3ff 100644 --- a/gdb/testsuite/gdb.trace/tfile.exp +++ b/gdb/testsuite/gdb.trace/tfile.exp @@ -116,3 +116,8 @@ Collected 0 trace frame.* Trace buffer has 256 bytes of 4096 bytes free \\(93% full\\).* Not looking at any trace frame.*" \ "tstatus on error trace file" + +# Make sure we can reopen without error. +gdb_test \ + "interpreter-exec mi \"-target-select tfile basic.tf\"" \ + "\\^connected.*" -- 2.47.2