diff options
| author | Juergen Christ <jchrist@linux.ibm.com> | 2022-01-26 11:48:44 +0100 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2022-04-12 13:04:57 +0200 |
| commit | 42f111ad41141e2ecd67f0a6954625a5ad01890b (patch) | |
| tree | e1fdaecf60de230b2939eb179692f503bd24b215 /crypto | |
| parent | b2b8d1883a3b7e64006b0b4ada0cbcf3eb6dba1a (diff) | |
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)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/s390xcap.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/crypto/s390xcap.c b/crypto/s390xcap.c index d433df98eb..59f0f3ef45 100644 --- a/crypto/s390xcap.c +++ b/crypto/s390xcap.c @@ -1,5 +1,5 @@ /* - * Copyright 2010-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2010-2022 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -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 { |