re PR bootstrap/50665 (Bootstrap failure)

	PR bootstrap/50665
	* optabs.h (DOI_vec_perm): Rename from OTI_vec_perm.  Move from enum
	optab_index to enum direct_optab_index.
	(vec_perm_optab): Update.

From-SVN: r179763

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5dc668056bd520973b0ff717b416ea3b6920517b..057daaa7b4724cfece4ff5c5295d1ac7f74b79f6 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2011-10-10  Uros Bizjak  <ubizjak@gmail.com>
+
+       * optabs.h (DOI_vec_perm): Rename from OTI_vec_perm.  Move from enum
+       optab_index to enum direct_optab_index.
+       (vec_perm_optab): Update.
+
 2011-10-10  Anatoly Sokolov  <aesok@post.ru>
 
        * config/cris/cris.c (cris_preferred_reload_class): New function.

diff --git a/gcc/optabs.h b/gcc/optabs.h
index 4b46bda3a3cdb8d558492f9bba83a4302e3a5280..41ae7eb412d135d6c81e2df5fd3fb610d04362c7 100644 (file)
--- a/gcc/optabs.h
+++ b/gcc/optabs.h
@@ -377,9 +377,6 @@ enum optab_index
   OTI_vec_pack_sfix_trunc,
   OTI_vec_pack_ufix_trunc,
 
-  /* Vector shuffling.  */
-  OTI_vec_perm,
-
   /* Perform a raise to the power of integer.  */
   OTI_powi,
 
@@ -560,7 +557,6 @@ enum optab_index
 #define vec_pack_usat_optab (&optab_table[OTI_vec_pack_usat])
 #define vec_pack_sfix_trunc_optab (&optab_table[OTI_vec_pack_sfix_trunc])
 #define vec_pack_ufix_trunc_optab (&optab_table[OTI_vec_pack_ufix_trunc])
-#define vec_perm_optab (&direct_optab_table[(int) OTI_vec_perm])
 
 #define powi_optab (&optab_table[OTI_powi])
 
@@ -642,6 +638,9 @@ enum direct_optab_index
   DOI_reload_in,
   DOI_reload_out,
 
+  /* Vector shuffling.  */
+  DOI_vec_perm,
+
   /* Block move operation.  */
   DOI_movmem,
 
@@ -705,6 +704,7 @@ typedef struct direct_optab_d *direct_optab;
 #endif
 #define reload_in_optab (&direct_optab_table[(int) DOI_reload_in])
 #define reload_out_optab (&direct_optab_table[(int) DOI_reload_out])
+#define vec_perm_optab (&direct_optab_table[(int) DOI_vec_perm])
 #define movmem_optab (&direct_optab_table[(int) DOI_movmem])
 #define setmem_optab (&direct_optab_table[(int) DOI_setmem])
 #define cmpstr_optab (&direct_optab_table[(int) DOI_cmpstr])