Add multilib to the NonStop configuration definitions.

Fixes: #16373
Co-authored-by: Randall S. Becker <rsbecker@nexbridge.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16398)

diff --git a/Configurations/50-nonstop.conf b/Configurations/50-nonstop.conf
index 7524c5001622a37c45359fe6a5fd6628cb62d249..ed3fe828b318d0a90072573154cf3f3a2fc7b0e5 100644 (file)
--- 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 171f394a9df9cb0161f001d2e9d018723ca55bec..586fbabef00f0401b6ce30833ec150e5f514c57c 100644 (file)
--- 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