From patchwork Mon Apr 22 20:10:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 88881 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6AD68384AB5F for ; Mon, 22 Apr 2024 20:14:45 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from simark.ca (simark.ca [158.69.221.121]) by sourceware.org (Postfix) with ESMTPS id D3F2F3849AC6 for ; Mon, 22 Apr 2024 20:12:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D3F2F3849AC6 Authentication-Results: sourceware.org; dmarc=fail (p=none dis=none) header.from=efficios.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=efficios.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org D3F2F3849AC6 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=158.69.221.121 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713816727; cv=none; b=e8pxoClkos0mI63taEFAuBCCZrXzUswqVhj+PhsrathcgJWyf1Rptb0flmvSa5vWIRVrfmfZKtbfY1ViuCFOQ3ZYQE9GHGuUor9nKsCA0kPR6awGqKct6DPkLe/rpnmp18KijkSWQkHLdjZ5FlMDLEE+ZRJZJOTeCKMGEc5j8DE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713816727; c=relaxed/simple; bh=TNduxbA2lrFAXC5/Nf7DTqPrAjeK6gIBngbF0DZWa0U=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=FGnqoShZWjhHzrP7heOWqjnJfCuD1W6i4kZC9W1PfPTgB/XX2rvsZWihOeygD+0oqdy2D8MGMZWvjmmaHpL8JMz0WneFPknO7KclTBkjVxyg53TfY9tyh7+44JM4uZFuPuvSo05iGlGC2DwggIEJvKEZ+vIbQJDE4TG6kOhV5J8= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from smarchi-efficios.internal.efficios.com (192-222-143-198.qc.cable.ebox.net [192.222.143.198]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id 01E7C1E0F8; Mon, 22 Apr 2024 16:11:59 -0400 (EDT) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 6/7] gdb: don't include hashtab.h in defs.h Date: Mon, 22 Apr 2024 16:10:16 -0400 Message-ID: <20240422201157.46375-7-simon.marchi@efficios.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240422201157.46375-1-simon.marchi@efficios.com> References: <20240422201157.46375-1-simon.marchi@efficios.com> MIME-Version: 1.0 X-Spam-Status: No, score=-3496.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_NONE, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_SOFTFAIL, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Nothing in defs.h actually uses this. Add some includes for some spots using things from hashtab.h. Note that if the GDB build doesn't use libxxhash, hashtab.h is included by gdbsupport/common-utils.h, so all files still see hashtab.h. It puzzled me for some time why I didn't see build failures in my build (which didn't use libxxhash) but the buildbot gave build failures (it uses libxxhash). Change-Id: I8efd68decdaf579f048941c7537cd689885caa2a --- gdb/defs.h | 2 -- gdb/dwarf2/die.h | 1 + gdb/dwarf2/index-common.h | 1 + gdb/extension.h | 1 + 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gdb/defs.h b/gdb/defs.h index 535ca6716732..8ef36c16df97 100644 --- a/gdb/defs.h +++ b/gdb/defs.h @@ -82,8 +82,6 @@ #define O_BINARY 0 #endif -#include "hashtab.h" - /* * System root path, used to find libraries etc. */ extern std::string gdb_sysroot; diff --git a/gdb/dwarf2/die.h b/gdb/dwarf2/die.h index a749b95ee28d..d4eab0838bfe 100644 --- a/gdb/dwarf2/die.h +++ b/gdb/dwarf2/die.h @@ -22,6 +22,7 @@ #include "complaints.h" #include "dwarf2/attribute.h" +#include "hashtab.h" /* This data structure holds a complete die structure. */ struct die_info diff --git a/gdb/dwarf2/index-common.h b/gdb/dwarf2/index-common.h index 0a871a7e364a..339012949cd7 100644 --- a/gdb/dwarf2/index-common.h +++ b/gdb/dwarf2/index-common.h @@ -21,6 +21,7 @@ #define DWARF_INDEX_COMMON_H #include "extract-store-integer.h" +#include "hashtab.h" /* The suffix for an index file. */ #define INDEX4_SUFFIX ".gdb-index" diff --git a/gdb/extension.h b/gdb/extension.h index 5260bcbde003..9ba1299f95e1 100644 --- a/gdb/extension.h +++ b/gdb/extension.h @@ -22,6 +22,7 @@ #include "mi/mi-cmds.h" #include "gdbsupport/array-view.h" +#include "hashtab.h" #include struct breakpoint;