diff options
author | Blue Swirl <blauwirbel@gmail.com> | 2012-03-03 17:59:06 +0000 |
---|---|---|
committer | Blue Swirl <blauwirbel@gmail.com> | 2012-03-03 17:59:06 +0000 |
commit | 5a30d3f19d9c6d135bf7a395a24dc455698d5cf9 (patch) | |
tree | 3ada83652cc2f37b7a6344585c8bd72e5e99588d /target-cris | |
parent | 41e37c33fc5897ff8015af8e0e3f5eb13c394b51 (diff) | |
parent | c0fd260e9da7e6e60ea6bf1b0198a804f147073f (diff) |
Merge branch 'upstream' of git://qemu.weilnetz.de/qemu
* 'upstream' of git://qemu.weilnetz.de/qemu:
Move definition of HOST_LONG_BITS to qemu-common.h
target-xtensa: Clean includes
target-unicore32: Clean includes
target-sh4: Clean includes
target-s390x: Clean includes
target-ppc: Clean includes
target-mips: Clean includes
target-microblaze: Clean includes
target-m68k: Clean includes
target-lm32: Clean includes
target-i386: Clean includes
target-cris: Clean includes
target-arm: Clean includes
target-alpha: Clean includes
Remove macro HOST_LONG_SIZE
Diffstat (limited to 'target-cris')
-rw-r--r-- | target-cris/cpu.h | 3 | ||||
-rw-r--r-- | target-cris/helper.c | 4 | ||||
-rw-r--r-- | target-cris/mmu.c | 5 | ||||
-rw-r--r-- | target-cris/translate.c | 7 |
4 files changed, 3 insertions, 16 deletions
diff --git a/target-cris/cpu.h b/target-cris/cpu.h index 453afbb66e..222a0625a3 100644 --- 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 5bc6d810cb..dd7f18e7f4 100644 --- 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 d481e39352..5cd8f27528 100644 --- 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 70abf8a095..cbdc72c9b9 100644 --- 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" |