aboutsummaryrefslogtreecommitdiff
path: root/gdbsupport
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2020-03-12 13:32:15 -0600
committerTom Tromey <tromey@adacore.com>2020-03-12 13:32:16 -0600
commit213291361b4ddb2d05b8c89bf47d23ca4306912e (patch)
treefcaa9249f7fcbd146c5919dab00ec1677d9ed273 /gdbsupport
parent9a665d62266e75f0519f3a663784c458885b5c63 (diff)
downloadbinutils-213291361b4ddb2d05b8c89bf47d23ca4306912e.zip
binutils-213291361b4ddb2d05b8c89bf47d23ca4306912e.tar.gz
binutils-213291361b4ddb2d05b8c89bf47d23ca4306912e.tar.bz2
Change gdbsupport not to rely on BFD
This changes gdbsupport so that it no longer relies on BFD. This is a precursor to making gdbserver use the already-built gdbsupport, because building gdbserver should not require BFD to be built. The most notable change here is that CORE_ADDR is always a 64-bit type. This makes it so that gdb acts as if it were always built in 64-bit mode. ChangeLog 2020-03-12 Tom Tromey <tom@tromey.com> * Makefile.in: Rebuild. * Makefile.def (gdbsupport): Don't depend on bfd. gdbsupport/ChangeLog 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.
Diffstat (limited to 'gdbsupport')
-rw-r--r--gdbsupport/ChangeLog6
-rw-r--r--gdbsupport/common-defs.h16
-rw-r--r--gdbsupport/common-types.h32
3 files changed, 11 insertions, 43 deletions
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)