[gcc(refs/vendors/ARM/heads/morello)] config: Fix up unwind_word_mode

[gcc(refs/vendors/ARM/heads/morello)] config: Fix up unwind_word_mode

[Alex Coplan]

https://gcc.gnu.org/g:bd6fab0b158679113fd289d944f3d3176833f82f

commit bd6fab0b158679113fd289d944f3d3176833f82f
Author: Alex Coplan <alex.coplan@arm.com>
Date:   Wed May 3 21:53:19 2023 +0100

    config: Fix up unwind_word_mode
    
    We changed this target hook to return scalar_addr_mode but missed
    updating non-AArch64 targets which override the hook.

Diff:
---
 gcc/config/cr16/cr16.c     | 2 +-
 gcc/config/msp430/msp430.c | 2 +-
 gcc/config/pru/pru.c       | 2 +-
 gcc/config/rl78/rl78.c     | 2 +-
 gcc/config/rs6000/rs6000.c | 8 +++++++-
 gcc/config/s390/s390.c     | 2 +-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/gcc/config/cr16/cr16.c b/gcc/config/cr16/cr16.c
index bcbfc8f9424..99e31ff7bb6 100644
--- a/gcc/config/cr16/cr16.c
+++ b/gcc/config/cr16/cr16.c
@@ -2126,7 +2126,7 @@ notice_update_cc (rtx exp)
   return;
 }
 
-static scalar_int_mode
+static scalar_addr_mode
 cr16_unwind_word_mode (void)
 {
   return SImode;
diff --git a/gcc/config/msp430/msp430.c b/gcc/config/msp430/msp430.c
index 051a40d69ed..a9b30d851d5 100644
--- a/gcc/config/msp430/msp430.c
+++ b/gcc/config/msp430/msp430.c
@@ -469,7 +469,7 @@ msp430_addr_space_pointer_mode (addr_space_t addrspace, bool = false)
 #undef  TARGET_UNWIND_WORD_MODE
 #define TARGET_UNWIND_WORD_MODE msp430_unwind_word_mode
 
-static scalar_int_mode
+static scalar_addr_mode
 msp430_unwind_word_mode (void)
 {
   /* This needs to match msp430_init_dwarf_reg_sizes_extra (below).  */
diff --git a/gcc/config/pru/pru.c b/gcc/config/pru/pru.c
index a715f6b07ce..6a44b1e00e4 100644
--- a/gcc/config/pru/pru.c
+++ b/gcc/config/pru/pru.c
@@ -2867,7 +2867,7 @@ pru_set_current_function (tree fndecl)
 /* Implement TARGET_UNWIND_WORD_MODE.
 
    Since PRU is really a 32-bit CPU, the default word_mode is not suitable.  */
-static scalar_int_mode
+static scalar_addr_mode
 pru_unwind_word_mode (void)
 {
   return SImode;
diff --git a/gcc/config/rl78/rl78.c b/gcc/config/rl78/rl78.c
index c44b4be5771..093a7c2bd0a 100644
--- a/gcc/config/rl78/rl78.c
+++ b/gcc/config/rl78/rl78.c
@@ -4760,7 +4760,7 @@ rl78_asm_out_integer (rtx x, unsigned int size, int aligned_p)
 #undef  TARGET_UNWIND_WORD_MODE
 #define TARGET_UNWIND_WORD_MODE rl78_unwind_word_mode
 
-static scalar_int_mode
+static scalar_addr_mode
 rl78_unwind_word_mode (void)
 {
   return HImode;
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index e5daf37da2a..5cf2693c636 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -1679,7 +1679,7 @@ static const struct attribute_spec rs6000_attribute_table[] =
 #undef TARGET_LIBGCC_SHIFT_COUNT_MODE
 #define TARGET_LIBGCC_SHIFT_COUNT_MODE rs6000_abi_word_mode
 #undef TARGET_UNWIND_WORD_MODE
-#define TARGET_UNWIND_WORD_MODE rs6000_abi_word_mode
+#define TARGET_UNWIND_WORD_MODE rs6000_unwind_word_mode
 
 #undef TARGET_OFFLOAD_OPTIONS
 #define TARGET_OFFLOAD_OPTIONS rs6000_offload_options
@@ -16337,6 +16337,12 @@ rs6000_abi_word_mode (void)
   return TARGET_32BIT ? SImode : DImode;
 }
 
+static scalar_addr_mode
+rs6000_unwind_word_mode ()
+{
+  return rs6000_abi_word_mode ();
+}
+
 /* Implement the TARGET_OFFLOAD_OPTIONS hook.  */
 static char *
 rs6000_offload_options (void)
diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c
index a0a8f23dee5..43b43ef1fb4 100644
--- a/gcc/config/s390/s390.c
+++ b/gcc/config/s390/s390.c
@@ -1263,7 +1263,7 @@ s390_libgcc_shift_count_mode (void)
   return TARGET_64BIT ? DImode : SImode;
 }
 
-static scalar_int_mode
+static scalar_addr_mode
 s390_unwind_word_mode (void)
 {
   return TARGET_64BIT ? DImode : SImode;