--- gdb/dwarf2read.c	30 Sep 2008 16:57:37 -0000	1.285
+++ gdb/dwarf2read.c	7 Oct 2008 20:50:07 -0000
@@ -2432,6 +2432,7 @@ locate_pdi_sibling (struct partial_die_i
 static void
 dwarf2_psymtab_to_symtab (struct partial_symtab *pst)
 {
+return;
   /* FIXME: This is barely more than a stub.  */
   if (pst != NULL)
     {
--- gdb/symtab.c	1 Oct 2008 17:25:22 -0000	1.199
+++ gdb/symtab.c	7 Oct 2008 20:50:10 -0000
@@ -1527,6 +1527,8 @@ lookup_symbol_aux_psymtabs (int block_in
 				  psymtab_index, domain))
       {
 	s = PSYMTAB_TO_SYMTAB (ps);
+	if (!s)
+	  continue;
 	bv = BLOCKVECTOR (s);
 	block = BLOCKVECTOR_BLOCK (bv, block_index);
 	sym = lookup_block_symbol (block, name, linkage_name, domain);