From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id 9799F3858D1E for ; Fri, 23 Dec 2022 05:51:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 9799F3858D1E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org Received: by smtp.gentoo.org (Postfix, from userid 559) id 3510834138A; Fri, 23 Dec 2022 05:51:51 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH] sim: cgen: move cgen-types.h include to cgen-defs.h Date: Fri, 23 Dec 2022 00:51:46 -0500 Message-Id: <20221223055146.29898-1-vapier@gentoo.org> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00,GIT_PATCH_0,JMQ_SPF_NEUTRAL,KAM_DMARC_STATUS,KAM_SHORT,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS,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 List-Id: The cgen-types.h header sets up types that are needed by cgen-defs.h, so move the include out of sim-main.h and to that header. It might be needed in other specific modules, but for now let's kick it out of sim-main.h to make some progress. Things still build with just this. --- sim/bpf/sim-main.h | 1 - sim/common/cgen-defs.h | 2 ++ sim/cris/sim-main.h | 1 - sim/frv/sim-main.h | 1 - sim/iq2000/sim-main.h | 1 - sim/lm32/sim-main.h | 1 - sim/m32r/sim-main.h | 1 - sim/or1k/sim-main.h | 1 - 8 files changed, 2 insertions(+), 7 deletions(-) diff --git a/sim/bpf/sim-main.h b/sim/bpf/sim-main.h index 0de4d4125ae4..6529b6eeda3b 100644 --- a/sim/bpf/sim-main.h +++ b/sim/bpf/sim-main.h @@ -20,7 +20,6 @@ #define SIM_MAIN_H #include "sim-basics.h" -#include "cgen-types.h" #include "bpf-desc.h" #include "bpf-opc.h" #include "arch.h" diff --git a/sim/common/cgen-defs.h b/sim/common/cgen-defs.h index b9e0c06f39d1..7bf1334296d2 100644 --- a/sim/common/cgen-defs.h +++ b/sim/common/cgen-defs.h @@ -20,6 +20,8 @@ along with this program. If not, see . */ #ifndef CGEN_DEFS_H #define CGEN_DEFS_H +#include "cgen-types.h" + /* Compute number of longs required to hold N bits. */ #define HOST_LONGS_FOR_BITS(n) \ (((n) + sizeof (long) * 8 - 1) / sizeof (long) * 8) diff --git a/sim/cris/sim-main.h b/sim/cris/sim-main.h index e946489cfc20..e680c37230d8 100644 --- a/sim/cris/sim-main.h +++ b/sim/cris/sim-main.h @@ -31,7 +31,6 @@ along with this program. If not, see . */ #include "symcat.h" #include "sim-basics.h" -#include "cgen-types.h" #include "cris-desc.h" #include "cris-opc.h" #include "arch.h" diff --git a/sim/frv/sim-main.h b/sim/frv/sim-main.h index 2ad757180021..44ef931270da 100644 --- a/sim/frv/sim-main.h +++ b/sim/frv/sim-main.h @@ -29,7 +29,6 @@ along with this program. If not, see . */ #include "symcat.h" #include "sim-basics.h" -#include "cgen-types.h" #include "frv-desc.h" #include #include "frv-opc.h" diff --git a/sim/iq2000/sim-main.h b/sim/iq2000/sim-main.h index ccc3fc877b9d..d920c34f98c7 100644 --- a/sim/iq2000/sim-main.h +++ b/sim/iq2000/sim-main.h @@ -11,7 +11,6 @@ #include "symcat.h" #include "sim-basics.h" -#include "cgen-types.h" #include "iq2000-desc.h" #include "iq2000-opc.h" #include "arch.h" diff --git a/sim/lm32/sim-main.h b/sim/lm32/sim-main.h index 6ae757f089b5..829b39dd36f3 100644 --- a/sim/lm32/sim-main.h +++ b/sim/lm32/sim-main.h @@ -27,7 +27,6 @@ #include "symcat.h" #include "sim-basics.h" -#include "cgen-types.h" #include "lm32-desc.h" #include "lm32-opc.h" #include "arch.h" diff --git a/sim/m32r/sim-main.h b/sim/m32r/sim-main.h index 6d69ecf52a00..81a6c68c01f7 100644 --- a/sim/m32r/sim-main.h +++ b/sim/m32r/sim-main.h @@ -10,7 +10,6 @@ #include "symcat.h" #include "sim-basics.h" -#include "cgen-types.h" #include "m32r-desc.h" #include "m32r-opc.h" #include "arch.h" diff --git a/sim/or1k/sim-main.h b/sim/or1k/sim-main.h index 1b6939dfbc98..24c8ddb0e31a 100644 --- a/sim/or1k/sim-main.h +++ b/sim/or1k/sim-main.h @@ -25,7 +25,6 @@ #include "or1k-desc.h" #include "or1k-opc.h" #include "sim-basics.h" -#include "cgen-types.h" #include "arch.h" #include "sim-base.h" #include "sim-fpu.h" -- 2.39.0