aboutsummaryrefslogtreecommitdiff
path: root/gcc/java
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/java')
-rw-r--r--gcc/java/ChangeLog22
-rw-r--r--gcc/java/boehm.c5
-rw-r--r--gcc/java/builtins.c17
-rw-r--r--gcc/java/class.c17
-rw-r--r--gcc/java/constants.c6
-rw-r--r--gcc/java/decl.c15
-rw-r--r--gcc/java/except.c6
-rw-r--r--gcc/java/expr.c9
-rw-r--r--gcc/java/java-gimplify.c7
-rw-r--r--gcc/java/jcf-dump.c7
-rw-r--r--gcc/java/jcf-io.c4
-rw-r--r--gcc/java/jcf-parse.c17
-rw-r--r--gcc/java/jvgenmain.c6
-rw-r--r--gcc/java/lang.c8
-rw-r--r--gcc/java/mangle.c10
-rw-r--r--gcc/java/mangle_name.c8
-rw-r--r--gcc/java/resource.c15
-rw-r--r--gcc/java/typeck.c10
-rw-r--r--gcc/java/verify-glue.c7
-rw-r--r--gcc/java/verify-impl.c6
20 files changed, 102 insertions, 100 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 3d1ad64..33722e2 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,25 @@
+2015-10-29 Andrew MacLeod <amacleod@redhat.com>
+
+ * boehm.c: Reorder #include's and remove duplicates.
+ * builtins.c: Likewise.
+ * class.c: Likewise.
+ * constants.c: Likewise.
+ * decl.c: Likewise.
+ * except.c: Likewise.
+ * expr.c: Likewise.
+ * java-gimplify.c: Likewise.
+ * jcf-dump.c: Likewise.
+ * jcf-io.c: Likewise.
+ * jcf-parse.c: Likewise.
+ * jvgenmain.c: Likewise.
+ * lang.c: Likewise.
+ * mangle.c: Likewise.
+ * mangle_name.c: Likewise.
+ * resource.c: Likewise.
+ * typeck.c: Likewise.
+ * verify-glue.c: Likewise.
+ * verify-impl.c: Likewise.
+
2015-10-22 Mikhail Maltsev <maltsevm@gmail.com>
* decl.c (java_mark_decl_local): Use flag_checking instead of
diff --git a/gcc/java/boehm.c b/gcc/java/boehm.c
index 717dd16..fbe99d9 100644
--- a/gcc/java/boehm.c
+++ b/gcc/java/boehm.c
@@ -27,12 +27,11 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "alias.h"
#include "tree.h"
-#include "options.h"
+#include "diagnostic-core.h"
+#include "alias.h"
#include "java-tree.h"
#include "parse.h"
-#include "diagnostic-core.h"
static void mark_reference_fields (tree, wide_int *, unsigned int,
int *, int *, int *, HOST_WIDE_INT *);
diff --git a/gcc/java/builtins.c b/gcc/java/builtins.c
index f10227f..7f6d745 100644
--- a/gcc/java/builtins.c
+++ b/gcc/java/builtins.c
@@ -30,31 +30,28 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "alias.h"
+#include "function.h"
+#include "rtl.h"
#include "tree.h"
-#include "options.h"
+#include "stringpool.h"
+#include "expmed.h"
+#include "optabs.h"
+#include "emit-rtl.h"
+#include "alias.h"
#include "fold-const.h"
#include "stor-layout.h"
-#include "stringpool.h"
#include "flags.h"
#include "langhooks.h"
#include "java-tree.h"
/* FIXME: All these headers are necessary for sync_compare_and_swap.
Front ends should never have to look at that. */
-#include "rtl.h"
-#include "insn-codes.h"
-#include "function.h"
-#include "insn-config.h"
-#include "expmed.h"
#include "dojump.h"
#include "explow.h"
#include "calls.h"
-#include "emit-rtl.h"
#include "varasm.h"
#include "stmt.h"
#include "expr.h"
-#include "optabs.h"
static tree max_builtin (tree, tree);
static tree min_builtin (tree, tree);
diff --git a/gcc/java/class.c b/gcc/java/class.c
index 8f1288f..8ecc1d9 100644
--- a/gcc/java/class.c
+++ b/gcc/java/class.c
@@ -26,27 +26,24 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "alias.h"
+#include "target.h"
+#include "function.h"
+#include "obstack.h"
#include "tree.h"
-#include "options.h"
-#include "fold-const.h"
#include "stringpool.h"
+#include "cgraph.h"
+#include "diagnostic-core.h"
+#include "alias.h"
+#include "fold-const.h"
#include "stor-layout.h"
#include "varasm.h"
#include "flags.h"
#include "java-tree.h"
#include "jcf.h"
-#include "obstack.h"
-#include "diagnostic-core.h"
#include "toplev.h"
#include "output.h" /* for switch_to_section and get_section */
#include "parse.h"
-#include "tm.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "cgraph.h"
#include "tree-iterator.h"
-#include "target.h"
static tree make_method_value (tree);
static tree build_java_method_type (tree, tree, int);
diff --git a/gcc/java/constants.c b/gcc/java/constants.c
index 942c867..3e99623 100644
--- a/gcc/java/constants.c
+++ b/gcc/java/constants.c
@@ -24,14 +24,14 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "system.h"
#include "coretypes.h"
#include "tm.h"
+#include "tree.h"
+#include "stringpool.h"
+#include "diagnostic-core.h"
#include "jcf.h"
#include "alias.h"
-#include "tree.h"
#include "fold-const.h"
-#include "stringpool.h"
#include "stor-layout.h"
#include "java-tree.h"
-#include "diagnostic-core.h"
#include "toplev.h"
static void set_constant_entry (CPool *, int, int, jword);
diff --git a/gcc/java/decl.c b/gcc/java/decl.c
index 2b33621..43675a9 100644
--- a/gcc/java/decl.c
+++ b/gcc/java/decl.c
@@ -27,24 +27,21 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "alias.h"
+#include "target.h"
+#include "function.h"
#include "tree.h"
-#include "options.h"
-#include "stor-layout.h"
#include "stringpool.h"
-#include "varasm.h"
+#include "cgraph.h"
#include "diagnostic-core.h"
+#include "alias.h"
+#include "stor-layout.h"
+#include "varasm.h"
#include "toplev.h"
#include "flags.h"
#include "java-tree.h"
#include "jcf.h"
#include "java-except.h"
-#include "tm.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "cgraph.h"
#include "tree-inline.h"
-#include "target.h"
#include "version.h"
#include "tree-iterator.h"
#include "langhooks.h"
diff --git a/gcc/java/except.c b/gcc/java/except.c
index a2bd0da..03457f6 100644
--- a/gcc/java/except.c
+++ b/gcc/java/except.c
@@ -25,17 +25,17 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "system.h"
#include "coretypes.h"
#include "tm.h"
-#include "alias.h"
#include "tree.h"
-#include "fold-const.h"
#include "stringpool.h"
+#include "diagnostic-core.h"
+#include "alias.h"
+#include "fold-const.h"
#include "stor-layout.h"
#include "java-tree.h"
#include "javaop.h"
#include "java-opcodes.h"
#include "jcf.h"
#include "java-except.h"
-#include "diagnostic-core.h"
#include "toplev.h"
#include "tree-iterator.h"
diff --git a/gcc/java/expr.c b/gcc/java/expr.c
index 37a705c..e1eadd2 100644
--- a/gcc/java/expr.c
+++ b/gcc/java/expr.c
@@ -26,11 +26,12 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
+#include "target.h"
#include "tree.h"
-#include "fold-const.h"
#include "stringpool.h"
+#include "diagnostic-core.h"
+#include "alias.h"
+#include "fold-const.h"
#include "stor-layout.h"
#include "flags.h"
#include "java-tree.h"
@@ -39,9 +40,7 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "jcf.h"
#include "java-except.h"
#include "parse.h"
-#include "diagnostic-core.h"
#include "tree-iterator.h"
-#include "target.h"
static void flush_quick_stack (void);
static void push_value (tree);
diff --git a/gcc/java/java-gimplify.c b/gcc/java/java-gimplify.c
index c6e7657..2e64e8f 100644
--- a/gcc/java/java-gimplify.c
+++ b/gcc/java/java-gimplify.c
@@ -24,15 +24,14 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "alias.h"
#include "tm.h"
#include "function.h"
-#include "cfghooks.h"
#include "basic-block.h"
+#include "hard-reg-set.h"
#include "tree.h"
#include "gimple.h"
-#include "hard-reg-set.h"
-#include "options.h"
+#include "cfghooks.h"
+#include "alias.h"
#include "fold-const.h"
#include "java-tree.h"
#include "dumpfile.h"
diff --git a/gcc/java/jcf-dump.c b/gcc/java/jcf-dump.c
index 8bd8e07..fec3a40 100644
--- a/gcc/java/jcf-dump.c
+++ b/gcc/java/jcf-dump.c
@@ -50,13 +50,13 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "intl.h"
+#include "options.h"
+#include "tree.h"
#include "diagnostic.h"
+#include "intl.h"
#include "jcf.h"
#include "alias.h"
-#include "tree.h"
-#include "options.h"
#include "java-tree.h"
#include "version.h"
@@ -457,7 +457,6 @@ utf8_equal_string (JCF *jcf, int index, const char * value)
if (flag_print_attributes > 0) \
fprintf (out, "\nAttributes (count: %d):\n", attributes_count);
-#include "javaop.h"
diff --git a/gcc/java/jcf-io.c b/gcc/java/jcf-io.c
index 87d1942..642ca73 100644
--- a/gcc/java/jcf-io.c
+++ b/gcc/java/jcf-io.c
@@ -26,11 +26,11 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "config.h"
#include "system.h"
#include "coretypes.h"
+#include "options.h"
+#include "tree.h"
#include "jcf.h"
#include "alias.h"
-#include "tree.h"
-#include "options.h"
#include "java-tree.h"
#include <dirent.h>
diff --git a/gcc/java/jcf-parse.c b/gcc/java/jcf-parse.c
index bb6e743..00d36a3 100644
--- a/gcc/java/jcf-parse.c
+++ b/gcc/java/jcf-parse.c
@@ -26,24 +26,21 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "alias.h"
+#include "target.h"
+#include "function.h"
+#include "obstack.h"
+#include "bitmap.h"
#include "tree.h"
-#include "options.h"
#include "stringpool.h"
-#include "obstack.h"
+#include "cgraph.h"
+#include "diagnostic-core.h"
+#include "alias.h"
#include "flags.h"
#include "java-except.h"
#include "javaop.h"
#include "java-tree.h"
-#include "diagnostic-core.h"
#include "parse.h"
#include "debug.h"
-#include "tm.h"
-#include "hard-reg-set.h"
-#include "function.h"
-#include "cgraph.h"
-#include "bitmap.h"
-#include "target.h"
#include "toplev.h"
#ifdef HAVE_LOCALE_H
diff --git a/gcc/java/jvgenmain.c b/gcc/java/jvgenmain.c
index 2f6d94b..aa10377 100644
--- a/gcc/java/jvgenmain.c
+++ b/gcc/java/jvgenmain.c
@@ -26,14 +26,14 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "config.h"
#include "system.h"
#include "coretypes.h"
+#include "options.h"
#include "obstack.h"
+#include "tree.h"
+#include "diagnostic.h"
#include "jcf.h"
#include "alias.h"
-#include "tree.h"
-#include "options.h"
#include "java-tree.h"
#include "intl.h"
-#include "diagnostic.h"
static char * do_mangle_classname (const char *string);
diff --git a/gcc/java/lang.c b/gcc/java/lang.c
index 11e786c..94b2dcf 100644
--- a/gcc/java/lang.c
+++ b/gcc/java/lang.c
@@ -26,21 +26,19 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "tm.h"
-#include "alias.h"
+#include "target.h"
#include "tree.h"
+#include "diagnostic.h"
+#include "alias.h"
#include "java-tree.h"
#include "jcf.h"
#include "langhooks.h"
#include "langhooks-def.h"
#include "flags.h"
-#include "diagnostic.h"
#include "tree-inline.h"
#include "splay-tree.h"
#include "tree-dump.h"
#include "opts.h"
-#include "options.h"
-#include "target.h"
#include "context.h"
static bool java_init (void);
diff --git a/gcc/java/mangle.c b/gcc/java/mangle.c
index a9fc886..c69bcd8 100644
--- a/gcc/java/mangle.c
+++ b/gcc/java/mangle.c
@@ -27,14 +27,14 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "jcf.h"
-#include "alias.h"
-#include "tree.h"
#include "options.h"
-#include "stringpool.h"
-#include "java-tree.h"
#include "obstack.h"
+#include "tree.h"
+#include "stringpool.h"
#include "diagnostic-core.h"
+#include "jcf.h"
+#include "alias.h"
+#include "java-tree.h"
#include "langhooks-def.h"
static void mangle_class_field (tree);
diff --git a/gcc/java/mangle_name.c b/gcc/java/mangle_name.c
index 26c1931..47e3b52 100644
--- a/gcc/java/mangle_name.c
+++ b/gcc/java/mangle_name.c
@@ -27,13 +27,13 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "jcf.h"
-#include "alias.h"
-#include "tree.h"
#include "options.h"
-#include "java-tree.h"
#include "obstack.h"
+#include "tree.h"
#include "diagnostic-core.h"
+#include "jcf.h"
+#include "alias.h"
+#include "java-tree.h"
static void append_unicode_mangled_name (const char *, int);
#ifndef HAVE_AS_UTF8
diff --git a/gcc/java/resource.c b/gcc/java/resource.c
index 6fb730b..922dfe7 100644
--- a/gcc/java/resource.c
+++ b/gcc/java/resource.c
@@ -24,22 +24,21 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "alias.h"
+#include "tm.h"
+#include "function.h"
+#include "hard-reg-set.h"
#include "tree.h"
-#include "options.h"
-#include "fold-const.h"
#include "stringpool.h"
+#include "cgraph.h"
+#include "diagnostic-core.h"
+#include "alias.h"
+#include "fold-const.h"
#include "stor-layout.h"
#include "java-tree.h"
#include "jcf.h"
-#include "diagnostic-core.h"
#include "toplev.h"
#include "parse.h"
-#include "tm.h"
-#include "hard-reg-set.h"
-#include "function.h"
#include "tree-iterator.h"
-#include "cgraph.h"
/* A list of all the resources files. */
static GTY(()) vec<tree, va_gc> *resources;
diff --git a/gcc/java/typeck.c b/gcc/java/typeck.c
index 6cbb356..1cdd070 100644
--- a/gcc/java/typeck.c
+++ b/gcc/java/typeck.c
@@ -26,18 +26,18 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "config.h"
#include "system.h"
#include "coretypes.h"
-#include "alias.h"
-#include "tree.h"
#include "options.h"
+#include "obstack.h"
+#include "tree.h"
+#include "stringpool.h"
+#include "diagnostic-core.h"
+#include "alias.h"
#include "fold-const.h"
#include "stor-layout.h"
-#include "stringpool.h"
-#include "obstack.h"
#include "flags.h"
#include "java-tree.h"
#include "jcf.h"
#include "convert.h"
-#include "diagnostic-core.h"
static tree convert_ieee_real_to_integer (tree, tree);
static tree parse_signature_type (const unsigned char **,
diff --git a/gcc/java/verify-glue.c b/gcc/java/verify-glue.c
index a1630c7..508383d 100644
--- a/gcc/java/verify-glue.c
+++ b/gcc/java/verify-glue.c
@@ -27,16 +27,15 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */
#include "system.h"
#include "coretypes.h"
-#include "alias.h"
-#include "tree.h"
#include "options.h"
+#include "tree.h"
#include "stringpool.h"
+#include "diagnostic-core.h"
+#include "alias.h"
#include "parse.h"
#include "verify.h"
-#include "java-tree.h"
#include "java-except.h"
-#include "diagnostic-core.h"
void *
vfy_alloc (size_t bytes)
diff --git a/gcc/java/verify-impl.c b/gcc/java/verify-impl.c
index ee06eec..4969318 100644
--- a/gcc/java/verify-impl.c
+++ b/gcc/java/verify-impl.c
@@ -14,12 +14,12 @@ details. */
#include "config.h"
#include "system.h"
#include "coretypes.h"
-
-#include "alias.h"
-#include "symtab.h"
#include "options.h"
+#include "symtab.h"
#include "verify.h"
+#include "alias.h"
+
/* Hack to work around namespace pollution from java-tree.h. */
#undef current_class