diff options
| author | Juergen Christ <jchrist@linux.ibm.com> | 2022-01-26 11:48:44 +0100 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2022-11-21 10:49:51 +0100 |
| commit | e3bcb12b6e9a07d7c65f979c99d36df99583bc3b (patch) | |
| tree | 1021e8f491bc45126855cee5f4e1a985e3e8a7f4 /crypto/s390xcap.c | |
| parent | 2535075bf0bd1a599a7f483d06b3ef019104ee7c (diff) | |
| download | openssl-e3bcb12b6e9a07d7c65f979c99d36df99583bc3b.zip openssl-e3bcb12b6e9a07d7c65f979c99d36df99583bc3b.tar.gz openssl-e3bcb12b6e9a07d7c65f979c99d36df99583bc3b.tar.bz2 | |
s390: Add new machine generation
Allow to specify "z16" as machine generation in environment variable
OPENSSL_s390xcap. It is an alias for "z15".
Signed-off-by: Juergen Christ <jchrist@linux.ibm.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/18054)
(cherry picked from commit 42f111ad41141e2ecd67f0a6954625a5ad01890b)
Diffstat (limited to 'crypto/s390xcap.c')
| -rw-r--r-- | crypto/s390xcap.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/crypto/s390xcap.c b/crypto/s390xcap.c index ea38ff8..59f0f3e 100644 --- a/crypto/s390xcap.c +++ b/crypto/s390xcap.c @@ -670,6 +670,12 @@ static int parse_env(struct OPENSSL_s390xcap_st *cap) 0ULL}, }; + /*- + * z16 (2022) - z/Architecture POP + * Implements MSA and MSA1-9 (same as z15). + */ + static const struct OPENSSL_s390xcap_st z16 = z15; + char *tok_begin, *tok_end, *buff, tok[S390X_STFLE_MAX][LEN + 1]; int rc, off, i, n; @@ -724,6 +730,7 @@ static int parse_env(struct OPENSSL_s390xcap_st *cap) else if TOK_CPU(z13) else if TOK_CPU(z14) else if TOK_CPU(z15) + else if TOK_CPU(z16) /* whitespace(ignored) or invalid tokens */ else { |