[gcc r13-5330] IBM zSystems: Fix TARGET_D_CPU_VERSIONS

[gcc r13-5330] IBM zSystems: Fix TARGET_D_CPU_VERSIONS

[Stefan Schulze Frielinghaus]

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

commit r13-5330-ga4e725a10baf02c004c982772e22905fe99c1670
Author: Stefan Schulze Frielinghaus <stefansf@linux.ibm.com>
Date:   Tue Jan 24 20:23:07 2023 +0100

    IBM zSystems: Fix TARGET_D_CPU_VERSIONS
    
    In the context of D the interpretation of S390, S390X, and SystemZ is a
    bit fuzzy.  The wording S390X was wrongly deprecated in favour of
    SystemZ by commit
    https://github.com/dlang/dlang.org/commit/3b50a4c3faf01c32234d0ef8be5f82915a61c23f
    Thus, SystemZ is used for 64-bit targets, now, and S390 for 31-bit
    targets.  However, in TARGET_D_CPU_VERSIONS depending on TARGET_ZARCH we
    set the CPU version to SystemZ.  This is also the case if compiled for
    31-bit targets leading to the following error:
    
    libphobos/libdruntime/core/sys/posix/sys/stat.d:967:13: error: static assert:  '96u == 144u' is false
      967 |             static assert(stat_t.sizeof == 144);
          |             ^
    
    Thus in order to keep this patch simple I went for keeping SystemZ for
    64-bit targets and S390, as usual, for 31-bit targets and dropped the
    distinction between ESA and z/Architecture.
    
    gcc/ChangeLog:
    
            * config/s390/s390-d.cc (s390_d_target_versions): Fix detection
            of CPU version.

Diff:
---
 gcc/config/s390/s390-d.cc | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gcc/config/s390/s390-d.cc b/gcc/config/s390/s390-d.cc
index d10b45f7de4..6e9c80f7283 100644
--- a/gcc/config/s390/s390-d.cc
+++ b/gcc/config/s390/s390-d.cc
@@ -30,10 +30,11 @@ along with GCC; see the file COPYING3.  If not see
 void
 s390_d_target_versions (void)
 {
-  if (TARGET_ZARCH)
-    d_add_builtin_version ("SystemZ");
-  else if (TARGET_64BIT)
-    d_add_builtin_version ("S390X");
+  if (TARGET_64BIT)
+    {
+      d_add_builtin_version ("S390X");
+      d_add_builtin_version ("SystemZ");
+    }
   else
     d_add_builtin_version ("S390");