Re: should deprecated_target_gdbarch_select_hack be un-deprecated?

Tom Tromey
2012-11-14T15:34:46Z

>>>>> "Pedro" == Pedro Alves <palves@redhat.com> writes:

Pedro> This is fine with me. My alternative suggestion would be
Pedro> "set_target_gdbarch", as "set" is more traditional for a setter,
Pedro> which is what this function ended up being.

Sounds good. Here is what I am checking in.

Tom

2012-11-13 Tom Tromey <tromey@redhat.com>

* gdbarch.h, gdbarch.c: Rebuild.
* gdbarch.sh (set_target_gdbarch): Rename from
deprecated_target_gdbarch_select_hack.
* arch-utils.c (gdbarch_update_p): Update.
(set_gdbarch_from_file): Update.

diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c
index 71d17cf..5a47e37 100644
--- a/gdb/arch-utils.c
+++ b/gdb/arch-utils.c
@@ -522,7 +522,7 @@ gdbarch_update_p (struct gdbarch_info info)
"New architecture %s (%s) selected\n",
host_address_to_string (new_gdbarch),
gdbarch_bfd_arch_info (new_gdbarch)->printable_name);
- deprecated_target_gdbarch_select_hack (new_gdbarch);
+ set_target_gdbarch (new_gdbarch);

return 1;
}
@@ -556,7 +556,7 @@ set_gdbarch_from_file (bfd *abfd)

if (gdbarch == NULL)
error (_("Architecture of file not recognized."));
- deprecated_target_gdbarch_select_hack (gdbarch);
+ set_target_gdbarch (gdbarch);
}

/* Initialize the current architecture. Update the ``set
diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c
index 26dd404..09576b1 100644
--- a/gdb/gdbarch.c
+++ b/gdb/gdbarch.c
@@ -4666,7 +4666,7 @@ gdbarch_find_by_info (struct gdbarch_info info)
/* Make the specified architecture current. */

void
-deprecated_target_gdbarch_select_hack (struct gdbarch *new_gdbarch)
+set_target_gdbarch (struct gdbarch *new_gdbarch)
{
gdb_assert (new_gdbarch != NULL);
gdb_assert (new_gdbarch->initialized_p);
diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h
index 9d2bac3..df09553 100644
--- a/gdb/gdbarch.h
+++ b/gdb/gdbarch.h
@@ -1382,15 +1382,9 @@ extern int gdbarch_update_p (struct gdbarch_info info);
extern struct gdbarch *gdbarch_find_by_info (struct gdbarch_info info);

-/* Helper function. Set the global "target_gdbarch" to "gdbarch".
+/* Helper function. Set the target gdbarch to "gdbarch". */

- FIXME: kettenis/20031124: Of the functions that follow, only
- gdbarch_from_bfd is supposed to survive. The others will
- dissappear since in the future GDB will (hopefully) be truly
- multi-arch. However, for now we're still stuck with the concept of
- a single active architecture. */
-
-extern void deprecated_target_gdbarch_select_hack (struct gdbarch *gdbarch);
+extern void set_target_gdbarch (struct gdbarch *gdbarch);

/* Register per-architecture data-pointer.
diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh
index 53a52b1..4b11f92 100755
--- a/gdb/gdbarch.sh
+++ b/gdb/gdbarch.sh
@@ -1331,15 +1331,9 @@ extern int gdbarch_update_p (struct gdbarch_info info);
extern struct gdbarch *gdbarch_find_by_info (struct gdbarch_info info);

-/* Helper function. Set the global "target_gdbarch" to "gdbarch".
+/* Helper function. Set the target gdbarch to "gdbarch". */

- FIXME: kettenis/20031124: Of the functions that follow, only
- gdbarch_from_bfd is supposed to survive. The others will
- dissappear since in the future GDB will (hopefully) be truly
- multi-arch. However, for now we're still stuck with the concept of
- a single active architecture. */
-
-extern void deprecated_target_gdbarch_select_hack (struct gdbarch *gdbarch);
+extern void set_target_gdbarch (struct gdbarch *gdbarch);

/* Register per-architecture data-pointer.
@@ -2281,7 +2275,7 @@ gdbarch_find_by_info (struct gdbarch_info info)
/* Make the specified architecture current. */

void
-deprecated_target_gdbarch_select_hack (struct gdbarch *new_gdbarch)
+set_target_gdbarch (struct gdbarch *new_gdbarch)
{
gdb_assert (new_gdbarch != NULL);
gdb_assert (new_gdbarch->initialized_p);