summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog7
-rw-r--r--gcc/alias.h8
-rw-r--r--gcc/coretypes.h7
-rw-r--r--gcc/jit/jit-common.h1
-rw-r--r--gcc/rtl.h1
5 files changed, 14 insertions, 10 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8280777f5f3..679a0aa7bac 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2015-06-25 Andrew Macleod <amacleod@redhat.com>
+
+ * alias.h (alias_set_type): Move typedef.
+ * coretypes.h (alias_set_type): Relocate typedef here.
+ * rtl.h: Don't include alias.h.
+ * jit/jit-common.h: Likewise
+
2015-06-25 Andrew MacLeod <amacleod@redhat.com>
* cgraph.h (cgraph_rtl_info): Move to rtl.h
diff --git a/gcc/alias.h b/gcc/alias.h
index 04427b073f2..8762effe2f2 100644
--- a/gcc/alias.h
+++ b/gcc/alias.h
@@ -20,14 +20,6 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_ALIAS_H
#define GCC_ALIAS_H
-/* The type of an alias set. Code currently assumes that variables of
- this type can take the values 0 (the alias set which aliases
- everything) and -1 (sometimes indicating that the alias set is
- unknown, sometimes indicating a memory barrier) and -2 (indicating
- that the alias set should be set to a unique value but has not been
- set yet). */
-typedef int alias_set_type;
-
extern alias_set_type new_alias_set (void);
extern alias_set_type get_alias_set (tree);
extern alias_set_type get_deref_alias_set (tree);
diff --git a/gcc/coretypes.h b/gcc/coretypes.h
index 110d5b64a82..e3cec01f4d8 100644
--- a/gcc/coretypes.h
+++ b/gcc/coretypes.h
@@ -210,6 +210,13 @@ enum var_init_status
VAR_INIT_STATUS_INITIALIZED
};
+/* The type of an alias set. Code currently assumes that variables of
+ this type can take the values 0 (the alias set which aliases
+ everything) and -1 (sometimes indicating that the alias set is
+ unknown, sometimes indicating a memory barrier) and -2 (indicating
+ that the alias set should be set to a unique value but has not been
+ set yet). */
+typedef int alias_set_type;
struct edge_def;
typedef struct edge_def *edge;
diff --git a/gcc/jit/jit-common.h b/gcc/jit/jit-common.h
index 5a8a56dce4f..e5e1a1e688a 100644
--- a/gcc/jit/jit-common.h
+++ b/gcc/jit/jit-common.h
@@ -24,7 +24,6 @@ along with GCC; see the file COPYING3. If not see
#include "libgccjit.h"
#include "vec.h"
-#include "alias.h"
#include "flags.h"
#include "symtab.h"
#include "inchash.h"
diff --git a/gcc/rtl.h b/gcc/rtl.h
index 07c5f6504a6..37ec7d4c6bf 100644
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -38,7 +38,6 @@ along with GCC; see the file COPYING3. If not see
#include "is-a.h"
#endif /* GENERATOR_FILE */
-#include "alias.h"
#include "flags.h"
/* Value used by some passes to "recognize" noop moves as valid