From 831004b79b321ba269145f7e32539e33ac8dbc1b Mon Sep 17 00:00:00 2001 From: Alexandre Oliva Date: Thu, 9 Mar 2006 00:22:09 +0000 Subject: [PATCH] gdb/ChangeLog: * solib-svr4.c (svr4_current_sos): Move up initialization of l_addr, such that it clearly covers all cases. gdb/testsuite/ChangeLog: * gdb.base/prelink.exp: Anchor tested-for regular expression on gdb prompt. --- gdb/ChangeLog | 5 +++++ gdb/solib-svr4.c | 3 +-- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.base/prelink.exp | 3 ++- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 55bbc172634..bb8d2825d1d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2006-03-08 Alexandre Oliva + + * solib-svr4.c (svr4_current_sos): Move up initialization of + l_addr, such that it clearly covers all cases. + 2006-03-08 Andreas Schwab * ia64-tdep.c (ia64_libunwind_frame_this_id): Adapt use of diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c index 7d740a33b40..b0d12b369be 100644 --- a/gdb/solib-svr4.c +++ b/gdb/solib-svr4.c @@ -704,6 +704,7 @@ svr4_current_sos (void) new->lm_info = xmalloc (sizeof (struct lm_info)); make_cleanup (xfree, new->lm_info); + new->lm_info->l_addr = (CORE_ADDR)-1; new->lm_info->lm = xzalloc (lmo->link_map_size); make_cleanup (xfree, new->lm_info->lm); @@ -744,8 +745,6 @@ svr4_current_sos (void) free_so (new); else { - new->lm_info->l_addr = (CORE_ADDR)-1; - new->next = 0; *link_ptr = new; link_ptr = &new->next; diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 8ada3d4c2c6..68c9cb272da 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2006-03-08 Alexandre Oliva + + * gdb.base/prelink.exp: Anchor tested-for regular expression + on gdb prompt. + 2006-03-07 Paul Brook * gdb.base/assign.exp: Correct fail message. diff --git a/gdb/testsuite/gdb.base/prelink.exp b/gdb/testsuite/gdb.base/prelink.exp index 57e471d81e5..7dbf77e0016 100644 --- a/gdb/testsuite/gdb.base/prelink.exp +++ b/gdb/testsuite/gdb.base/prelink.exp @@ -103,8 +103,9 @@ gdb_reinitialize_dir $srcdir/$subdir gdb_load ${binfile} set test "prelink" +global gdb_prompt gdb_test_multiple "core-file $objdir/$subdir/prelink.core" "$test" { - -re "warning: \.dynamic section.*not at the expected address.*warning: difference.*caused by prelink, adjusting expectations." { + -re "warning: \.dynamic section.*not at the expected address.*warning: difference.*caused by prelink, adjusting expectations.*$gdb_prompt $" { pass "$test" } } -- 2.30.2