Remove FLOSS from all OSS builds on NonStop except for SPT threading.

The Standard POSIX Threads (SPT) implementation hangs in some test cases
if FLOSS is not used.

CLA: Permission is granted by the author to the OpenSSL team to use
these modifications.

Fixes #13277

Signed-off-by: Randall S. Becker <rsbecker@nexbridge.com>

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13279)
This commit is contained in:
Randall S. Becker 2020-10-29 10:37:05 -05:00 committed by Richard Levitte
parent 08312719ba
commit 769302a68b

View File

@ -194,8 +194,7 @@
inherit_from => [ 'nonstop-common',
'nonstop-archenv-x86_64-oss',
'nonstop-ilp32',
'nonstop-efloat-x86_64',
'nonstop-model-floss' ],
'nonstop-efloat-x86_64' ],
disable => ['threads'],
},
'nonstop-nsx_put' => {
@ -209,8 +208,7 @@
inherit_from => [ 'nonstop-common',
'nonstop-archenv-x86_64-oss',
'nonstop-lp64-x86_64',
'nonstop-efloat-x86_64',
'nonstop-model-floss' ],
'nonstop-efloat-x86_64' ],
disable => ['threads'],
},
'nonstop-nsx_64_put' => {
@ -232,7 +230,8 @@
'nonstop-archenv-x86_64-oss',
'nonstop-ilp32',
'nonstop-efloat-x86_64',
'nonstop-model-floss', 'nonstop-model-spt'],
'nonstop-model-floss',
'nonstop-model-spt'],
},
'nonstop-nsx_g' => {
inherit_from => [ 'nonstop-common',
@ -253,8 +252,7 @@
inherit_from => [ 'nonstop-common',
'nonstop-archenv-itanium-oss',
'nonstop-ilp32',
'nonstop-efloat-itanium',
'nonstop-model-floss' ],
'nonstop-efloat-itanium' ],
disable => ['threads'],
},
'nonstop-nse_put' => {
@ -268,8 +266,7 @@
inherit_from => [ 'nonstop-common',
'nonstop-archenv-itanium-oss',
'nonstop-lp64-itanium',
'nonstop-efloat-itanium',
'nonstop-model-floss' ],
'nonstop-efloat-itanium' ],
disable => ['threads'],
},
'nonstop-nse_64_put' => {