alias.h (alias_set_type): Move typedef.

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

From-SVN: r224948

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8280777f5f3da7960f983c2e8e6f11b1362bbda0..679a0aa7bacf65c2d4477c4ce29937d75a60eb72 100644 (file)
--- 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 04427b073f246d79d89634c76482bb4efc8651d5..8762effe2f2a707ece840d875923ccc4ccf16e87 100644 (file)
--- 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 110d5b64a82c623e1a88e56c04959af07b00e951..e3cec01f4d8a246fc8b087b423241a07618350d1 100644 (file)
--- 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 5a8a56dce4f9c42b96b28bc3feb3e6f216b9ade9..e5e1a1e688ac71a22eace0f7583cd893702fe243 100644 (file)
--- 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 07c5f6504a66c18acf6b54dc2bdf793e7fdc091a..37ec7d4c6bf9c1f198e150128295640ee64118bd 100644 (file)
--- 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