From patchwork Tue Feb 25 22:22:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 38315 Received: (qmail 60620 invoked by alias); 25 Feb 2020 22:22:50 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 60560 invoked by uid 89); 25 Feb 2020 22:22:50 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-20.1 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.1 spammy=notable X-HELO: gateway33.websitewelcome.com Received: from gateway33.websitewelcome.com (HELO gateway33.websitewelcome.com) (192.185.146.80) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 25 Feb 2020 22:22:48 +0000 Received: from cm14.websitewelcome.com (cm14.websitewelcome.com [100.42.49.7]) by gateway33.websitewelcome.com (Postfix) with ESMTP id 44C9F320F9 for ; Tue, 25 Feb 2020 16:22:47 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id 6ibHjoTl5XVkQ6ibHj9tYA; Tue, 25 Feb 2020 16:22:47 -0600 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=OmkeTW1SyzD+SX6tQ/aXRVNxBPsKb/9bITyltmb2TyM=; b=Cxou4ACc1b+p8+uNtKNIiQWiXb HpUitvzavViakxqsy7x08JX+GXSKVbxDTuvsggCGclWJAXyoFd/bJDyO+MEqOTgWxZnUbkPPVXl/N +zIUU3CVFlfuFH5vrzMk875P8; Received: from 75-166-123-50.hlrn.qwest.net ([75.166.123.50]:55644 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92) (envelope-from ) id 1j6ibG-000r0B-Vd; Tue, 25 Feb 2020 15:22:47 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH v2 5/6] Change gdbsupport not to rely on BFD Date: Tue, 25 Feb 2020 15:22:42 -0700 Message-Id: <20200225222243.8260-6-tom@tromey.com> In-Reply-To: <20200225222243.8260-1-tom@tromey.com> References: <20200225222243.8260-1-tom@tromey.com> 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-02-25 Tom Tromey * Makefile.in: Rebuild. * Makefile.def (gdbsupport): Don't depend on bfd. gdbsupport/ChangeLog 2020-02-25 Tom Tromey * common-types.h: Remove GDBSERVER code. (gdb_byte, CORE_ADDR, LONGEST, ULONGEST): Redefine. * common-defs.h: Remove GDBSERVER code. --- ChangeLog | 5 +++++ Makefile.def | 2 -- Makefile.in | 2 -- gdbsupport/ChangeLog | 6 ++++++ gdbsupport/common-defs.h | 16 ---------------- gdbsupport/common-types.h | 32 +++++--------------------------- 6 files changed, 16 insertions(+), 47 deletions(-) diff --git a/Makefile.def b/Makefile.def index 7a27220d77a..3162199ac7b 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 e09bb1d311f..d24dfdfb860 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/common-defs.h b/gdbsupport/common-defs.h index a5c57de2f27..65500ce7634 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 - -#undef PACKAGE_NAME -#undef PACKAGE -#undef PACKAGE_VERSION -#undef PACKAGE_STRING -#undef PACKAGE_TARNAME - -#include - -#else /* GDBSERVER */ - #include #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 61099b4e25d..f5b2f3d2491 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 /* * 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)