From 75902396e6dbed2a3cacb42452992db156c6f32f Mon Sep 17 00:00:00 2001 From: Jim Wilson Date: Tue, 25 Sep 2018 01:27:06 +0000 Subject: [PATCH] RISC-V: Fix problems with ilp32e ABI support. gcc/ PR target/87391 * config/riscv/riscv.h (STACK_BOUNDARY): Test riscv_abi == ABI_ILP32E not TARGET_RVE. (ABI_STACK_BOUNDARY, MAX_ARGS_IN_REGISTERS): Likewise. From-SVN: r264555 --- gcc/ChangeLog | 7 +++++++ gcc/config/riscv/riscv.h | 7 ++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 8011490e00c..c6b3167ac0c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2018-09-24 Jim Wilson + + PR target/87391 + * config/riscv/riscv.h (STACK_BOUNDARY): Test riscv_abi == ABI_ILP32E + not TARGET_RVE. + (ABI_STACK_BOUNDARY, MAX_ARGS_IN_REGISTERS): Likewise. + 2018-09-24 Andrew Pinski * config/aarch64/aarch64.c (aarch_macro_fusion_pair_p): Don't diff --git a/gcc/config/riscv/riscv.h b/gcc/config/riscv/riscv.h index 5651d1727f8..4bbb491ac87 100644 --- a/gcc/config/riscv/riscv.h +++ b/gcc/config/riscv/riscv.h @@ -126,10 +126,11 @@ along with GCC; see the file COPYING3. If not see #define FUNCTION_BOUNDARY (TARGET_RVC ? 16 : 32) /* The smallest supported stack boundary the calling convention supports. */ -#define STACK_BOUNDARY (TARGET_RVE ? BITS_PER_WORD : 2 * BITS_PER_WORD) +#define STACK_BOUNDARY \ + (riscv_abi == ABI_ILP32E ? BITS_PER_WORD : 2 * BITS_PER_WORD) /* The ABI stack alignment. */ -#define ABI_STACK_BOUNDARY (TARGET_RVE ? BITS_PER_WORD : 128) +#define ABI_STACK_BOUNDARY (riscv_abi == ABI_ILP32E ? BITS_PER_WORD : 128) /* There is no point aligning anything to a rounder boundary than this. */ #define BIGGEST_ALIGNMENT 128 @@ -492,7 +493,7 @@ enum reg_class #define GP_RETURN GP_ARG_FIRST #define FP_RETURN (UNITS_PER_FP_ARG == 0 ? GP_RETURN : FP_ARG_FIRST) -#define MAX_ARGS_IN_REGISTERS (TARGET_RVE ? 6 : 8) +#define MAX_ARGS_IN_REGISTERS (riscv_abi == ABI_ILP32E ? 6 : 8) /* Symbolic macros for the first/last argument registers. */ -- 2.30.2