sim: move sim-io.h to sim-assert.h

Since sim-endian.c doesn't actually use sim_io funcs, it's weird to
include the sim-io.h header here.  It's doing so only for the assert
header.  So lets relocate the include to the right place.

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 265758f..95ae4a4 100644 (file)
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,9 @@
+2015-03-14  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-assert.h [!SIM_ASSERT, WITH_ASSERT]: Include sim-io.h.
+       [!ASSERT, WITH_ASSERT]: Likewise.
+       * sim-endian.c: Delete sim-io.h include.
+
 2015-02-19  Mike Frysinger  <vapier@gentoo.org>
 
        * run-sim.h (sim_kill): Delete unused prototype.

diff --git a/sim/common/sim-assert.h b/sim/common/sim-assert.h
index 3de8114..eaaf791 100644 (file)
--- a/sim/common/sim-assert.h
+++ b/sim/common/sim-assert.h
@@ -42,6 +42,7 @@ while (0)
 
 #if !defined (SIM_ASSERT)
 #if defined (WITH_ASSERT)
+#include "sim-io.h"
 #define SIM_ASSERT(EXPRESSION) \
 do \
   { \
@@ -65,6 +66,7 @@ while (0)
 
 #if !defined (ASSERT)
 #if defined (WITH_ASSERT)
+#include "sim-io.h"
 #define ASSERT(EXPRESSION) \
 do \
   { \

diff --git a/sim/common/sim-endian.c b/sim/common/sim-endian.c
index d2e19b7..9e256c3 100644 (file)
--- a/sim/common/sim-endian.c
+++ b/sim/common/sim-endian.c
@@ -25,7 +25,6 @@
 
 #include "sim-basics.h"
 #include "sim-assert.h"
-#include "sim-io.h"
 
 
 #if !defined(_SWAP_1)