From 8eff95bcb6a778c35b91e61ccc066db335d7f06b Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Thu, 28 May 2020 18:46:17 +0930 Subject: 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. --- include/ChangeLog | 6 ++++++ include/opcode/tilepro.h | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/ChangeLog b/include/ChangeLog index 7d11401..08eadb6 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,9 @@ +2020-05-28 Alan Modra + + PR 26044 + * opcode/tilepro.h (TILEPRO_NUM_PIPELINE_ENCODINGS): Move to + tilepro_pipeline enum. + 2020-05-27 H.J. Lu PR ld/22909 diff --git a/include/opcode/tilepro.h b/include/opcode/tilepro.h index 511df96..1c2d399 100644 --- 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, -- cgit v1.1