From aff68abbd7cfed062055bd2d97f464b304b920bc Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 14 Nov 2012 15:40:35 +0000 Subject: [PATCH] * 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. --- gdb/ChangeLog | 8 ++++++++ gdb/arch-utils.c | 4 ++-- gdb/gdbarch.c | 2 +- gdb/gdbarch.h | 10 ++-------- gdb/gdbarch.sh | 12 +++--------- 5 files changed, 16 insertions(+), 20 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index bf00312516..d330578f12 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2012-11-13 Tom Tromey + + * 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. + 2012-11-05 Pierre Muller * MAINTAINERS (Responsible Maintainers/misc): Add myself diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c index 71d17cf591..5a47e37049 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 26dd4043a6..09576b138d 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 9d2bac3981..df095532bc 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 53a52b1fce..4b11f92d9a 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); -- 2.34.1