From 6df01ab8ab8509b04f86d7da069ec2d25eb31bf9 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 1 May 2021 18:05:23 -0400 Subject: sim: switch config.h usage to defs.h The defs.h header will take care of including the various config.h headers. For now, it's just config.h, but we'll add more when we integrate gnulib in. This header should be used instead of config.h, and should be the first include in every .c file. We won't rely on the old behavior where we expected files to include the port's sim-main.h which then includes the common sim-basics.h which then includes config.h. We have a ton of code that includes things before sim-main.h, and it sometimes needs to be that way. Creating a dedicated header avoids the ordering mess and implicit inclusion that shows up otherwise. --- sim/pru/ChangeLog | 5 +++++ sim/pru/interp.c | 4 +++- sim/pru/pru.h | 1 - sim/pru/sim-main.h | 2 -- 4 files changed, 8 insertions(+), 4 deletions(-) (limited to 'sim/pru') diff --git a/sim/pru/ChangeLog b/sim/pru/ChangeLog index 7b6aac1..0fef8ff 100644 --- a/sim/pru/ChangeLog +++ b/sim/pru/ChangeLog @@ -1,5 +1,10 @@ 2021-05-16 Mike Frysinger + * interp.c: Replace config.h include with defs.h. + * pru.h, sim-main.h: Delete config.h include. + +2021-05-16 Mike Frysinger + * config.in, configure: Regenerate. 2021-05-14 Mike Frysinger diff --git a/sim/pru/interp.c b/sim/pru/interp.c index 6398c67..58ac333 100644 --- a/sim/pru/interp.c +++ b/sim/pru/interp.c @@ -18,7 +18,9 @@ You should have received a copy of the GNU General Public License along with this program; if not, see . */ -#include "config.h" +/* This must come before any other includes. */ +#include "defs.h" + #include #include #include diff --git a/sim/pru/pru.h b/sim/pru/pru.h index c2b631c..17febb2 100644 --- a/sim/pru/pru.h +++ b/sim/pru/pru.h @@ -19,7 +19,6 @@ #ifndef PRU_H #define PRU_H -#include "config.h" #include "opcode/pru.h" /* Needed for handling the dual PRU address space. */ diff --git a/sim/pru/sim-main.h b/sim/pru/sim-main.h index 966cacf..8233c20 100644 --- a/sim/pru/sim-main.h +++ b/sim/pru/sim-main.h @@ -19,8 +19,6 @@ #ifndef PRU_SIM_MAIN #define PRU_SIM_MAIN -#include "config.h" - #include #include #include "pru.h" -- cgit v1.1