From: Bernd Edlinger <bernd.edlinger@hotmail.de>
Date: Fri, 19 Sep 2025 06:52:24 +0000 (+0200)
Subject: Do not use RW mutexes on RISC-V arch
X-Git-Tag: openssl-3.6.0~31
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3c28b5938068aed0cf7d3f0a489a23dcc19fd440;p=thirdparty%2Fopenssl.git

Do not use RW mutexes on RISC-V arch

For unknown reasons using RW mutexes on RISC-V arch
seems to be broken, at least with glibc.

Fixes #28550

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <ppzgs1@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/28634)

(cherry picked from commit bea53924ce729353df41129c58bd3349df7d7a82)
---

diff --git a/crypto/threads_pthread.c b/crypto/threads_pthread.c
index 4dcdccf7bcb..9d9958e68fe 100644
--- a/crypto/threads_pthread.c
+++ b/crypto/threads_pthread.c
@@ -92,8 +92,10 @@ __tsan_mutex_post_lock((x), 0, 0)
 /*
  * The Non-Stop KLT thread model currently seems broken in its rwlock
  * implementation
+ * Likewise is there a problem with the glibc implementation on riscv.
  */
-# if defined(PTHREAD_RWLOCK_INITIALIZER) && !defined(_KLT_MODEL_)
+# if defined(PTHREAD_RWLOCK_INITIALIZER) && !defined(_KLT_MODEL_) \
+                                         && !defined(__riscv)
 #  define USE_RWLOCK
 # endif