From: Andrew MacLeod <amacleod@redhat.com>
Date: Thu, 25 Jun 2015 16:27:12 +0000 (+0000)
Subject: alias.h (alias_set_type): Move typedef.
X-Git-Tag: releases/gcc-6.1.0~6157
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eee335102e36d60367366895729a48b1a24fb23c;p=thirdparty%2Fgcc.git

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 8280777f5f3d..679a0aa7bacf 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 04427b073f24..8762effe2f2a 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 110d5b64a82c..e3cec01f4d8a 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 5a8a56dce4f9..e5e1a1e688ac 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 07c5f6504a66..37ec7d4c6bf9 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