From b8b8b04721a9b0a677ecd66aa03e3e322d988385 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Sat, 23 Feb 2002 20:00:17 +0000 Subject: [PATCH] From 2002-02-20 Martin Schwidefsky : * config/s390/tm-s390.h (GDB_TARGET_IS_ESAME): Use renamed architecture defines. * s390-tdep.c (s390_gdbarch_init): Likewise. --- gdb/ChangeLog | 7 +++++++ gdb/config/s390/tm-s390.h | 2 +- gdb/s390-tdep.c | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ac001a86b3b..10226fa9de5 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2002-02-23 Andrew Cagney + + From 2002-02-20 Martin Schwidefsky : + * config/s390/tm-s390.h (GDB_TARGET_IS_ESAME): Use renamed + architecture defines. + * s390-tdep.c (s390_gdbarch_init): Likewise. + 2002-02-23 Richard Earnshaw * arm-linux-tdep.c (arm_linux_extract_return_value): Make static. diff --git a/gdb/config/s390/tm-s390.h b/gdb/config/s390/tm-s390.h index da9f621facf..1c6e6787099 100644 --- a/gdb/config/s390/tm-s390.h +++ b/gdb/config/s390/tm-s390.h @@ -109,7 +109,7 @@ int s390_register_raw_size (int reg_nr); #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 --git a/gdb/s390-tdep.c b/gdb/s390-tdep.c index 239b17a33da..41da9a45ae4 100644 --- a/gdb/s390-tdep.c +++ b/gdb/s390-tdep.c @@ -1851,7 +1851,7 @@ s390_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) 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 @@ s390_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) 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); -- 2.30.2