diff -urpN src/gdb/arch-utils.c dev/gdb/arch-utils.c
--- src/gdb/arch-utils.c	2008-01-01 23:53:09.000000000 +0100
+++ dev/gdb/arch-utils.c	2008-02-15 08:29:34.000000000 +0100
@@ -454,8 +454,6 @@ gdbarch_update_p (struct gdbarch_info in
 struct gdbarch *
 gdbarch_from_bfd (bfd *abfd)
 {
-  struct gdbarch *old_gdbarch = current_gdbarch;
-  struct gdbarch *new_gdbarch;
   struct gdbarch_info info;
 
   /* If we call gdbarch_find_by_info without filling in info.abfd,