And finally, the same for m32r. Committed to the trunk,
Jeff
commit f6aa1c34e4a89c8c93518c49a108f3c43b78ea47 Author: Jeff Law <jeffreya...@gmail.com> Date: Fri Jul 2 10:48:26 2021 -0400 Fix m32r target specific fallout from recent int->bool changes gcc/ChangeLog * config/m32r/m32r-protos.h (call_operand): Adjust return type. (small_data_operand, memreg_operand, small_insn_p): Likewise. * config/m32r/m32r.c (call_operand): Adjust return type. (small_data_operand, memreg_operand): Likewise. diff --git a/gcc/config/m32r/m32r-protos.h b/gcc/config/m32r/m32r-protos.h index 23313fb9b28..82b2c701be0 100644 --- a/gcc/config/m32r/m32r-protos.h +++ b/gcc/config/m32r/m32r-protos.h @@ -49,13 +49,13 @@ extern rtx m32r_return_addr (int); extern rtx m32r_function_symbol (const char *); #ifdef HAVE_MACHINE_MODES -extern int call_operand (rtx, machine_mode); -extern int small_data_operand (rtx, machine_mode); +extern bool call_operand (rtx, machine_mode); +extern bool small_data_operand (rtx, machine_mode); extern int addr24_operand (rtx, machine_mode); extern int addr32_operand (rtx, machine_mode); extern int call26_operand (rtx, machine_mode); -extern int memreg_operand (rtx, machine_mode); -extern int small_insn_p (rtx, machine_mode); +extern bool memreg_operand (rtx, machine_mode); +extern bool small_insn_p (rtx, machine_mode); #endif /* HAVE_MACHINE_MODES */ diff --git a/gcc/config/m32r/m32r.c b/gcc/config/m32r/m32r.c index 3444ed49eee..1aaba94bb5c 100644 --- a/gcc/config/m32r/m32r.c +++ b/gcc/config/m32r/m32r.c @@ -532,7 +532,7 @@ m32r_init_expanders (void) to make it easy to experiment. */ } -int +bool call_operand (rtx op, machine_mode mode) { if (!MEM_P (op)) @@ -543,7 +543,7 @@ call_operand (rtx op, machine_mode mode) /* Return 1 if OP is a reference to an object in .sdata/.sbss. */ -int +bool small_data_operand (rtx op, machine_mode mode ATTRIBUTE_UNUSED) { if (! TARGET_SDATA_USE) @@ -674,7 +674,7 @@ easy_df_const (rtx op) /* Return 1 if OP is (mem (reg ...)). This is used in insn length calcs. */ -int +bool memreg_operand (rtx op, machine_mode mode ATTRIBUTE_UNUSED) { return MEM_P (op) && REG_P (XEXP (op, 0));