[PATCH 2/7] gdb: move enum gdb_osabi to osabi.h

Simon Marchi
2020-03-16T17:08:50Z

From: Simon Marchi <simon.marchi@efficios.com>

I think it makes sense to have it there instead of in the catch-all
defs.h.

gdb/ChangeLog:

* defs.h (enum gdb_osabi): Move to...
* osabi.h (enum gdb_osabi): ... here.
* gdbarch.sh: Include osabi.h in gdbarch.h.
* gdbarch.h: Re-generate.
---
gdb/defs.h | 31 -------------------------------
gdb/gdbarch.h | 1 +
gdb/gdbarch.sh | 1 +
gdb/osabi.h | 31 +++++++++++++++++++++++++++++++
4 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/gdb/defs.h b/gdb/defs.h
index 1ad52feb1f80..a75511158a40 100644
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -478,37 +478,6 @@ enum val_prettyformat

extern int longest_to_int (LONGEST);

-/* * List of known OS ABIs. If you change this, make sure to update the
- table in osabi.c. */
-enum gdb_osabi
-{
- GDB_OSABI_UNKNOWN = 0, /* keep this zero */
- GDB_OSABI_NONE,
-
- GDB_OSABI_SVR4,
- GDB_OSABI_HURD,
- GDB_OSABI_SOLARIS,
- GDB_OSABI_LINUX,
- GDB_OSABI_FREEBSD,
- GDB_OSABI_NETBSD,
- GDB_OSABI_OPENBSD,
- GDB_OSABI_WINCE,
- GDB_OSABI_GO32,
- GDB_OSABI_QNXNTO,
- GDB_OSABI_CYGWIN,
- GDB_OSABI_AIX,
- GDB_OSABI_DICOS,
- GDB_OSABI_DARWIN,
- GDB_OSABI_SYMBIAN,
- GDB_OSABI_OPENVMS,
- GDB_OSABI_LYNXOS178,
- GDB_OSABI_NEWLIB,
- GDB_OSABI_SDE,
- GDB_OSABI_PIKEOS,
-
- GDB_OSABI_INVALID /* keep this last */
-};
-
/* Enumerate the requirements a symbol has in order to be evaluated.
These are listed in order of "strength" -- a later entry subsumes
earlier ones. This fine-grained distinction is important because
diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h
index 0259fcdbfd26..6dbb9d571ddb 100644
--- a/gdb/gdbarch.h
+++ b/gdb/gdbarch.h
@@ -40,6 +40,7 @@
#include "dis-asm.h"
#include "gdb_obstack.h"
#include "infrun.h"
+#include "osabi.h"

struct floatformat;
struct ui_file;
diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh
index 4a4b1bc66cfa..5a39dec83da2 100755
--- a/gdb/gdbarch.sh
+++ b/gdb/gdbarch.sh
@@ -1313,6 +1313,7 @@ cat <<EOF
#include "dis-asm.h"
#include "gdb_obstack.h"
#include "infrun.h"
+#include "osabi.h"

struct floatformat;
struct ui_file;
diff --git a/gdb/osabi.h b/gdb/osabi.h
index bb0812e567f4..ff63db49affe 100644
--- a/gdb/osabi.h
+++ b/gdb/osabi.h
@@ -19,6 +19,37 @@
#ifndef OSABI_H
#define OSABI_H

+/* * List of known OS ABIs. If you change this, make sure to update the
+ table in osabi.c. */
+enum gdb_osabi
+{
+ GDB_OSABI_UNKNOWN = 0, /* keep this zero */
+ GDB_OSABI_NONE,
+
+ GDB_OSABI_SVR4,
+ GDB_OSABI_HURD,
+ GDB_OSABI_SOLARIS,
+ GDB_OSABI_LINUX,
+ GDB_OSABI_FREEBSD,
+ GDB_OSABI_NETBSD,
+ GDB_OSABI_OPENBSD,
+ GDB_OSABI_WINCE,
+ GDB_OSABI_GO32,
+ GDB_OSABI_QNXNTO,
+ GDB_OSABI_CYGWIN,
+ GDB_OSABI_AIX,
+ GDB_OSABI_DICOS,
+ GDB_OSABI_DARWIN,
+ GDB_OSABI_SYMBIAN,
+ GDB_OSABI_OPENVMS,
+ GDB_OSABI_LYNXOS178,
+ GDB_OSABI_NEWLIB,
+ GDB_OSABI_SDE,
+ GDB_OSABI_PIKEOS,
+
+ GDB_OSABI_INVALID /* keep this last */
+};
+
/* 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
--
2.25.1