diff options
| author | Randall S. Becker <rsbecker@nexbridge.com> | 2020-10-29 10:37:05 -0500 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-11-01 06:27:09 +0100 |
| commit | 769302a68bad66a29cc9b8e765bc2afb102172b1 (patch) | |
| tree | d48e31fd9bb62c05d13f30f69e916677a441830f /Configurations | |
| parent | 08312719bafc93d9d93ed8b23931f2d18fc767d7 (diff) | |
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)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/50-nonstop.conf | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/Configurations/50-nonstop.conf b/Configurations/50-nonstop.conf index 37ccbb40a5..5792674788 100644 --- a/Configurations/50-nonstop.conf +++ b/Configurations/50-nonstop.conf @@ -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' => { |