aboutsummaryrefslogtreecommitdiff
path: root/sim/or1k
diff options
context:
space:
mode:
Diffstat (limited to 'sim/or1k')
-rw-r--r--sim/or1k/ChangeLog5
-rw-r--r--sim/or1k/or1k.c3
-rw-r--r--sim/or1k/sim-if.c3
-rw-r--r--sim/or1k/sim-main.h2
-rw-r--r--sim/or1k/traps.c3
5 files changed, 14 insertions, 2 deletions
diff --git a/sim/or1k/ChangeLog b/sim/or1k/ChangeLog
index ddfa618..af6afc4 100644
--- a/sim/or1k/ChangeLog
+++ b/sim/or1k/ChangeLog
@@ -1,5 +1,10 @@
2021-05-16 Mike Frysinger <vapier@gentoo.org>
+ * sim-main.h: Delete config.h include.
+ * or1k.c, sim-if.c, traps.c: Include defs.h.
+
+2021-05-16 Mike Frysinger <vapier@gentoo.org>
+
* config.in, configure: Regenerate.
2021-05-12 Mike Frysinger <vapier@gentoo.org>
diff --git a/sim/or1k/or1k.c b/sim/or1k/or1k.c
index 4b44e50..650d98b 100644
--- a/sim/or1k/or1k.c
+++ b/sim/or1k/or1k.c
@@ -16,6 +16,9 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
+/* This must come before any other includes. */
+#include "defs.h"
+
#define WANT_CPU_OR1K32BF
#define WANT_CPU
diff --git a/sim/or1k/sim-if.c b/sim/or1k/sim-if.c
index 41dbaae..005124b 100644
--- a/sim/or1k/sim-if.c
+++ b/sim/or1k/sim-if.c
@@ -16,6 +16,9 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
+/* 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/or1k/sim-main.h b/sim/or1k/sim-main.h
index cac1abb..f91a351 100644
--- a/sim/or1k/sim-main.h
+++ b/sim/or1k/sim-main.h
@@ -21,8 +21,6 @@
#define WITH_SCACHE_PBB 1
-#include "config.h"
-
#include "ansidecl.h"
#include "or1k-desc.h"
#include "sim-basics.h"
diff --git a/sim/or1k/traps.c b/sim/or1k/traps.c
index 0a0f1aa..7f5a38f 100644
--- a/sim/or1k/traps.c
+++ b/sim/or1k/traps.c
@@ -16,6 +16,9 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
+/* This must come before any other includes. */
+#include "defs.h"
+
#define WANT_CPU_OR1K32BF
#define WANT_CPU