From: Stefan Schulze Frielinghaus <stefansf@linux.ibm.com>
To: krebbel@linux.ibm.com, gcc-patches@gcc.gnu.org
Cc: Stefan Schulze Frielinghaus <stefansf@linux.ibm.com>
Subject: [PATCH] IBM zSystems: Fix TARGET_D_CPU_VERSIONS
Date: Fri, 13 Jan 2023 18:54:29 +0100 [thread overview]
Message-ID: <20230113175428.1771219-1-stefansf@linux.ibm.com> (raw)
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.
Bootstrapped and regtested on IBM zSystems. Ok for mainline?
gcc/ChangeLog:
* config/s390/s390-d.cc (s390_d_target_versions): Fix detection
of CPU version.
---
gcc/config/s390/s390-d.cc | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/gcc/config/s390/s390-d.cc b/gcc/config/s390/s390-d.cc
index d10b45f7de4..ced7f49a988 100644
--- a/gcc/config/s390/s390-d.cc
+++ b/gcc/config/s390/s390-d.cc
@@ -30,10 +30,8 @@ along with GCC; see the file COPYING3. If not see
void
s390_d_target_versions (void)
{
- if (TARGET_ZARCH)
+ if (TARGET_64BIT)
d_add_builtin_version ("SystemZ");
- else if (TARGET_64BIT)
- d_add_builtin_version ("S390X");
else
d_add_builtin_version ("S390");
--
2.39.0
next reply other threads:[~2023-01-13 17:56 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-13 17:54 Stefan Schulze Frielinghaus [this message]
2023-01-23 13:21 ` Iain Buclaw
2023-01-23 18:45 ` Stefan Schulze Frielinghaus
2023-01-24 8:47 ` [PATCH v2] " Stefan Schulze Frielinghaus
2023-01-24 11:05 ` Iain Buclaw
2023-01-24 16:04 ` Andreas Krebbel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230113175428.1771219-1-stefansf@linux.ibm.com \
--to=stefansf@linux.ibm.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=krebbel@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).