aboutsummaryrefslogtreecommitdiff
path: root/sim/d10v
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2021-05-01 18:05:23 -0400
committerMike Frysinger <vapier@gentoo.org>2021-05-16 22:38:41 -0400
commit6df01ab8ab8509b04f86d7da069ec2d25eb31bf9 (patch)
tree21a00924bc74b7d5ec239a133d223f9d52f1dd67 /sim/d10v
parent681eb80f1217f66c83dec4a3db83577a2a09f74a (diff)
downloadfsf-binutils-gdb-6df01ab8ab8509b04f86d7da069ec2d25eb31bf9.zip
fsf-binutils-gdb-6df01ab8ab8509b04f86d7da069ec2d25eb31bf9.tar.gz
fsf-binutils-gdb-6df01ab8ab8509b04f86d7da069ec2d25eb31bf9.tar.bz2
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.
Diffstat (limited to 'sim/d10v')
-rw-r--r--sim/d10v/ChangeLog6
-rw-r--r--sim/d10v/d10v_sim.h1
-rw-r--r--sim/d10v/endian.c3
-rw-r--r--sim/d10v/gencode.c1
-rw-r--r--sim/d10v/interp.c4
-rw-r--r--sim/d10v/simops.c3
6 files changed, 14 insertions, 4 deletions
diff --git a/sim/d10v/ChangeLog b/sim/d10v/ChangeLog
index 622a911..bce1617 100644
--- a/sim/d10v/ChangeLog
+++ b/sim/d10v/ChangeLog
@@ -1,5 +1,11 @@
2021-05-16 Mike Frysinger <vapier@gentoo.org>
+ * d10v_sim.h, gencode.c: Delete config.h include.
+ * endian.c: Include defs.h.
+ * interp.c, simops.c: Replace config.h include with defs.h.
+
+2021-05-16 Mike Frysinger <vapier@gentoo.org>
+
* config.in, configure: Regenerate.
2021-05-14 Mike Frysinger <vapier@gentoo.org>
diff --git a/sim/d10v/d10v_sim.h b/sim/d10v/d10v_sim.h
index 972402c..1e1e84c 100644
--- a/sim/d10v/d10v_sim.h
+++ b/sim/d10v/d10v_sim.h
@@ -1,4 +1,3 @@
-#include "config.h"
#include <stdio.h>
#include <ctype.h>
#include <limits.h>
diff --git a/sim/d10v/endian.c b/sim/d10v/endian.c
index dbc3db2..70f63d8 100644
--- a/sim/d10v/endian.c
+++ b/sim/d10v/endian.c
@@ -1,6 +1,9 @@
/* If we're being compiled as a .c file, rather than being included in
d10v_sim.h, then ENDIAN_INLINE won't be defined yet. */
+/* This must come before any other includes. */
+#include "defs.h"
+
#ifndef ENDIAN_INLINE
#define NO_ENDIAN_INLINE
#include "sim-main.h"
diff --git a/sim/d10v/gencode.c b/sim/d10v/gencode.c
index 9f8a41c..6e006d0 100644
--- a/sim/d10v/gencode.c
+++ b/sim/d10v/gencode.c
@@ -1,4 +1,3 @@
-#include "config.h"
#include <stdio.h>
#include <ctype.h>
#include <limits.h>
diff --git a/sim/d10v/interp.c b/sim/d10v/interp.c
index a0dc2f5..b56b204 100644
--- a/sim/d10v/interp.c
+++ b/sim/d10v/interp.c
@@ -1,4 +1,6 @@
-#include "config.h"
+/* This must come before any other includes. */
+#include "defs.h"
+
#include <inttypes.h>
#include <signal.h>
#include "bfd.h"
diff --git a/sim/d10v/simops.c b/sim/d10v/simops.c
index ed0c8a3..af725ad 100644
--- a/sim/d10v/simops.c
+++ b/sim/d10v/simops.c
@@ -1,4 +1,5 @@
-#include "config.h"
+/* This must come before any other includes. */
+#include "defs.h"
#include <signal.h>
#include <errno.h>