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

@@ -1,3 +1,8 @@
+2006-03-08  Alexandre Oliva  <aoliva@redhat.com>
+
+	* solib-svr4.c (svr4_current_sos): Move up initialization of
+	l_addr, such that it clearly covers all cases.
+
 2006-03-08  Andreas Schwab  <schwab@suse.de>
 
 	* ia64-tdep.c (ia64_libunwind_frame_this_id): Adapt use of

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;

gdb/testsuite/ChangeLog

@@ -1,3 +1,8 @@
+2006-03-08  Alexandre Oliva  <aoliva@redhat.com>
+
+	* gdb.base/prelink.exp: Anchor tested-for regular expression
+	on gdb prompt.
+
 2006-03-07  Paul Brook  <paul@codesourcery.com>
 
 	* gdb.base/assign.exp: Correct fail message.

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"
     }
 }