| Message ID | 20170922154014.29350-9-f4bug@amsat.org |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | remove i386/pc dependency from non-PC world (part 1) | expand |
On 22 September 2017 at 16:39, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote: > applied using ./scripts/clean-includes > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > target/nios2/cpu.h | 1 - > disas/nios2.c | 3 --- > hw/nios2/boot.c | 1 - > target/nios2/helper.c | 7 ++----- > target/nios2/op_helper.c | 1 + > target/nios2/translate.c | 1 + > 6 files changed, 4 insertions(+), 10 deletions(-) > > diff --git a/target/nios2/cpu.h b/target/nios2/cpu.h > index 50d803a217..fda02c39b9 100644 > --- a/target/nios2/cpu.h > +++ b/target/nios2/cpu.h > @@ -20,7 +20,6 @@ > #ifndef CPU_NIOS2_H > #define CPU_NIOS2_H > > -#include "qemu/osdep.h" > #include "qemu-common.h" > > #define TARGET_LONG_BITS 32 > diff --git a/disas/nios2.c b/disas/nios2.c > index b342936d21..de11f04cc4 100644 > --- a/disas/nios2.c > +++ b/disas/nios2.c > @@ -1756,7 +1756,6 @@ extern const int nios2_num_r2_reg_range_mappings; > #endif /* _NIOS2_H */ > > /*#include "sysdep.h" > -#include <stdio.h> > #include "opcode/nios2.h" > */ > /* Register string table */ > @@ -2521,8 +2520,6 @@ const int nios2_num_r2_reg_range_mappings = 8; > #include "dis-asm.h" > #include "opcode/nios2.h" > #include "libiberty.h" > -#include <string.h> > -#include <assert.h> > */ These are in commented out bits of code anyway, but I guess it doesn't hurt and it'll prevent the script complaining later. > /* No symbol table is available when this code runs out in an embedded > system as when it is used for disassembler support in a monitor. */ > diff --git a/hw/nios2/boot.c b/hw/nios2/boot.c > index 2b31f5b844..94f436e7fb 100644 > --- a/hw/nios2/boot.c > +++ b/hw/nios2/boot.c > @@ -34,7 +34,6 @@ > #include "qemu/option.h" > #include "qemu/config-file.h" > #include "qemu/error-report.h" > -#include "qemu-common.h" > #include "sysemu/device_tree.h" > #include "sysemu/sysemu.h" > #include "hw/loader.h" > diff --git a/target/nios2/helper.c b/target/nios2/helper.c > index ef9ee05798..9f741a8f19 100644 > --- a/target/nios2/helper.c > +++ b/target/nios2/helper.c > @@ -18,12 +18,9 @@ > * <http://www.gnu.org/licenses/lgpl-2.1.html> > */ > > -#include <stdio.h> > -#include <string.h> > -#include <assert.h> > - > -#include "cpu.h" > #include "qemu/osdep.h" > + > +#include "cpu.h" > #include "qemu/host-utils.h" > #include "qapi/error.h" > #include "exec/exec-all.h" > diff --git a/target/nios2/op_helper.c b/target/nios2/op_helper.c > index efb1c489c9..c853aeae02 100644 > --- a/target/nios2/op_helper.c > +++ b/target/nios2/op_helper.c > @@ -18,6 +18,7 @@ > * <http://www.gnu.org/licenses/lgpl-2.1.html> > */ > > +#include "qemu/osdep.h" > #include "cpu.h" > #include "exec/helper-proto.h" > #include "exec/cpu_ldst.h" > diff --git a/target/nios2/translate.c b/target/nios2/translate.c > index 6b0961837d..796d399bd1 100644 > --- a/target/nios2/translate.c > +++ b/target/nios2/translate.c > @@ -21,6 +21,7 @@ > * <http://www.gnu.org/licenses/lgpl-2.1.html> > */ > > +#include "qemu/osdep.h" > #include "cpu.h" > #include "tcg-op.h" > #include "exec/exec-all.h" Reviewed-by: Peter Maydell <peter.maydell@linaro.org> thanks -- PMM
diff --git a/target/nios2/cpu.h b/target/nios2/cpu.h index 50d803a217..fda02c39b9 100644 --- a/target/nios2/cpu.h +++ b/target/nios2/cpu.h @@ -20,7 +20,6 @@ #ifndef CPU_NIOS2_H #define CPU_NIOS2_H -#include "qemu/osdep.h" #include "qemu-common.h" #define TARGET_LONG_BITS 32 diff --git a/disas/nios2.c b/disas/nios2.c index b342936d21..de11f04cc4 100644 --- a/disas/nios2.c +++ b/disas/nios2.c @@ -1756,7 +1756,6 @@ extern const int nios2_num_r2_reg_range_mappings; #endif /* _NIOS2_H */ /*#include "sysdep.h" -#include <stdio.h> #include "opcode/nios2.h" */ /* Register string table */ @@ -2521,8 +2520,6 @@ const int nios2_num_r2_reg_range_mappings = 8; #include "dis-asm.h" #include "opcode/nios2.h" #include "libiberty.h" -#include <string.h> -#include <assert.h> */ /* No symbol table is available when this code runs out in an embedded system as when it is used for disassembler support in a monitor. */ diff --git a/hw/nios2/boot.c b/hw/nios2/boot.c index 2b31f5b844..94f436e7fb 100644 --- a/hw/nios2/boot.c +++ b/hw/nios2/boot.c @@ -34,7 +34,6 @@ #include "qemu/option.h" #include "qemu/config-file.h" #include "qemu/error-report.h" -#include "qemu-common.h" #include "sysemu/device_tree.h" #include "sysemu/sysemu.h" #include "hw/loader.h" diff --git a/target/nios2/helper.c b/target/nios2/helper.c index ef9ee05798..9f741a8f19 100644 --- a/target/nios2/helper.c +++ b/target/nios2/helper.c @@ -18,12 +18,9 @@ * <http://www.gnu.org/licenses/lgpl-2.1.html> */ -#include <stdio.h> -#include <string.h> -#include <assert.h> - -#include "cpu.h" #include "qemu/osdep.h" + +#include "cpu.h" #include "qemu/host-utils.h" #include "qapi/error.h" #include "exec/exec-all.h" diff --git a/target/nios2/op_helper.c b/target/nios2/op_helper.c index efb1c489c9..c853aeae02 100644 --- a/target/nios2/op_helper.c +++ b/target/nios2/op_helper.c @@ -18,6 +18,7 @@ * <http://www.gnu.org/licenses/lgpl-2.1.html> */ +#include "qemu/osdep.h" #include "cpu.h" #include "exec/helper-proto.h" #include "exec/cpu_ldst.h" diff --git a/target/nios2/translate.c b/target/nios2/translate.c index 6b0961837d..796d399bd1 100644 --- a/target/nios2/translate.c +++ b/target/nios2/translate.c @@ -21,6 +21,7 @@ * <http://www.gnu.org/licenses/lgpl-2.1.html> */ +#include "qemu/osdep.h" #include "cpu.h" #include "tcg-op.h" #include "exec/exec-all.h"
applied using ./scripts/clean-includes Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- target/nios2/cpu.h | 1 - disas/nios2.c | 3 --- hw/nios2/boot.c | 1 - target/nios2/helper.c | 7 ++----- target/nios2/op_helper.c | 1 + target/nios2/translate.c | 1 + 6 files changed, 4 insertions(+), 10 deletions(-)