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/lm32/ChangeLog | 5 +++++ sim/lm32/dv-lm32cpu.c | 3 +++ sim/lm32/dv-lm32timer.c | 3 +++ sim/lm32/dv-lm32uart.c | 3 +++ sim/lm32/lm32.c | 3 +++ sim/lm32/sim-if.c | 3 +++ sim/lm32/traps.c | 3 +++ sim/lm32/user.c | 3 +++ 8 files changed, 26 insertions(+) (limited to 'sim/lm32') diff --git a/sim/lm32/ChangeLog b/sim/lm32/ChangeLog index 90613411a57..db0e8f0c8af 100644 --- a/sim/lm32/ChangeLog +++ b/sim/lm32/ChangeLog @@ -1,3 +1,8 @@ +2021-05-16 Mike Frysinger + + * dv-lm32cpu.c, dv-lm32timer.c, dv-lm32uart.c, lm32.c, sim-if.c, + traps.c, user.c: Include defs.h. + 2021-05-16 Mike Frysinger * config.in, configure: Regenerate. diff --git a/sim/lm32/dv-lm32cpu.c b/sim/lm32/dv-lm32cpu.c index 2ef32c7e6e1..2f702bd7229 100644 --- a/sim/lm32/dv-lm32cpu.c +++ b/sim/lm32/dv-lm32cpu.c @@ -18,6 +18,9 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ +/* This must come before any other includes. */ +#include "defs.h" + #include "hw-main.h" #include "sim-main.h" diff --git a/sim/lm32/dv-lm32timer.c b/sim/lm32/dv-lm32timer.c index 801d27d42f9..a04afc1d34b 100644 --- a/sim/lm32/dv-lm32timer.c +++ b/sim/lm32/dv-lm32timer.c @@ -18,6 +18,9 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ +/* This must come before any other includes. */ +#include "defs.h" + #include "sim-main.h" #include "hw-main.h" #include "sim-assert.h" diff --git a/sim/lm32/dv-lm32uart.c b/sim/lm32/dv-lm32uart.c index c840b1796bd..1f8ba1d92ee 100644 --- a/sim/lm32/dv-lm32uart.c +++ b/sim/lm32/dv-lm32uart.c @@ -18,6 +18,9 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ +/* This must come before any other includes. */ +#include "defs.h" + #include "sim-main.h" #include "hw-main.h" #include "sim-assert.h" diff --git a/sim/lm32/lm32.c b/sim/lm32/lm32.c index 3c68eafb052..2ffe48de1bd 100644 --- a/sim/lm32/lm32.c +++ b/sim/lm32/lm32.c @@ -18,6 +18,9 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ +/* This must come before any other includes. */ +#include "defs.h" + #define WANT_CPU lm32bf #define WANT_CPU_LM32BF diff --git a/sim/lm32/sim-if.c b/sim/lm32/sim-if.c index c97a45129dc..1cccf626b67 100644 --- a/sim/lm32/sim-if.c +++ b/sim/lm32/sim-if.c @@ -18,6 +18,9 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ +/* This must come before any other includes. */ +#include "defs.h" + #include "sim-main.h" #include "sim-options.h" #include "libiberty.h" diff --git a/sim/lm32/traps.c b/sim/lm32/traps.c index 75b8ee7251f..5b010f9d3fe 100644 --- a/sim/lm32/traps.c +++ b/sim/lm32/traps.c @@ -18,6 +18,9 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ +/* This must come before any other includes. */ +#include "defs.h" + #define WANT_CPU lm32bf #define WANT_CPU_LM32BF diff --git a/sim/lm32/user.c b/sim/lm32/user.c index d84075a03f2..1e7bb71515b 100644 --- a/sim/lm32/user.c +++ b/sim/lm32/user.c @@ -18,6 +18,9 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ +/* This must come before any other includes. */ +#include "defs.h" + #include "sim-main.h" /* Handle user defined instructions. */ -- cgit v1.2.1