diff options
| author | Randall S. Becker <randall.becker@nexbridge.ca> | 2023-11-22 21:45:24 +0100 |
|---|---|---|
| committer | Neil Horman <nhorman@openssl.org> | 2023-12-12 16:39:54 +0100 |
| commit | 5cd17920167a8b4f7a81722a1ed3b514115702de (patch) | |
| tree | dcbc06b2038ec5b3bd22a3a2681d13d7c9aec222 /Configurations | |
| parent | Fix a possible memory leak in do_othername (diff) | |
| download | openssl-5cd17920167a8b4f7a81722a1ed3b514115702de.tar.xz openssl-5cd17920167a8b4f7a81722a1ed3b514115702de.zip | |
Deprecate SPT threading support on NonStop.
This fix removes explicit support for the SPT threading model in configurations.
This also reverts commit f63e1b48ac893dd6110452e70ed08f191547cd89 that were
required for SPT but broke other models.
Fixes: #22798
Signed-off-by: Randall S. Becker <randall.becker@nexbridge.ca>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Hugo Landau <hlandau@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22807)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/50-nonstop.conf | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/Configurations/50-nonstop.conf b/Configurations/50-nonstop.conf index 827a13b4ee..873e398169 100644 --- a/Configurations/50-nonstop.conf +++ b/Configurations/50-nonstop.conf @@ -170,24 +170,6 @@ '_REENTRANT', '_THREAD_SUPPORT_FUNCTIONS'], ex_libs => '-lput', }, - 'nonstop-model-spt' => { - template => 1, - cflags => add('-Wnowarn=140'), - defines => ['_SPT_MODEL_', - 'SPT_THREAD_AWARE_NONBLOCK', - '_REENTRANT'], - ex_libs => '-lspt', - }, - - # Additional floss model that can be combined with any of the other models. - # If used without any of the other models, the entry that does so must - # disable threads. - 'nonstop-model-floss' => { - template => 1, - defines => ['OPENSSL_TANDEM_FLOSS', '_ENABLE_FLOSS_THREADS'], - includes => ['/usr/local/include'], - ex_libs => '-lfloss', - }, ###################################################################### # Now for the entries themselves, let's combine things! @@ -225,25 +207,6 @@ multilib => '64-put', multibin => '64-put', }, - 'nonstop-nsx_spt' => { - inherit_from => [ 'nonstop-common', - 'nonstop-archenv-x86_64-oss', - 'nonstop-ilp32', - 'nonstop-efloat-x86_64', - 'nonstop-model-spt' ], - multilib => '-spt', - multibin => '-spt', - }, - 'nonstop-nsx_spt_floss' => { - inherit_from => [ 'nonstop-common', - 'nonstop-archenv-x86_64-oss', - 'nonstop-ilp32', - 'nonstop-efloat-x86_64', - 'nonstop-model-floss', - 'nonstop-model-spt'], - multilib => '-spt', - multibin => '-spt', - }, 'nonstop-nsx_g' => { inherit_from => [ 'nonstop-common', 'nonstop-archenv-x86_64-guardian', @@ -293,24 +256,6 @@ multilib => '64-put', multibin => '64-put', }, - 'nonstop-nse_spt' => { - inherit_from => [ 'nonstop-common', - 'nonstop-archenv-itanium-oss', - 'nonstop-ilp32', - 'nonstop-efloat-itanium', - 'nonstop-model-spt' ], - multilib => '-spt', - multibin => '-spt', - }, - 'nonstop-nse_spt_floss' => { - inherit_from => [ 'nonstop-common', - 'nonstop-archenv-itanium-oss', - 'nonstop-ilp32', - 'nonstop-efloat-itanium', - 'nonstop-model-floss', 'nonstop-model-spt' ], - multilib => '-spt', - multibin => '-spt', - }, 'nonstop-nse_g' => { inherit_from => [ 'nonstop-common', 'nonstop-archenv-itanium-guardian', |