nios2: remove duplicated includes (in code commented out)

applied using ./scripts/clean-includes

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>

diff --git a/disas/nios2.c b/disas/nios2.c
index b342936d21ce09e7c09ca4cd9c8feb5627bc8d84..de11f04cc40fd27f792bc1dacc91ba6f4d3c25dd 100644 (file)
--- 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 2b31f5b84458624b49585f167a48776950d62fd3..94f436e7fba7dd6671d9431df4831674ed86d17f 100644 (file)
--- 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/cpu.h b/target/nios2/cpu.h
index 9119eee587a68b470c405019704169da67ba8d4d..88823a6d4d69a1a80a49dca337300a8122f8fcdc 100644 (file)
--- 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/target/nios2/helper.c b/target/nios2/helper.c
index ef9ee05798ad9883c5aac8b1e44ba250c9f4d849..9f741a8f19d972a0c1a8e4652410d4fa0b9562e4 100644 (file)
--- 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 "qemu/osdep.h"
 
 #include "cpu.h"
-#include "qemu/osdep.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 efb1c489c99d7f81b67afa20c1cf1589926194b5..c853aeae0297cea32a0148a5c1ea3bb462c32e73 100644 (file)
--- 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 72329002ac9e8629e4b8be29d29564e6e9bc04ad..51a54ff76052b2600f5df4833451c7543996cebd 100644 (file)
--- 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"