Remove the auto_charset gdbarch hook

The auto_charset gdbarch hook has never been set by any architecture.
I probably added it (don't remember) to be parallel to
auto_wide_charset -- but considering that it hasn't ever been needed,
it seems fine to remove it.

diff --git a/gdb/arch-utils.h b/gdb/arch-utils.h
index 8930183e136d35e2b859e2e368d896ea124c5a1e..670136c9cac56db9be5b7b33d89ffe988f282931 100644 (file)
--- a/gdb/arch-utils.h
+++ b/gdb/arch-utils.h
@@ -317,7 +317,6 @@ extern void default_gen_return_address (struct gdbarch *gdbarch,
                                        struct axs_value *value,
                                        CORE_ADDR scope);
 
-extern const char *default_auto_charset (void);
 extern const char *default_auto_wide_charset (void);
 
 extern int default_return_in_first_hidden_param_p (struct gdbarch *,

diff --git a/gdb/charset.c b/gdb/charset.c
index eaddfb57098598fcbb9d68a5ed34346abc72b2a8..2f0ceafd57d0124a6dd56f4c3b74021c4db730d0 100644 (file)
--- a/gdb/charset.c
+++ b/gdb/charset.c
@@ -215,6 +215,7 @@ gdb_iconv (iconv_t utf_flag, ICONV_CONST char **inbuf, size_t *inbytesleft,
 \f
 /* The global lists of character sets and translations.  */
 
+static const char *default_auto_charset ();
 
 #ifndef GDB_DEFAULT_TARGET_CHARSET
 #define GDB_DEFAULT_TARGET_CHARSET "ISO-8859-1"
@@ -248,7 +249,7 @@ show_target_charset_name (struct ui_file *file, int from_tty,
     gdb_printf (file,
                _("The target character set is \"auto; "
                  "currently %s\".\n"),
-               gdbarch_auto_charset (get_current_arch ()));
+               default_auto_charset ());
   else
     gdb_printf (file, _("The target character set is \"%s\".\n"),
                value);
@@ -424,7 +425,7 @@ const char *
 target_charset (struct gdbarch *gdbarch)
 {
   if (!strcmp (target_charset_name, "auto"))
-    return gdbarch_auto_charset (gdbarch);
+    return default_auto_charset ();
   return target_charset_name;
 }
 
@@ -916,8 +917,8 @@ find_charset_names (void)
 /* The "auto" target charset used by default_auto_charset.  */
 static const char *auto_target_charset_name = GDB_DEFAULT_TARGET_CHARSET;
 
-const char *
-default_auto_charset (void)
+static const char *
+default_auto_charset ()
 {
   return auto_target_charset_name;
 }

diff --git a/gdb/gdbarch-gen.c b/gdb/gdbarch-gen.c
index 15311ec1894a323d25df4d5bc62c1b605cde2837..6560ef8dfc39591158018bcb8228a4207ecd0720 100644 (file)
--- a/gdb/gdbarch-gen.c
+++ b/gdb/gdbarch-gen.c
@@ -227,7 +227,6 @@ struct gdbarch
   gdbarch_has_shared_address_space_ftype *has_shared_address_space = default_has_shared_address_space;
   gdbarch_fast_tracepoint_valid_at_ftype *fast_tracepoint_valid_at = default_fast_tracepoint_valid_at;
   gdbarch_guess_tracepoint_registers_ftype *guess_tracepoint_registers = default_guess_tracepoint_registers;
-  gdbarch_auto_charset_ftype *auto_charset = default_auto_charset;
   gdbarch_auto_wide_charset_ftype *auto_wide_charset = default_auto_wide_charset;
   int has_dos_based_file_system = 0;
   gdbarch_gen_return_address_ftype *gen_return_address = default_gen_return_address;
@@ -494,7 +493,6 @@ verify_gdbarch (struct gdbarch *gdbarch)
   /* Skip verify of has_shared_address_space, invalid_p == 0.  */
   /* Skip verify of fast_tracepoint_valid_at, invalid_p == 0.  */
   /* Skip verify of guess_tracepoint_registers, invalid_p == 0.  */
-  /* Skip verify of auto_charset, invalid_p == 0.  */
   /* Skip verify of auto_wide_charset, invalid_p == 0.  */
   /* Skip verify of has_dos_based_file_system, invalid_p == 0.  */
   /* Skip verify of gen_return_address, invalid_p == 0.  */
@@ -1259,9 +1257,6 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file)
   gdb_printf (file,
              "gdbarch_dump: guess_tracepoint_registers = <%s>\n",
              host_address_to_string (gdbarch->guess_tracepoint_registers));
-  gdb_printf (file,
-             "gdbarch_dump: auto_charset = <%s>\n",
-             host_address_to_string (gdbarch->auto_charset));
   gdb_printf (file,
              "gdbarch_dump: auto_wide_charset = <%s>\n",
              host_address_to_string (gdbarch->auto_wide_charset));
@@ -4838,23 +4833,6 @@ set_gdbarch_guess_tracepoint_registers (struct gdbarch *gdbarch,
   gdbarch->guess_tracepoint_registers = guess_tracepoint_registers;
 }
 
-const char *
-gdbarch_auto_charset (struct gdbarch *gdbarch)
-{
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->auto_charset != NULL);
-  if (gdbarch_debug >= 2)
-    gdb_printf (gdb_stdlog, "gdbarch_auto_charset called\n");
-  return gdbarch->auto_charset ();
-}
-
-void
-set_gdbarch_auto_charset (struct gdbarch *gdbarch,
-                         gdbarch_auto_charset_ftype auto_charset)
-{
-  gdbarch->auto_charset = auto_charset;
-}
-
 const char *
 gdbarch_auto_wide_charset (struct gdbarch *gdbarch)
 {

diff --git a/gdb/gdbarch-gen.h b/gdb/gdbarch-gen.h
index d17f43ce59acd532fe996792f85b05b6a374fefd..67f17ea85195164c4c4b01e23c48a4887227657e 100644 (file)
--- a/gdb/gdbarch-gen.h
+++ b/gdb/gdbarch-gen.h
@@ -1531,12 +1531,6 @@ typedef void (gdbarch_guess_tracepoint_registers_ftype) (struct gdbarch *gdbarch
 extern void gdbarch_guess_tracepoint_registers (struct gdbarch *gdbarch, struct regcache *regcache, CORE_ADDR addr);
 extern void set_gdbarch_guess_tracepoint_registers (struct gdbarch *gdbarch, gdbarch_guess_tracepoint_registers_ftype *guess_tracepoint_registers);
 
-/* Return the "auto" target charset. */
-
-typedef const char * (gdbarch_auto_charset_ftype) ();
-extern const char * gdbarch_auto_charset (struct gdbarch *gdbarch);
-extern void set_gdbarch_auto_charset (struct gdbarch *gdbarch, gdbarch_auto_charset_ftype *auto_charset);
-
 /* Return the "auto" target wide charset. */
 
 typedef const char * (gdbarch_auto_wide_charset_ftype) ();

diff --git a/gdb/gdbarch_components.py b/gdb/gdbarch_components.py
index 64dd7c11c1200fe79f5d1b329738fb1b298a1b5f..a63b9d960316deacc364b81619d1c647872a1ae3 100644 (file)
--- a/gdb/gdbarch_components.py
+++ b/gdb/gdbarch_components.py
@@ -2423,17 +2423,6 @@ On entry, regcache has all registers marked as unavailable.
     invalid=False,
 )
 
-Function(
-    comment="""
-Return the "auto" target charset.
-""",
-    type="const char *",
-    name="auto_charset",
-    params=[],
-    predefault="default_auto_charset",
-    invalid=False,
-)
-
 Function(
     comment="""
 Return the "auto" target wide charset.