diff -urN src/gdb/config/s390/tm-s390.h src-s390/gdb/config/s390/tm-s390.h
--- src/gdb/config/s390/tm-s390.h	Sat Oct 13 22:13:35 2001
+++ src-s390/gdb/config/s390/tm-s390.h	Wed Feb 20 12:41:35 2002
@@ -109,7 +109,7 @@
 
 #else /* GDBSERVER */
 
-#define GDB_TARGET_IS_ESAME (TARGET_ARCHITECTURE->mach == bfd_mach_s390_esame)
+#define GDB_TARGET_IS_ESAME (TARGET_ARCHITECTURE->mach == bfd_mach_s390_64)
 
 #endif /* GDBSERVER */
 #endif /* ifndef TM_S390_H */
diff -urN src/gdb/s390-tdep.c src-s390/gdb/s390-tdep.c
--- src/gdb/s390-tdep.c	Mon Jan 28 15:00:09 2002
+++ src-s390/gdb/s390-tdep.c	Wed Feb 20 12:40:55 2002
@@ -1851,7 +1851,7 @@
 
   switch (info.bfd_arch_info->mach)
     {
-    case bfd_mach_s390_esa:
+    case bfd_mach_s390_31:
       set_gdbarch_register_size (gdbarch, 4);
       set_gdbarch_register_raw_size (gdbarch, s390_register_raw_size);
       set_gdbarch_register_virtual_size (gdbarch, s390_register_raw_size);
@@ -1860,7 +1860,7 @@
       set_gdbarch_addr_bits_remove (gdbarch, s390_addr_bits_remove);
       set_gdbarch_register_bytes (gdbarch, S390_REGISTER_BYTES);
       break;
-    case bfd_mach_s390_esame:
+    case bfd_mach_s390_64:
       set_gdbarch_register_size (gdbarch, 8);
       set_gdbarch_register_raw_size (gdbarch, s390x_register_raw_size);
       set_gdbarch_register_virtual_size (gdbarch, s390x_register_raw_size);