From: Neil Horman <nhorman@openssl.org>
Date: Mon, 29 Jul 2024 19:17:07 +0000 (-0400)
Subject: disable rwlocks on nonstop klt model
X-Git-Tag: openssl-3.2.6~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d0307fefac13751e881568c32c1cbd78a20f64f4;p=thirdparty%2Fopenssl.git

disable rwlocks on nonstop klt model

It appears nonstops new threading model defines some level of rwlock
pthread api, but its not working properly.  Disable rwlocks for
_KLT_MODEL_ for now

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Paul Dale <ppzgs1@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/28635)

(cherry picked from commit d8ecbb37dcfcee24c4f6c8e46e1e0caefb940187)
---

diff --git a/crypto/threads_pthread.c b/crypto/threads_pthread.c
index 349b1c0f1a4..8d85120eced 100644
--- a/crypto/threads_pthread.c
+++ b/crypto/threads_pthread.c
@@ -38,7 +38,11 @@
 
 # include <assert.h>
 
-# ifdef PTHREAD_RWLOCK_INITIALIZER
+/*
+ * The Non-Stop KLT thread model currently seems broken in its rwlock
+ * implementation
+ */
+# if defined(PTHREAD_RWLOCK_INITIALIZER) && !defined(_KLT_MODEL_)
 #  define USE_RWLOCK
 # endif