From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id e+blGDlgxGOVuBcAWB0awg (envelope-from ) for ; Sun, 15 Jan 2023 15:21:13 -0500 Received: by simark.ca (Postfix, from userid 112) id 5B86A1E128; Sun, 15 Jan 2023 15:21:13 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,RDNS_DYNAMIC autolearn=ham autolearn_force=no version=3.4.6 Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id A9AE81E112 for ; Sun, 15 Jan 2023 15:21:12 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id F1122385828D for ; Sun, 15 Jan 2023 20:21:08 +0000 (GMT) Received: from csb.redhat.com (gnu.wildebeest.org [45.83.234.184]) by sourceware.org (Postfix) with ESMTPS id 028963858D32 for ; Sun, 15 Jan 2023 20:20:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 028963858D32 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=klomp.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=klomp.org Received: by csb.redhat.com (Postfix, from userid 10916) id 13F06CB9DF; Sun, 15 Jan 2023 21:20:57 +0100 (CET) From: Mark Wielaard To: gdb-patches@sourceware.org Cc: Mike Frysinger , Sam James , Mark Wielaard Subject: [PATCH] sim: mn10300: minimize mn10300-sim.h include in sim-main.h Date: Sun, 15 Jan 2023 21:20:09 +0100 Message-Id: <20230115202009.149626-1-mark@klomp.org> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org Sender: "Gdb-patches" sim-main.h is special since it is one of the files automatically included in igen generated files. But this means anything including sim-main.h might get everything included just for the igen files. To prevent clashing symbols/defines only include mn10300-sim.h from sim-main.h if it is included from one of the generated igen C files. Add explicit includes of mn10300-sim.h to dv-mn103cpu.c, interp.c and op_utils.c. --- sim/mn10300/dv-mn103cpu.c | 2 ++ sim/mn10300/interp.c | 2 ++ sim/mn10300/op_utils.c | 1 + sim/mn10300/sim-main.h | 7 +++++++ 4 files changed, 12 insertions(+) diff --git a/sim/mn10300/dv-mn103cpu.c b/sim/mn10300/dv-mn103cpu.c index ad8669d3efa..b1ef68c80bb 100644 --- a/sim/mn10300/dv-mn103cpu.c +++ b/sim/mn10300/dv-mn103cpu.c @@ -24,6 +24,8 @@ #include "sim-main.h" #include "hw-main.h" +#include "mn10300-sim.h" + /* DEVICE diff --git a/sim/mn10300/interp.c b/sim/mn10300/interp.c index 07c3b8c900f..21e6d2e63a8 100644 --- a/sim/mn10300/interp.c +++ b/sim/mn10300/interp.c @@ -9,6 +9,8 @@ #include "sim-assert.h" #include "sim-signal.h" +#include "mn10300-sim.h" + #include #include diff --git a/sim/mn10300/op_utils.c b/sim/mn10300/op_utils.c index b29b803d8e7..0c0a5db7f39 100644 --- a/sim/mn10300/op_utils.c +++ b/sim/mn10300/op_utils.c @@ -16,6 +16,7 @@ #include "sim-signal.h" #include "sim-syscall.h" +#include "mn10300-sim.h" #define REG0(X) ((X) & 0x3) #define REG1(X) (((X) & 0xc) >> 2) diff --git a/sim/mn10300/sim-main.h b/sim/mn10300/sim-main.h index 2187e794adb..8f0fa9760df 100644 --- a/sim/mn10300/sim-main.h +++ b/sim/mn10300/sim-main.h @@ -38,7 +38,14 @@ mn10300_core_signal ((SD), (CPU), (CIA), (MAP), (NR_BYTES), (ADDR), (TRANSFER), #include "sim-fpu.h" #include "sim-signal.h" +/* These datastructures and defines are only used by the igen generated + support.c, semantics.c, idecode.c and engine.c files. */ +#if defined(SUPPORT_C) \ + || defined(SEMANTICS_C) \ + || defined(IDECODE_C) \ + || defined(ENGINE_C) #include "mn10300-sim.h" +#endif extern SIM_CORE_SIGNAL_FN mn10300_core_signal; -- 2.31.1