Commit bd6bb9d3f7 for openssl.org
commit bd6bb9d3f7326999587243d2dd2682c51024bee9
Author: Eugene Syromiatnikov <esyr@openssl.org>
Date: Mon Jun 15 14:57:38 2026 +0200
Configurations/50-nonstop.conf: remove 'atexit' from disable maps
Since there is no atexit() handler installation after [1],
the associated configuratoin option (that was initially introduced
to support the configurations in question[2]) has no effect
and can be removed from NonStop configurations.
[1] https://github.com/openssl/openssl/pull/29385
[2] 99fb31c167e3 "Add atexit configuration option to using atexit() in libcrypto at build-time."
Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Nikola Pajkovsky <nikolap@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Norbert Pocs <norbertp@openssl.org>
MergeDate: Thu Jun 18 12:20:36 2026
(Merged from https://github.com/openssl/openssl/pull/30767)
diff --git a/Configurations/50-nonstop.conf b/Configurations/50-nonstop.conf
index 24ab6009fc..633d5ed6a0 100644
--- a/Configurations/50-nonstop.conf
+++ b/Configurations/50-nonstop.conf
@@ -22,7 +22,6 @@
ex_libs => add('-lrld'),
enable => ['egd'],
# Not currently inherited
- disable => ['atexit'],
dso_scheme => 'DLFCN',
sys_id => 'TANDEM',
},
@@ -191,7 +190,7 @@
'nonstop-archenv-x86_64-oss',
'nonstop-ilp32',
'nonstop-efloat-x86_64' ],
- disable => ['threads','atexit'],
+ disable => ['threads'],
},
'nonstop-nsx_put' => {
inherit_from => [ 'nonstop-common',
@@ -201,7 +200,6 @@
'nonstop-model-put' ],
multilib => '-put',
multibin => '-put',
- disable => ['atexit'],
},
'nonstop-nsx_64' => {
inherit_from => [ 'nonstop-common',
@@ -210,7 +208,7 @@
'nonstop-efloat-x86_64' ],
multilib => '64',
multibin => '64',
- disable => ['threads','atexit'],
+ disable => ['threads'],
},
'nonstop-nsx_64_put' => {
inherit_from => [ 'nonstop-common',
@@ -220,7 +218,6 @@
'nonstop-model-put' ],
multilib => '64-put',
multibin => '64-put',
- disable => ['atexit'],
},
'nonstop-nsx_64_klt' => {
inherit_from => [ 'nonstop-common',
@@ -230,19 +227,18 @@
'nonstop-model-klt' ],
multilib => '64-klt',
multibin => '64-klt',
- disable => ['atexit'],
},
'nonstop-nsx_g' => {
inherit_from => [ 'nonstop-common',
'nonstop-archenv-x86_64-guardian',
'nonstop-ilp32', 'nonstop-nfloat-x86_64' ],
- disable => ['threads','atexit'],
+ disable => ['threads'],
},
'nonstop-nsx_g_tandem' => {
inherit_from => [ 'nonstop-common',
'nonstop-archenv-x86_64-guardian',
'nonstop-ilp32', 'nonstop-tfloat-x86_64' ],
- disable => ['threads','atexit'],
+ disable => ['threads'],
},
'nonstop-nsv' => {
inherit_from => [ 'nonstop-nsx' ],
@@ -252,7 +248,7 @@
'nonstop-archenv-itanium-oss',
'nonstop-ilp32',
'nonstop-efloat-itanium' ],
- disable => ['threads','atexit'],
+ disable => ['threads'],
},
'nonstop-nse_put' => {
inherit_from => [ 'nonstop-common',
@@ -262,7 +258,6 @@
'nonstop-model-put' ],
multilib => '-put',
multibin => '-put',
- disable => ['atexit'],
},
'nonstop-nse_64' => {
inherit_from => [ 'nonstop-common',
@@ -271,7 +266,7 @@
'nonstop-efloat-itanium' ],
multilib => '64',
multibin => '64',
- disable => ['threads','atexit'],
+ disable => ['threads'],
},
'nonstop-nse_64_put' => {
inherit_from => [ 'nonstop-common',
@@ -281,5 +276,4 @@
'nonstop-model-put' ],
multilib => '64-put',
multibin => '64-put',
- disable => ['atexit'],
},