The branch master has been updated via 1501de3380aa1907a6b27c734a3c30f0962048ed (commit) from 33a62d448c95c01a5bff7be8a00bf95b6a6a6f37 (commit)
- Log ----------------------------------------------------------------- commit 1501de3380aa1907a6b27c734a3c30f0962048ed Author: Richard Levitte <levi...@openssl.org> Date: Tue Aug 24 13:45:27 2021 +0200 Add multilib to the NonStop configuration definitions. Fixes: #16373 Co-authored-by: Randall S. Becker <rsbec...@nexbridge.com> Reviewed-by: Paul Dale <pa...@openssl.org> Reviewed-by: Tomas Mraz <to...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/16398) ----------------------------------------------------------------------- Summary of changes: Configurations/50-nonstop.conf | 12 +++++++++++- NOTES-NONSTOP.md | 8 +++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/Configurations/50-nonstop.conf b/Configurations/50-nonstop.conf index 7524c50016..ed3fe828b3 100644 --- a/Configurations/50-nonstop.conf +++ b/Configurations/50-nonstop.conf @@ -203,12 +203,14 @@ 'nonstop-ilp32', 'nonstop-efloat-x86_64', 'nonstop-model-put' ], + multilib => '-put', }, 'nonstop-nsx_64' => { inherit_from => [ 'nonstop-common', 'nonstop-archenv-x86_64-oss', 'nonstop-lp64-x86_64', 'nonstop-efloat-x86_64' ], + multilib => '64', disable => ['threads'], }, 'nonstop-nsx_64_put' => { @@ -217,13 +219,15 @@ 'nonstop-lp64-x86_64', 'nonstop-efloat-x86_64', 'nonstop-model-put' ], + multilib => '64-put', }, 'nonstop-nsx_spt' => { inherit_from => [ 'nonstop-common', - 'nonstop-archenv-x86_64-oss', + 'nonstop-archenv-x86_64-oss', 'nonstop-ilp32', 'nonstop-efloat-x86_64', 'nonstop-model-spt' ], + multilib => '-spt', }, 'nonstop-nsx_spt_floss' => { inherit_from => [ 'nonstop-common', @@ -232,6 +236,7 @@ 'nonstop-efloat-x86_64', 'nonstop-model-floss', 'nonstop-model-spt'], + multilib => '-spt', }, 'nonstop-nsx_g' => { inherit_from => [ 'nonstop-common', @@ -261,12 +266,14 @@ 'nonstop-ilp32', 'nonstop-efloat-itanium', 'nonstop-model-put' ], + multilib => '-put', }, 'nonstop-nse_64' => { inherit_from => [ 'nonstop-common', 'nonstop-archenv-itanium-oss', 'nonstop-lp64-itanium', 'nonstop-efloat-itanium' ], + multilib => '64', disable => ['threads'], }, 'nonstop-nse_64_put' => { @@ -275,6 +282,7 @@ 'nonstop-lp64-itanium', 'nonstop-efloat-itanium', 'nonstop-model-put' ], + multilib => '64-put', }, 'nonstop-nse_spt' => { inherit_from => [ 'nonstop-common', @@ -282,6 +290,7 @@ 'nonstop-ilp32', 'nonstop-efloat-itanium', 'nonstop-model-spt' ], + multilib => '-spt', }, 'nonstop-nse_spt_floss' => { inherit_from => [ 'nonstop-common', @@ -289,6 +298,7 @@ 'nonstop-ilp32', 'nonstop-efloat-itanium', 'nonstop-model-floss', 'nonstop-model-spt' ], + multilib => '-spt', }, 'nonstop-nse_g' => { inherit_from => [ 'nonstop-common', diff --git a/NOTES-NONSTOP.md b/NOTES-NONSTOP.md index 171f394a9d..586fbabef0 100644 --- a/NOTES-NONSTOP.md +++ b/NOTES-NONSTOP.md @@ -56,8 +56,14 @@ options, and keeping your memory and float options consistent, for example: * For 1.1 `--prefix=/usr/local-ssl1.1 --openssldir=/usr/local-ssl1.1/ssl` * For 1.1 PUT `--prefix=/usr/local-ssl1.1_put --openssldir=/usr/local-ssl1.1_put/ssl` + +As of 3.0, the NonStop configurations use the multilib attribute to distinguish +between different models: + * For 3.0 `--prefix=/usr/local-ssl3.0 --openssldir=/usr/local-ssl3.0/ssl` - * For 3.0 PUT `--prefix=/usr/local-ssl3.0_put --openssldir=/usr/local-ssl3.0_put/ssl` + +The PUT model is placed in `${prefix}/lib-put` for 32-bit models and +`${prefix}/lib64-put` for 64-bit models. Use the `_RLD_LIB_PATH` environment variable in OSS to select the appropriate directory containing `libcrypto.so` and `libssl.so`. In GUARDIAN, use the