diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d667af78c68..3fa5738676a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2012-04-18  Tom Tromey  <tromey@redhat.com>
+
+	* linespec.c (convert_linespec_to_sals): Don't use
+	SYMBOL_OBJ_SECTION.
+	(compare_msymbols): Arguments are minsym_and_objfile, not
+	minimal_symbol*.  Don't use SYMBOL_OBJ_SECTION.
+
 2012-04-18  Pedro Alves  <palves@redhat.com>
 
 	Revert gnulib/ part of:
diff --git a/gdb/linespec.c b/gdb/linespec.c
index 228214b4d2f..7cbf1bf5746 100644
--- a/gdb/linespec.c
+++ b/gdb/linespec.c
@@ -1899,7 +1899,7 @@ convert_linespec_to_sals (struct linespec_state *state, linespec_p ls)
 	       VEC_iterate (minsym_and_objfile_d, ls->minimal_symbols, i, elem);
 	       ++i)
 	    {
-	      pspace = SYMBOL_OBJ_SECTION (elem->minsym)->objfile->pspace;
+	      pspace = elem->objfile->pspace;
 	      set_current_program_space (pspace);
 	      minsym_found (state, elem->objfile, elem->minsym, &sals);
 	    }
@@ -2584,20 +2584,20 @@ compare_symbols (const void *a, const void *b)
 static int
 compare_msymbols (const void *a, const void *b)
 {
-  struct minimal_symbol * const *sa = a;
-  struct minimal_symbol * const *sb = b;
+  const struct minsym_and_objfile *sa = a;
+  const struct minsym_and_objfile *sb = b;
   uintptr_t uia, uib;
 
-  uia = (uintptr_t) SYMBOL_OBJ_SECTION (*sa)->objfile->pspace;
-  uib = (uintptr_t) SYMBOL_OBJ_SECTION (*sb)->objfile->pspace;
+  uia = (uintptr_t) sa->objfile->pspace;
+  uib = (uintptr_t) sa->objfile->pspace;
 
   if (uia < uib)
     return -1;
   if (uia > uib)
     return 1;
 
-  uia = (uintptr_t) *sa;
-  uib = (uintptr_t) *sb;
+  uia = (uintptr_t) sa->minsym;
+  uib = (uintptr_t) sb->minsym;
 
   if (uia < uib)
     return -1;