PR26044, Some targets can't be compiled with GCC 10 (tilepro)

Since this value is used in fields of type tilepro_pipeline (as
NO_PIPELINE, see tc-tilepro.c) it is appropriate to put it in
the tilepro_pipelen enum.  This avoids a warning about converting from
one enum type to another.

	PR 26044
	* opcode/tilepro.h (TILEPRO_NUM_PIPELINE_ENCODINGS): Move to
	tilepro_pipeline enum.

diff --git a/include/ChangeLog b/include/ChangeLog
index 7d114012b13310e2ecc15892eb1303fd3dda4bf2..08eadb6cbd6479681b6e1d0e44fef555e4a00f45 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,9 @@
+2020-05-28  Alan Modra  <amodra@gmail.com>
+
+       PR 26044
+       * opcode/tilepro.h (TILEPRO_NUM_PIPELINE_ENCODINGS): Move to
+       tilepro_pipeline enum.
+
 2020-05-27  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR ld/22909

diff --git a/include/opcode/tilepro.h b/include/opcode/tilepro.h
index 511df96a44a09b153cc64fb64e113028df1b8c98..1c2d399df487c7e6fc947eff8881c2a584075b99 100644 (file)
--- a/include/opcode/tilepro.h
+++ b/include/opcode/tilepro.h
@@ -1412,6 +1412,7 @@ typedef enum
   TILEPRO_PIPELINE_Y0,
   TILEPRO_PIPELINE_Y1,
   TILEPRO_PIPELINE_Y2,
+  TILEPRO_NUM_PIPELINE_ENCODINGS
 } tilepro_pipeline;
 
 #define tilepro_is_x_pipeline(p) ((int)(p) <= (int)TILEPRO_PIPELINE_X1)
@@ -1432,9 +1433,6 @@ enum
   /* Maximum number of instructions in a bundle (2 for X, 3 for Y). */
   TILEPRO_MAX_INSTRUCTIONS_PER_BUNDLE = 3,
 
-  /* How many different pipeline encodings are there? X0, X1, Y0, Y1, Y2. */
-  TILEPRO_NUM_PIPELINE_ENCODINGS = 5,
-
   /* Log base 2 of TILEPRO_BUNDLE_SIZE_IN_BYTES. */
   TILEPRO_LOG2_BUNDLE_SIZE_IN_BYTES = 3,