[PATCH v2 09/11] Move auto_wide_charset gdbarch method to windows-tdep

[Hannes Domani <ssbssa@yahoo.de>]

It's the same for all Windows ABIs.
---
 gdb/amd64-windows-tdep.c | 10 ----------
 gdb/i386-windows-tdep.c  |  8 --------
 gdb/windows-tdep.c       |  9 +++++++++
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/gdb/amd64-windows-tdep.c b/gdb/amd64-windows-tdep.c
index b46f74c6461..aeed266e713 100644
--- a/gdb/amd64-windows-tdep.c
+++ b/gdb/amd64-windows-tdep.c
@@ -1271,14 +1271,6 @@ amd64_windows_skip_trampoline_code (const frame_info_ptr &frame, CORE_ADDR pc)
   return destination;
 }
 
-/* Implement the "auto_wide_charset" gdbarch method.  */
-
-static const char *
-amd64_windows_auto_wide_charset (void)
-{
-  return "UTF-16";
-}
-
 /* Common parts for gdbarch initialization for Windows and Cygwin on AMD64.  */
 
 static void
@@ -1320,8 +1312,6 @@ amd64_windows_init_abi_common (gdbarch_info info, struct gdbarch *gdbarch)
   set_gdbarch_core_xfer_shared_libraries
     (gdbarch, windows_core_xfer_shared_libraries);
   set_gdbarch_core_pid_to_str (gdbarch, windows_core_pid_to_str);
-
-  set_gdbarch_auto_wide_charset (gdbarch, amd64_windows_auto_wide_charset);
 }
 
 /* gdbarch initialization for Windows on AMD64.  */
diff --git a/gdb/i386-windows-tdep.c b/gdb/i386-windows-tdep.c
index 2861d60fef2..daaa556d171 100644
--- a/gdb/i386-windows-tdep.c
+++ b/gdb/i386-windows-tdep.c
@@ -95,12 +95,6 @@ i386_windows_skip_trampoline_code (const frame_info_ptr &frame, CORE_ADDR pc)
   return i386_pe_skip_trampoline_code (frame, pc, NULL);
 }
 
-static const char *
-i386_windows_auto_wide_charset (void)
-{
-  return "UTF-16";
-}
-
 /* Implement the "push_dummy_call" gdbarch method.  */
 
 static CORE_ADDR
@@ -154,8 +148,6 @@ i386_windows_init_abi_common (struct gdbarch_info info, struct gdbarch *gdbarch)
   set_gdbarch_core_xfer_shared_libraries
     (gdbarch, windows_core_xfer_shared_libraries);
   set_gdbarch_core_pid_to_str (gdbarch, windows_core_pid_to_str);
-
-  set_gdbarch_auto_wide_charset (gdbarch, i386_windows_auto_wide_charset);
 }
 
 /* gdbarch initialization for Windows on i386.  */
diff --git a/gdb/windows-tdep.c b/gdb/windows-tdep.c
index 6164bc34312..e69db28c2dc 100644
--- a/gdb/windows-tdep.c
+++ b/gdb/windows-tdep.c
@@ -930,6 +930,14 @@ windows_solib_ops::iterate_over_objfiles_in_search_order
       }
 }
 
+/* Implement the "auto_wide_charset" gdbarch method.  */
+
+static const char *
+windows_auto_wide_charset (void)
+{
+  return "UTF-16";
+}
+
 /* Common parts for gdbarch initialization for the Windows and Cygwin OS
    ABIs.  */
 
@@ -938,6 +946,7 @@ windows_init_abi_common (struct gdbarch_info info, struct gdbarch *gdbarch)
 {
   set_gdbarch_wchar_bit (gdbarch, 16);
   set_gdbarch_wchar_signed (gdbarch, 0);
+  set_gdbarch_auto_wide_charset (gdbarch, windows_auto_wide_charset);
 
   /* Canonical paths on this target look like
      `c:\Program Files\Foo App\mydll.dll', for example.  */
-- 
2.52.0