diff options
| author | Randall S. Becker <randall.becker@nexbridge.ca> | 2023-11-10 21:24:22 +0100 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2023-11-14 11:05:57 +0100 |
| commit | 0ddcb55b602800d4a1bcf1e76ca32939ed4fdaa4 (patch) | |
| tree | a6a49d6b2c0241b066157fd97d6d577877a14972 /Configurations/50-nonstop.conf | |
| parent | Enable AES and SHA3 optimisations on Apple Silicon M3-based macOS systems (diff) | |
| download | openssl-0ddcb55b602800d4a1bcf1e76ca32939ed4fdaa4.tar.xz openssl-0ddcb55b602800d4a1bcf1e76ca32939ed4fdaa4.zip | |
Correct 50-nonstop.conf to support QUIC tests under SPT threading models.
This fix also separates the FLOSS from SPT configurations which should not
have been conflated in the 3.0 series.
Related-to: #22588
Signed-off-by: Randall S. Becker <randall.becker@nexbridge.ca>
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22697)
(cherry picked from commit e3c38759608bb48d70ddfdaa1c88bcd86069952d)
Diffstat (limited to '')
| -rw-r--r-- | Configurations/50-nonstop.conf | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Configurations/50-nonstop.conf b/Configurations/50-nonstop.conf index 53081576cc..827a13b4ee 100644 --- a/Configurations/50-nonstop.conf +++ b/Configurations/50-nonstop.conf @@ -172,8 +172,10 @@ }, 'nonstop-model-spt' => { template => 1, + cflags => add('-Wnowarn=140'), defines => ['_SPT_MODEL_', - '_REENTRANT', '_ENABLE_FLOSS_THREADS'], + 'SPT_THREAD_AWARE_NONBLOCK', + '_REENTRANT'], ex_libs => '-lspt', }, @@ -182,7 +184,7 @@ # disable threads. 'nonstop-model-floss' => { template => 1, - defines => ['OPENSSL_TANDEM_FLOSS'], + defines => ['OPENSSL_TANDEM_FLOSS', '_ENABLE_FLOSS_THREADS'], includes => ['/usr/local/include'], ex_libs => '-lfloss', }, |