From bcfd5fb66ba183a8773d1ccb32ac0fd0f159ecc9 Mon Sep 17 00:00:00 2001
From: Juliusz Sosinowicz <juliusz@wolfssl.com>
Date: Tue, 14 Feb 2023 13:55:59 +0100
Subject: [PATCH] Make rwlock an explicit enable option

---
 configure.ac                | 13 ++++++++++++-
 wolfssl/wolfcrypt/wc_port.h |  4 ----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1f46cca8f..1fbb25a43 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1109,7 +1109,6 @@ AS_IF([ test "x$ENABLED_SINGLETHREADED" = "xno" ],[
                    AS_CASE([$PTHREAD_CFLAGS],[-Qunused-arguments*],[PTHREAD_CFLAGS="-Xcompiler $PTHREAD_CFLAGS"])
                    AM_CFLAGS="$AM_CFLAGS $PTHREAD_CFLAGS"
                    LIBS="$LIBS $PTHREAD_LIBS"
-                   AC_CHECK_TYPES([pthread_rwlock_t])
                    ],[
                       ENABLED_SINGLETHREADED=yes
                       ])
@@ -1117,6 +1116,17 @@ AS_IF([ test "x$ENABLED_SINGLETHREADED" = "xno" ],[
 
 AS_IF([ test "x$ENABLED_SINGLETHREADED" = "xyes" ],[ AM_CFLAGS="$AM_CFLAGS -DSINGLE_THREADED" ])
 
+# Enable rwlock
+AC_ARG_ENABLE([rwlock],
+    [AS_HELP_STRING([--enable-rwlock],[Enable use of rwlock (default: disabled)])],
+    [ENABLED_RWLOCK=$enableval],
+    [ENABLED_RWLOCK=no])
+
+if test "$ENABLED_RWLOCK" = "yes"
+then
+    AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_USE_RWLOCK"
+fi
+
 # wolfCrypt Only Build
 AC_ARG_ENABLE([cryptonly],
     [AS_HELP_STRING([--enable-cryptonly],[Enable wolfCrypt Only build (default: disabled)])],
@@ -8952,6 +8962,7 @@ echo "   * Maxim Integrated MAXQ10XX:  $ENABLED_MAXQ10XX"
 echo "   * PSA:                        $ENABLED_PSA"
 echo "   * System CA certs:            $ENABLED_SYS_CA_CERTS"
 echo "   * ERR Queues per Thread:      $ENABLED_ERRORQUEUEPERTHREAD"
+echo "   * rwlock:                     $ENABLED_RWLOCK"
 echo ""
 echo "---"
 
diff --git a/wolfssl/wolfcrypt/wc_port.h b/wolfssl/wolfcrypt/wc_port.h
index 5036590f2..7e5f1a4d6 100644
--- a/wolfssl/wolfcrypt/wc_port.h
+++ b/wolfssl/wolfcrypt/wc_port.h
@@ -175,10 +175,6 @@
                 /* definitions are in linuxkm/linuxkm_wc_port.h */
             #else
                 #define WOLFSSL_PTHREADS
-                #ifdef HAVE_PTHREAD_RWLOCK_T
-                    #undef WOLFSSL_USE_RWLOCK
-                    #define WOLFSSL_USE_RWLOCK
-                #endif
                 #include <pthread.h>
             #endif
         #endif