From d581dda88162831ebbd0757312fa93681d945327 Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Tue, 25 Apr 2017 15:15:54 +0100 Subject: [PATCH] Change gdbarch_wchar_bit for AArch64 and ARM The size of wchar_t on AArch64 and ARM is 4-byte, so we can use the default value (4*TARGET_CHAR_BIT). This patch fixes some fails in gdb.cp/wide_char_types.exp on aarch64-linux. gdb: 2017-04-25 Yao Qi * aarch64-tdep.c (aarch64_gdbarch_init): Don't call set_gdbarch_wchar_bit. * arm-tdep.c (arm_gdbarch_init): Likewise. --- gdb/ChangeLog | 6 ++++++ gdb/aarch64-tdep.c | 1 - gdb/arm-tdep.c | 1 - 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d1c1942adbb..90ce6aef75c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2017-04-25 Yao Qi + + * aarch64-tdep.c (aarch64_gdbarch_init): Don't call + set_gdbarch_wchar_bit. + * arm-tdep.c (arm_gdbarch_init): Likewise. + 2017-04-25 Pedro Alves * common/poison.h [!HAVE_IS_TRIVIALLY_COPYABLE] (IsRelocatable) diff --git a/gdb/aarch64-tdep.c b/gdb/aarch64-tdep.c index 6113621e8dc..d203ebec773 100644 --- a/gdb/aarch64-tdep.c +++ b/gdb/aarch64-tdep.c @@ -2977,7 +2977,6 @@ aarch64_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_long_long_bit (gdbarch, 64); set_gdbarch_ptr_bit (gdbarch, 64); set_gdbarch_char_signed (gdbarch, 0); - set_gdbarch_wchar_bit (gdbarch, 64); set_gdbarch_wchar_signed (gdbarch, 0); set_gdbarch_float_format (gdbarch, floatformats_ieee_single); set_gdbarch_double_format (gdbarch, floatformats_ieee_double); diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c index 9ac667f990b..970d19fcc4c 100644 --- a/gdb/arm-tdep.c +++ b/gdb/arm-tdep.c @@ -9409,7 +9409,6 @@ arm_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_wchar_signed (gdbarch, 0); else set_gdbarch_wchar_signed (gdbarch, 1); - set_gdbarch_wchar_bit (gdbarch, 32); /* Note: for displaced stepping, this includes the breakpoint, and one word of additional scratch space. This setting isn't used for anything beside -- 2.30.2