From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2205) id DC6EC385702E; Fri, 3 Jun 2022 13:34:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DC6EC385702E Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom de Vries To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Revert "[gdb] Fix warning in foreach_arch selftests" X-Act-Checkin: binutils-gdb X-Git-Author: Tom de Vries X-Git-Refname: refs/heads/master X-Git-Oldrev: a98600052eb680249abae0083a7c24d7e57f7379 X-Git-Newrev: 0e02119e65b566cad575cc57fe423dadab855a56 Message-Id: <20220603133455.DC6EC385702E@sourceware.org> Date: Fri, 3 Jun 2022 13:34:55 +0000 (GMT) X-BeenThere: gdb-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Jun 2022 13:34:56 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D0e02119e65b5= 66cad575cc57fe423dadab855a56 commit 0e02119e65b566cad575cc57fe423dadab855a56 Author: Tom de Vries Date: Fri Jun 3 15:34:50 2022 +0200 Revert "[gdb] Fix warning in foreach_arch selftests" =20 This reverts commit fc18b1c5afd ("[gdb] Fix warning in foreach_arch selftests"). =20 The commit introduced regressions for an --enable-targets=3Dall build: ... Running selftest print_one_insn::A6.^M Self test failed: Cannot access memory at address 0x0^M ... and while investigating those I realized that the commit fc18b1c5afd complicates things by trying to set the current osabi. =20 So, revert the patch in preparation for a simpler solution. =20 Tested on x86_64-linux. Diff: --- gdb/osabi.c | 50 ++++++++++++-------------------------------------- gdb/osabi.h | 13 ------------- gdb/selftest-arch.c | 18 +----------------- 3 files changed, 13 insertions(+), 68 deletions(-) diff --git a/gdb/osabi.c b/gdb/osabi.c index 776e62069e5..bbd7635532f 100644 --- a/gdb/osabi.c +++ b/gdb/osabi.c @@ -32,7 +32,7 @@ #endif =20 /* State for the "set osabi" command. */ -static enum gdb_osabi_mode user_osabi_state; +static enum { osabi_auto, osabi_default, osabi_user } user_osabi_state; static enum gdb_osabi user_selected_osabi; static const char *gdb_osabi_available_names[GDB_OSABI_INVALID + 3] =3D { "auto", @@ -595,48 +595,15 @@ generic_elf_osabi_sniffer (bfd *abfd) return osabi; } =0C -/* See osabi.h. */ - -void -set_osabi (enum gdb_osabi_mode mode, enum gdb_osabi osabi) -{ - if (mode =3D=3D osabi_auto) - user_osabi_state =3D osabi_auto; - else if (mode =3D=3D osabi_default) - { - user_selected_osabi =3D GDB_OSABI_DEFAULT; - user_osabi_state =3D osabi_user; - } - else - { - user_selected_osabi =3D osabi; - user_osabi_state =3D osabi_user; - } - - /* NOTE: At some point (true multiple architectures) we'll need to be mo= re - graceful here. */ - gdbarch_info info; - if (! gdbarch_update_p (info)) - internal_error (__FILE__, __LINE__, _("Updating OS ABI failed.")); -} - -/* See osabi.h. */ - -void -get_osabi (enum gdb_osabi_mode &mode, enum gdb_osabi &osabi) -{ - mode =3D user_osabi_state; - osabi =3D user_selected_osabi; -} - static void set_osabi (const char *args, int from_tty, struct cmd_list_element *c) { if (strcmp (set_osabi_string, "auto") =3D=3D 0) - set_osabi (osabi_auto, GDB_OSABI_INVALID); + user_osabi_state =3D osabi_auto; else if (strcmp (set_osabi_string, "default") =3D=3D 0) { - set_osabi (osabi_default, GDB_OSABI_INVALID); + user_selected_osabi =3D GDB_OSABI_DEFAULT; + user_osabi_state =3D osabi_user; } else { @@ -648,7 +615,8 @@ set_osabi (const char *args, int from_tty, struct cmd_l= ist_element *c) =20 if (strcmp (set_osabi_string, gdbarch_osabi_name (osabi)) =3D=3D 0) { - set_osabi (osabi_user, osabi); + user_selected_osabi =3D osabi; + user_osabi_state =3D osabi_user; break; } } @@ -657,6 +625,12 @@ set_osabi (const char *args, int from_tty, struct cmd_= list_element *c) _("Invalid OS ABI \"%s\" passed to command handler."), set_osabi_string); } + + /* NOTE: At some point (true multiple architectures) we'll need to be mo= re + graceful here. */ + gdbarch_info info; + if (! gdbarch_update_p (info)) + internal_error (__FILE__, __LINE__, _("Updating OS ABI failed.")); } =20 static void diff --git a/gdb/osabi.h b/gdb/osabi.h index 3737a77d50e..be016732cbc 100644 --- a/gdb/osabi.h +++ b/gdb/osabi.h @@ -50,13 +50,6 @@ enum gdb_osabi GDB_OSABI_INVALID /* keep this last */ }; =20 -enum gdb_osabi_mode -{ - osabi_auto, - osabi_default, - osabi_user -}; - /* Register an OS ABI sniffer. Each arch/flavour may have more than one sniffer. This is used to e.g. differentiate one OS's a.out from another. The first sniffer to return something other than @@ -96,10 +89,4 @@ const char *osabi_triplet_regexp (enum gdb_osabi osabi); void generic_elf_osabi_sniff_abi_tag_sections (bfd *, asection *, enum gdb_osabi *); =20 -/* Set osabi to MODE/OSABI. */ -extern void set_osabi (enum gdb_osabi_mode mode, enum gdb_osabi osabi); - -/* Return current osabi setting in MODE/OSABI. */ -extern void get_osabi (enum gdb_osabi_mode &mode, enum gdb_osabi &osabi); - #endif /* OSABI_H */ diff --git a/gdb/selftest-arch.c b/gdb/selftest-arch.c index a4d9de5a74d..f434da718d5 100644 --- a/gdb/selftest-arch.c +++ b/gdb/selftest-arch.c @@ -66,28 +66,12 @@ foreach_arch_test_generator (const std::string &name, auto test_fn =3D ([=3D] () { - /* Prevent warnings when setting architecture with current osabi - settings, like: - A handler for the OS ABI "GNU/Linux" is not built into this - configuration of GDB. Attempting to continue with the - default aarch64:ilp32 settings. */ - enum gdb_osabi_mode mode; - enum gdb_osabi osabi; - get_osabi (mode, osabi); - - set_osabi (osabi_user, GDB_OSABI_NONE); - SCOPE_EXIT - { - reset (); - set_osabi (mode, osabi); - }; - struct gdbarch_info info; info.bfd_arch_info =3D bfd_scan_arch (arch); struct gdbarch *gdbarch =3D gdbarch_find_by_info (info); SELF_CHECK (gdbarch !=3D NULL); - function (gdbarch); + reset (); }); =20 tests.emplace_back (string_printf ("%s::%s", name.c_str (), arch),