[SCM] archer-tromey-ambiguous-linespec: let get_sal_arch return NULL again; assert instead in one caller

[SCM] archer-tromey-ambiguous-linespec: let get_sal_arch return NULL again; assert instead in one caller

[tromey]

The branch, archer-tromey-ambiguous-linespec has been updated
       via  5d936bc6a73a9b351d5f94dd8541ab03f6a25a0f (commit)
       via  d2055632014bbca234887f74e0b1378e25c72ad1 (commit)
      from  ff32a84957b3804558c4695929a59dcd889f49ff (commit)

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

- Log -----------------------------------------------------------------
commit 5d936bc6a73a9b351d5f94dd8541ab03f6a25a0f
Author: Tom Tromey <tromey@redhat.com>
Date:   Fri Oct 14 08:48:33 2011 -0600

    let get_sal_arch return NULL again; assert instead in one caller

commit d2055632014bbca234887f74e0b1378e25c72ad1
Author: Tom Tromey <tromey@redhat.com>
Date:   Fri Oct 14 08:19:25 2011 -0600

    make attachstop-mt test work even when glibc debuginfo is installed

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

Summary of changes:
 gdb/breakpoint.c                            |    4 ++--
 gdb/testsuite/gdb.threads/attachstop-mt.exp |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

First 500 lines of diff:
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 73054b1..eb325a8 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -5776,8 +5776,7 @@ get_sal_arch (struct symtab_and_line sal)
   if (sect)
     return get_objfile_arch (sect->objfile);
 
-  gdb_assert_not_reached ("could not find arch for SAL");
-  /* return NULL; */
+  return NULL;
 }
 
 /* Low level routine for partially initializing a breakpoint of type
@@ -7131,6 +7130,7 @@ add_location_to_breakpoint (struct breakpoint *b,
     ;
   *tmp = loc;
   loc->gdbarch = get_sal_arch (*sal);
+  gdb_assert (loc->gdbarch);
   loc->requested_address = sal->pc;
   loc->address = adjust_breakpoint_address (loc->gdbarch,
 					    loc->requested_address, b->type);
diff --git a/gdb/testsuite/gdb.threads/attachstop-mt.exp b/gdb/testsuite/gdb.threads/attachstop-mt.exp
index c44b50f..12bf960 100644
--- a/gdb/testsuite/gdb.threads/attachstop-mt.exp
+++ b/gdb/testsuite/gdb.threads/attachstop-mt.exp
@@ -208,8 +208,8 @@ gdb_test "thread 2" ".*(witching to thread 2 |hread ID 2 not known).*" "attach4
 gdb_test "bt" ".*sleep.*(func|main).*" "attach4 to stopped bt"
 
 # RHEL3U8 kernel-2.4.21-47.EL will not return SIGINT but only shorten the sleep.
-gdb_breakpoint [gdb_get_line_number "Ridiculous time"]
-gdb_breakpoint [gdb_get_line_number "cut the sleep time"]
+gdb_breakpoint $srcfile:[gdb_get_line_number "Ridiculous time"]
+gdb_breakpoint $srcfile:[gdb_get_line_number "cut the sleep time"]
 set test "attach4 continue"
 gdb_test_multiple "continue" "continue ($test)" {
     -re "Continuing" {


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