X-Git-Url: https://repo.jachan.dev/binutils.git/blobdiff_plain/9e4902bfacb49f350cb95e7ee0fe1a8eed33c353..HEAD:/gdb/annotate.c

diff --git a/gdb/annotate.c b/gdb/annotate.c
index 8d6f58c9c1..33805dcdb3 100644
--- a/gdb/annotate.c
+++ b/gdb/annotate.c
@@ -293,7 +293,7 @@ void
 annotate_error_begin (void)
 {
   if (annotation_level > 1)
-    fprintf_unfiltered (gdb_stderr, "\n\032\032error-begin\n");
+    gdb_printf (gdb_stderr, "\n\032\032error-begin\n");
 }
 
 void
@@ -448,12 +448,12 @@ annotate_source_line (struct symtab *s, int line, int mid_statement,
 	return false;
 
       annotate_source (s->fullname, line, (int) (*offsets)[line - 1],
-		       mid_statement, s->objfile ()->arch (),
+		       mid_statement, s->compunit ()->objfile ()->arch (),
 		       pc);
 
       /* Update the current symtab and line.  */
       symtab_and_line sal;
-      sal.pspace = s->pspace ();
+      sal.pspace = s->compunit ()->objfile ()->pspace;
       sal.symtab = s;
       sal.line = line;
       set_current_source_symtab_and_line (sal);