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/v850/ChangeLog | 5 +++++ sim/v850/interp.c | 3 +++ sim/v850/sim-main.h | 1 - sim/v850/simops.c | 3 +++ 4 files changed, 11 insertions(+), 1 deletion(-) (limited to 'sim/v850') diff --git a/sim/v850/ChangeLog b/sim/v850/ChangeLog index 2170657..81120ed 100644 --- a/sim/v850/ChangeLog +++ b/sim/v850/ChangeLog @@ -1,5 +1,10 @@ 2021-05-16 Mike Frysinger + * interp.c, simops.c: Include defs.h. + * sim-main.h: Delete config.h include. + +2021-05-16 Mike Frysinger + * config.in, configure: Regenerate. 2021-05-04 Mike Frysinger diff --git a/sim/v850/interp.c b/sim/v850/interp.c index ff2f6a2..79c6e0f 100644 --- a/sim/v850/interp.c +++ b/sim/v850/interp.c @@ -1,3 +1,6 @@ +/* This must come before any other includes. */ +#include "defs.h" + #include "sim-main.h" #include "sim-options.h" #include "v850_sim.h" diff --git a/sim/v850/sim-main.h b/sim/v850/sim-main.h index e7276a6..6556273 100644 --- a/sim/v850/sim-main.h +++ b/sim/v850/sim-main.h @@ -5,7 +5,6 @@ #define WITH_TARGET_WORD_MSB 31 -#include "config.h" #include "sim-basics.h" #include "sim-signal.h" #include "sim-fpu.h" diff --git a/sim/v850/simops.c b/sim/v850/simops.c index bd23f92..62a2bbc 100644 --- a/sim/v850/simops.c +++ b/sim/v850/simops.c @@ -1,3 +1,6 @@ +/* This must come before any other includes. */ +#include "defs.h" + #include "sim-main.h" #include "v850_sim.h" #include "simops.h" -- cgit v1.1