diff options
author | Richard Sandiford <richard.sandiford@linaro.org> | 2017-10-23 19:56:19 +0100 |
---|---|---|
committer | Richard Sandiford <richard.sandiford@linaro.org> | 2017-10-23 19:56:19 +0100 |
commit | 7bef5b82e4109778a0988d20e19e1ed29dadd835 (patch) | |
tree | f5c594a5206e2b23c95741c1338fc1d11acffd25 /gcc/config/m32c | |
parent | 246229fdf9230ca040aa990a3fbb42698f30ae5f (diff) | |
parent | b11bf8d85f574c56cab353544b50396c18ab9b93 (diff) | |
download | gcc-7bef5b82e4109778a0988d20e19e1ed29dadd835.tar.gz |
Merge trunk into sve
Diffstat (limited to 'gcc/config/m32c')
-rw-r--r-- | gcc/config/m32c/m32c-pragma.c | 2 | ||||
-rw-r--r-- | gcc/config/m32c/m32c-protos.h | 2 | ||||
-rw-r--r-- | gcc/config/m32c/m32c.c | 6 | ||||
-rw-r--r-- | gcc/config/m32c/m32c.h | 1 |
4 files changed, 5 insertions, 6 deletions
diff --git a/gcc/config/m32c/m32c-pragma.c b/gcc/config/m32c/m32c-pragma.c index 0da26c97303..c44e59c4aa6 100644 --- a/gcc/config/m32c/m32c-pragma.c +++ b/gcc/config/m32c/m32c-pragma.c @@ -18,7 +18,7 @@ along with GCC; see the file COPYING3. If not see <http://www.gnu.org/licenses/>. */ -#define TARGET_C_FILE 1 +#define IN_TARGET_CODE 1 #include "config.h" #include "system.h" diff --git a/gcc/config/m32c/m32c-protos.h b/gcc/config/m32c/m32c-protos.h index 8647a208420..f68d3b3185d 100644 --- a/gcc/config/m32c/m32c-protos.h +++ b/gcc/config/m32c/m32c-protos.h @@ -29,7 +29,7 @@ void m32c_init_expanders (void); int m32c_initial_elimination_offset (int, int); void m32c_output_reg_pop (FILE *, int); void m32c_output_reg_push (FILE *, int); -unsigned int m32c_push_rounding (int); +poly_int64 m32c_push_rounding (poly_int64); void m32c_register_pragmas (void); void m32c_note_pragma_address (const char *, unsigned); int m32c_regno_ok_for_base_p (int); diff --git a/gcc/config/m32c/m32c.c b/gcc/config/m32c/m32c.c index d8a62cc727a..edad8b6e2e8 100644 --- a/gcc/config/m32c/m32c.c +++ b/gcc/config/m32c/m32c.c @@ -18,7 +18,7 @@ along with GCC; see the file COPYING3. If not see <http://www.gnu.org/licenses/>. */ -#define TARGET_C_FILE 1 +#define IN_TARGET_CODE 1 #include "config.h" #include "system.h" @@ -1290,8 +1290,8 @@ m32c_initial_elimination_offset (int from, int to) /* Implements PUSH_ROUNDING. The R8C and M16C have byte stacks, the M32C has word stacks. */ -unsigned int -m32c_push_rounding (int n) +poly_int64 +m32c_push_rounding (poly_int64 n) { if (TARGET_R8C || TARGET_M16C) return n; diff --git a/gcc/config/m32c/m32c.h b/gcc/config/m32c/m32c.h index 594288b76e9..4bf67fb9c67 100644 --- a/gcc/config/m32c/m32c.h +++ b/gcc/config/m32c/m32c.h @@ -421,7 +421,6 @@ enum reg_class #define STACK_PUSH_CODE PRE_DEC #define FRAME_GROWS_DOWNWARD 1 -#define STARTING_FRAME_OFFSET 0 #define FIRST_PARM_OFFSET(F) 0 #define RETURN_ADDR_RTX(COUNT,FA) m32c_return_addr_rtx (COUNT) |