diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.def | 2 | ||||
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | gdbsupport/ChangeLog | 6 | ||||
| -rw-r--r-- | gdbsupport/common-defs.h | 16 | ||||
| -rw-r--r-- | gdbsupport/common-types.h | 32 |
6 files changed, 16 insertions, 47 deletions
@@ -1,6 +1,11 @@ 2020-03-12 Tom Tromey <tom@tromey.com> * Makefile.in: Rebuild. + * Makefile.def (gdbsupport): Don't depend on bfd. + +2020-03-12 Tom Tromey <tom@tromey.com> + + * Makefile.in: Rebuild. * Makefile.def (gdbsupport): Depend on intl. 2020-02-17 Tom Tromey <tom@tromey.com> diff --git a/Makefile.def b/Makefile.def index 7a27220..3162199 100644 --- a/Makefile.def +++ b/Makefile.def @@ -421,10 +421,8 @@ dependencies = { module=all-libgui; on=all-tcl; }; dependencies = { module=all-libgui; on=all-tk; }; dependencies = { module=all-libgui; on=all-itcl; }; -dependencies = { module=configure-gdbsupport; on=configure-bfd; }; dependencies = { module=configure-gdbsupport; on=configure-gnulib; }; dependencies = { module=configure-gdbsupport; on=configure-intl; }; -dependencies = { module=all-gdbsupport; on=all-bfd; }; dependencies = { module=all-gdbsupport; on=all-gnulib; }; dependencies = { module=all-gdbsupport; on=all-intl; }; diff --git a/Makefile.in b/Makefile.in index e09bb1d..d24dfdf 100644 --- a/Makefile.in +++ b/Makefile.in @@ -52454,9 +52454,7 @@ all-gdb: maybe-all-opcodes all-gdb: maybe-all-libdecnumber all-gdb: maybe-all-libctf all-gdbserver: maybe-all-libiberty -configure-gdbsupport: maybe-configure-bfd configure-gdbsupport: maybe-configure-intl -all-gdbsupport: maybe-all-bfd all-gdbsupport: maybe-all-intl configure-gprof: maybe-configure-intl all-gprof: maybe-all-libiberty diff --git a/gdbsupport/ChangeLog b/gdbsupport/ChangeLog index 4b678eb..c471726 100644 --- a/gdbsupport/ChangeLog +++ b/gdbsupport/ChangeLog @@ -1,3 +1,9 @@ +2020-03-12 Tom Tromey <tom@tromey.com> + + * common-types.h: Remove GDBSERVER code. + (gdb_byte, CORE_ADDR, LONGEST, ULONGEST): Redefine. + * common-defs.h: Remove GDBSERVER code. + 2020-03-12 Simon Marchi <simon.marchi@efficios.com> * selftest.m4: Moved from gdb/. diff --git a/gdbsupport/common-defs.h b/gdbsupport/common-defs.h index a5c57de..65500ce 100644 --- a/gdbsupport/common-defs.h +++ b/gdbsupport/common-defs.h @@ -20,20 +20,6 @@ #ifndef COMMON_COMMON_DEFS_H #define COMMON_COMMON_DEFS_H -#ifdef GDBSERVER - -#include <gnulib/config.h> - -#undef PACKAGE_NAME -#undef PACKAGE -#undef PACKAGE_VERSION -#undef PACKAGE_STRING -#undef PACKAGE_TARNAME - -#include <config.h> - -#else /* GDBSERVER */ - #include <gdbsupport/config.h> #undef PACKAGE_NAME @@ -44,8 +30,6 @@ #include "gnulib/config.h" -#endif /* GDBSERVER */ - /* From: https://www.gnu.org/software/gnulib/manual/html_node/stdint_002eh.html diff --git a/gdbsupport/common-types.h b/gdbsupport/common-types.h index 61099b4..f5b2f3d 100644 --- a/gdbsupport/common-types.h +++ b/gdbsupport/common-types.h @@ -20,40 +20,18 @@ #ifndef COMMON_COMMON_TYPES_H #define COMMON_COMMON_TYPES_H -#ifdef GDBSERVER +#include <inttypes.h> /* * A byte from the program being debugged. */ typedef unsigned char gdb_byte; -typedef unsigned long long CORE_ADDR; - -typedef long long LONGEST; -typedef unsigned long long ULONGEST; - -#else /* GDBSERVER */ - -#include "bfd.h" - -/* * A byte from the program being debugged. */ -typedef bfd_byte gdb_byte; - /* * An address in the program being debugged. Host byte order. */ -typedef bfd_vma CORE_ADDR; - -/* This is to make sure that LONGEST is at least as big as CORE_ADDR. */ - -#ifdef BFD64 - -typedef BFD_HOST_64_BIT LONGEST; -typedef BFD_HOST_U_64_BIT ULONGEST; - -#else /* No BFD64 */ +typedef uint64_t CORE_ADDR; -typedef long long LONGEST; -typedef unsigned long long ULONGEST; +/* LONGEST must be at least as big as CORE_ADDR. */ -#endif /* No BFD64 */ -#endif /* GDBSERVER */ +typedef int64_t LONGEST; +typedef uint64_t ULONGEST; /* * The largest CORE_ADDR value. */ #define CORE_ADDR_MAX (~(CORE_ADDR) 0) |