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/rl78/ChangeLog | 5 +++++ sim/rl78/cpu.c | 4 +++- sim/rl78/gdb-if.c | 4 +++- sim/rl78/load.c | 3 ++- sim/rl78/main.c | 3 ++- sim/rl78/mem.c | 4 +++- sim/rl78/rl78.c | 4 +++- sim/rl78/trace.c | 3 ++- 8 files changed, 23 insertions(+), 7 deletions(-) (limited to 'sim/rl78') diff --git a/sim/rl78/ChangeLog b/sim/rl78/ChangeLog index 9fc92e1..ecd9ed0 100644 --- a/sim/rl78/ChangeLog +++ b/sim/rl78/ChangeLog @@ -1,5 +1,10 @@ 2021-05-16 Mike Frysinger + * cpu.c, gdb-if.c, load.c, main.c, mem.c, rl78.c, trace.c: Replace + config.h include with defs.h. + +2021-05-16 Mike Frysinger + * config.in, configure: Regenerate. 2021-05-14 Mike Frysinger diff --git a/sim/rl78/cpu.c b/sim/rl78/cpu.c index fde8afe..1bd8b6e 100644 --- a/sim/rl78/cpu.c +++ b/sim/rl78/cpu.c @@ -19,7 +19,9 @@ 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/rl78/gdb-if.c b/sim/rl78/gdb-if.c index 87e343c..a2414f9 100644 --- a/sim/rl78/gdb-if.c +++ b/sim/rl78/gdb-if.c @@ -18,7 +18,9 @@ GNU General Public License for more details. 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/rl78/load.c b/sim/rl78/load.c index c137ba6..a2a57b0 100644 --- a/sim/rl78/load.c +++ b/sim/rl78/load.c @@ -19,8 +19,9 @@ along with this program. If not, see . */ +/* This must come before any other includes. */ +#include "defs.h" -#include "config.h" #include #include #include diff --git a/sim/rl78/main.c b/sim/rl78/main.c index 8d8a79d..178fa75 100644 --- a/sim/rl78/main.c +++ b/sim/rl78/main.c @@ -19,8 +19,9 @@ along with this program. If not, see . */ +/* This must come before any other includes. */ +#include "defs.h" -#include "config.h" #include #include #include diff --git a/sim/rl78/mem.c b/sim/rl78/mem.c index 77e4987..0b6ab8e 100644 --- a/sim/rl78/mem.c +++ b/sim/rl78/mem.c @@ -19,7 +19,9 @@ 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/rl78/rl78.c b/sim/rl78/rl78.c index 006691c..e45750a 100644 --- a/sim/rl78/rl78.c +++ b/sim/rl78/rl78.c @@ -19,7 +19,9 @@ 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/rl78/trace.c b/sim/rl78/trace.c index 6f897eb..1b4b365 100644 --- a/sim/rl78/trace.c +++ b/sim/rl78/trace.c @@ -19,8 +19,9 @@ along with this program. If not, see . */ +/* This must come before any other includes. */ +#include "defs.h" -#include "config.h" #include #include #include -- cgit v1.1