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.4.0-alpha1~256
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7408d58714e3235f58c4d7eba42207c83b55e6bd;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>
(Merged from https://github.com/openssl/openssl/pull/24969)
---

diff --git a/crypto/threads_pthread.c b/crypto/threads_pthread.c
index 86943ba4336..b44559e373a 100644
--- a/crypto/threads_pthread.c
+++ b/crypto/threads_pthread.c
@@ -59,7 +59,11 @@ __tsan_mutex_post_lock((x), 0, 0)
 
 # 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