From 757e725b58c57d3ebb66a31fd2210df977a12154 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Tue, 26 Jan 2016 18:17:08 +0000 Subject: [PATCH] tcg: Clean up includes Clean up includes so that osdep.h is included first and headers which it implies are not included manually. This commit was created with scripts/clean-includes. Signed-off-by: Peter Maydell Message-id: 1453832250-766-16-git-send-email-peter.maydell@linaro.org --- tcg/aarch64/tcg-target.c | 1 + tcg/arm/tcg-target.c | 1 + tcg/i386/tcg-target.c | 1 + tcg/mips/tcg-target.c | 2 +- tcg/optimize.c | 4 +--- tcg/ppc/tcg-target.c | 8 +------- tcg/s390/tcg-target.c | 1 + tcg/sparc/tcg-target.c | 1 + tcg/tcg-common.c | 1 + tcg/tcg-op.c | 1 + tcg/tcg.c | 2 +- tcg/tci/tcg-target.c | 1 + 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tcg/aarch64/tcg-target.c b/tcg/aarch64/tcg-target.c index 0ed10a9741..8467d5d8b9 100644 --- a/tcg/aarch64/tcg-target.c +++ b/tcg/aarch64/tcg-target.c @@ -10,6 +10,7 @@ * See the COPYING file in the top-level directory for details. */ +#include "qemu/osdep.h" #include "tcg-be-ldst.h" #include "qemu/bitops.h" diff --git a/tcg/arm/tcg-target.c b/tcg/arm/tcg-target.c index 3edf6a6f97..146ac00f63 100644 --- a/tcg/arm/tcg-target.c +++ b/tcg/arm/tcg-target.c @@ -22,6 +22,7 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "elf.h" #include "tcg-be-ldst.h" diff --git a/tcg/i386/tcg-target.c b/tcg/i386/tcg-target.c index 9187d34caf..d90636cb4e 100644 --- a/tcg/i386/tcg-target.c +++ b/tcg/i386/tcg-target.c @@ -22,6 +22,7 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "tcg-be-ldst.h" #ifndef NDEBUG diff --git a/tcg/mips/tcg-target.c b/tcg/mips/tcg-target.c index 79e052ff7a..2dc4998719 100644 --- a/tcg/mips/tcg-target.c +++ b/tcg/mips/tcg-target.c @@ -24,6 +24,7 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "tcg-be-ldst.h" #ifdef HOST_WORDS_BIGENDIAN @@ -1735,7 +1736,6 @@ static int tcg_target_callee_save_regs[] = { /* The Linux kernel doesn't provide any information about the available instruction set. Probe it using a signal handler. */ -#include #ifndef use_movnz_instructions bool use_movnz_instructions = false; diff --git a/tcg/optimize.c b/tcg/optimize.c index 10795ec9d5..6d68f57ea9 100644 --- a/tcg/optimize.c +++ b/tcg/optimize.c @@ -23,10 +23,8 @@ * THE SOFTWARE. */ -#include "config.h" +#include "qemu/osdep.h" -#include -#include #include "qemu-common.h" #include "tcg-op.h" diff --git a/tcg/ppc/tcg-target.c b/tcg/ppc/tcg-target.c index 2c72565fb9..c593344db1 100644 --- a/tcg/ppc/tcg-target.c +++ b/tcg/ppc/tcg-target.c @@ -22,6 +22,7 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "tcg-be-ldst.h" #if defined _CALL_DARWIN || defined __APPLE__ @@ -2725,8 +2726,6 @@ static void __attribute__((constructor)) tcg_cache_init(void) } #elif defined __APPLE__ -#include -#include #include static void __attribute__((constructor)) tcg_cache_init(void) @@ -2745,11 +2744,6 @@ static void __attribute__((constructor)) tcg_cache_init(void) } #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) -#include -#include -#include -#include -#include #include static void __attribute__((constructor)) tcg_cache_init(void) diff --git a/tcg/s390/tcg-target.c b/tcg/s390/tcg-target.c index fbf97bb2e1..58520fa22b 100644 --- a/tcg/s390/tcg-target.c +++ b/tcg/s390/tcg-target.c @@ -24,6 +24,7 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "tcg-be-ldst.h" /* We only support generating code for 64-bit mode. */ diff --git a/tcg/sparc/tcg-target.c b/tcg/sparc/tcg-target.c index 54df1bc424..d3100ab557 100644 --- a/tcg/sparc/tcg-target.c +++ b/tcg/sparc/tcg-target.c @@ -22,6 +22,7 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "tcg-be-null.h" #ifndef NDEBUG diff --git a/tcg/tcg-common.c b/tcg/tcg-common.c index 8fa4e13305..97305a3efc 100644 --- a/tcg/tcg-common.c +++ b/tcg/tcg-common.c @@ -22,6 +22,7 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "tcg/tcg.h" #if defined(CONFIG_TCG_INTERPRETER) diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c index 0b9dd8ff9f..f554b86d40 100644 --- a/tcg/tcg-op.c +++ b/tcg/tcg-op.c @@ -22,6 +22,7 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "tcg.h" #include "tcg-op.h" diff --git a/tcg/tcg.c b/tcg/tcg.c index a163541d3c..3ce02dcd08 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -26,7 +26,7 @@ #define USE_LIVENESS_ANALYSIS #define USE_TCG_OPTIMIZATIONS -#include "config.h" +#include "qemu/osdep.h" /* Define to jump the ELF file used to communicate with GDB. */ #undef DEBUG_JIT diff --git a/tcg/tci/tcg-target.c b/tcg/tci/tcg-target.c index 4afe4d7a8d..16ce048361 100644 --- a/tcg/tci/tcg-target.c +++ b/tcg/tci/tcg-target.c @@ -22,6 +22,7 @@ * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "tcg-be-null.h" /* TODO list: