diff options
author | Simon Marchi <simon.marchi@ericsson.com> | 2018-04-07 13:23:28 -0400 |
---|---|---|
committer | Simon Marchi <simon.marchi@polymtl.ca> | 2018-04-07 13:23:28 -0400 |
commit | 26540402495f35d5f19762ceba66605bca8fa63b (patch) | |
tree | bfe4bbb93b8541a490cfe9545e2d3830c3cd5631 /gdb/osabi.c | |
parent | 9018be22e022e6db2ba07c4e407c7244022bc69a (diff) | |
download | gdb-26540402495f35d5f19762ceba66605bca8fa63b.zip gdb-26540402495f35d5f19762ceba66605bca8fa63b.tar.gz gdb-26540402495f35d5f19762ceba66605bca8fa63b.tar.bz2 |
Make "set osabi none" really work (PR 22980)
I was looking for a way to reproduce easily PR 22979 by doing this:
(gdb) set architecture i386:x86-64
(gdb) set osabi none
However, I noticed that even though I did "set osabi none", the gdbarch
gdb created was for Linux:
(gdb) set debug arch 1
(gdb) set architecture i386:x86-64
...
(gdb) set osabi none
gdbarch_find_by_info: info.bfd_arch_info i386:x86-64
gdbarch_find_by_info: info.byte_order 1 (little)
gdbarch_find_by_info: info.osabi 4 (GNU/Linux) <--- Wrong?
gdbarch_find_by_info: info.abfd 0x0
gdbarch_find_by_info: info.tdep_info 0x0
gdbarch_find_by_info: Previous architecture 0x1e6fd30 (i386:x86-64)
selected
gdbarch_update_p: Architecture 0x1e6fd30 (i386:x86-64) unchanged
This is because the value GDB_OSABI_UNKNOWN has an unclear role,
sometimes meaning "no osabi" and sometimes "please selected
automatically". Doing "set osabi none" sets the requested osabi to
GDB_OSABI_UNKNOWN, in which case gdbarch_info_fill overrides it with a
value from the target description, or the built-in default osabi. This
means that it's impossible to force GDB not to use an osabi with "set
osabi". Since my GDB's built-in default osabi is Linux, it always falls
back to GDB_OSABI_LINUX.
To fix it, I introduced GDB_OSABI_NONE, which really means "I don't want
any osabi". GDB_OSABI_UNKNOWN can then be used only for "not set yet,
please auto-detect". GDB_OSABI_UNINITIALIZED now seems unnecessary
since it overlaps with GDB_OSABI_UNKNOWN, so I think it can be removed
and gdbarch_info::osabi can be initialized to GDB_OSABI_UNKNOWN.
gdb/ChangeLog:
PR gdb/22980
* defs.h (enum gdb_osabi): Remove GDB_OSABI_UNINITIALIZED, add
GDB_OSABI_NONE.
* arch-utils.c (gdbarch_info_init): Don't set info->osabi.
* osabi.c (gdb_osabi_names): Add "unknown" entry.
gdb/testsuite/ChangeLog:
PR gdb/22980
* gdb.base/osabi.exp: New file.
Diffstat (limited to 'gdb/osabi.c')
-rw-r--r-- | gdb/osabi.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/gdb/osabi.c b/gdb/osabi.c index fd44deb..ef1d993 100644 --- a/gdb/osabi.c +++ b/gdb/osabi.c @@ -58,6 +58,7 @@ struct osabi_names them in sync. */ static const struct osabi_names gdb_osabi_names[] = { + { "unknown", NULL }, { "none", NULL }, { "SVR4", NULL }, @@ -335,9 +336,11 @@ gdbarch_init_osabi (struct gdbarch_info info, struct gdbarch *gdbarch) { struct gdb_osabi_handler *handler; - if (info.osabi == GDB_OSABI_UNKNOWN) + gdb_assert (info.osabi != GDB_OSABI_UNKNOWN); + + if (info.osabi == GDB_OSABI_NONE) { - /* Don't complain about an unknown OSABI. Assume the user knows + /* Don't complain about no OSABI. Assume the user knows what they are doing. */ return; } @@ -603,11 +606,6 @@ set_osabi (const char *args, int from_tty, struct cmd_list_element *c) user_selected_osabi = GDB_OSABI_DEFAULT; user_osabi_state = osabi_user; } - else if (strcmp (set_osabi_string, "none") == 0) - { - user_selected_osabi = GDB_OSABI_UNKNOWN; - user_osabi_state = osabi_user; - } else { int i; |