target-cris: Clean includes

The change in cpu.h is needed when HOST_LONG_BITS is defined in qemu-common.h.

Cc: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Signed-off-by: Stefan Weil <sw@weilnetz.de>

diff --git a/target-cris/cpu.h b/target-cris/cpu.h
index 453afbb66e080e6d40a9c5e42de48f69bb54cc47..222a0625a35be3b7f1f58cac4443e9591f23f3cd 100644 (file)
--- a/target-cris/cpu.h
+++ b/target-cris/cpu.h
@@ -20,6 +20,9 @@
 #ifndef CPU_CRIS_H
 #define CPU_CRIS_H
 
+#include "config.h"
+#include "qemu-common.h"
+
 #define TARGET_LONG_BITS 32
 
 #define CPUState struct CPUCRISState

diff --git a/target-cris/helper.c b/target-cris/helper.c
index 5bc6d810cb64d13b9eb1df6fa1db4002f105a11e..dd7f18e7f49e98fcc441b199087176efb55703ce 100644 (file)
--- a/target-cris/helper.c
+++ b/target-cris/helper.c
@@ -18,10 +18,6 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
-#include <string.h>
-
-#include "config.h"
 #include "cpu.h"
 #include "mmu.h"
 #include "host-utils.h"

diff --git a/target-cris/mmu.c b/target-cris/mmu.c
index d481e39352d282be7d03cc64b5f9f4418d069806..5cd8f275286d539dfd2b4d7c83d5aa30c38b4a9e 100644 (file)
--- a/target-cris/mmu.c
+++ b/target-cris/mmu.c
@@ -20,11 +20,6 @@
 
 #ifndef CONFIG_USER_ONLY
 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "config.h"
 #include "cpu.h"
 #include "mmu.h"
 

diff --git a/target-cris/translate.c b/target-cris/translate.c
index 70abf8a095efed4fb9f5c44f8873a7ab99a63aa6..cbdc72c9b959e895ee49a823e44d3f33a3785cd1 100644 (file)
--- a/target-cris/translate.c
+++ b/target-cris/translate.c
@@ -23,19 +23,12 @@
  * The condition code translation is in need of attention.
  */
 
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <inttypes.h>
-
 #include "cpu.h"
 #include "disas.h"
 #include "tcg-op.h"
 #include "helper.h"
 #include "mmu.h"
 #include "crisv32-decode.h"
-#include "qemu-common.h"
 
 #define GEN_HELPER 1
 #include "helper.h"