diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3806e72fae..df42bb01cb 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-27  Markus Deuling  <deuling@de.ibm.com>
+
+	* xcoffread.c (scan_xcoff_symtab): Replace current_gdbarch by
+	objfile arch.
+
 2008-03-27  Nick Roberts  <nickrob@snap.net.nz>
 
 	* mi/mi-main.c (enum captured_mi_execute_command_actions):
diff --git a/gdb/xcoffread.c b/gdb/xcoffread.c
index dead40c181..660e012143 100644
--- a/gdb/xcoffread.c
+++ b/gdb/xcoffread.c
@@ -2119,6 +2119,7 @@ function_outside_compilation_unit_complaint (const char *arg1)
 static void
 scan_xcoff_symtab (struct objfile *objfile)
 {
+  struct gdbarch *gdbarch = get_objfile_arch (objfile);
   CORE_ADDR toc_offset = 0;	/* toc offset value in data section. */
   char *filestring = NULL;