feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Make rwlock an explicit enable option

Browse Source
This commit is contained in:
Juliusz Sosinowicz
2023-02-14 13:55:59 +01:00
parent 2fe34facba
commit bcfd5fb66b
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
configure.ac
View File

@ -1109,7 +1109,6 @@ AS_IF([ test "x$ENABLED_SINGLETHREADED" = "xno" ],[
AS_CASE([$PTHREAD_CFLAGS],[-Qunused-arguments*],[PTHREAD_CFLAGS="-Xcompiler $PTHREAD_CFLAGS"]) AS_CASE([$PTHREAD_CFLAGS],[-Qunused-arguments*],[PTHREAD_CFLAGS="-Xcompiler $PTHREAD_CFLAGS"])
AM_CFLAGS="$AM_CFLAGS $PTHREAD_CFLAGS" AM_CFLAGS="$AM_CFLAGS $PTHREAD_CFLAGS"
LIBS="$LIBS $PTHREAD_LIBS" LIBS="$LIBS $PTHREAD_LIBS"
AC_CHECK_TYPES([pthread_rwlock_t])
],[ ],[
ENABLED_SINGLETHREADED=yes 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" ]) 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 # wolfCrypt Only Build
AC_ARG_ENABLE([cryptonly], AC_ARG_ENABLE([cryptonly],
[AS_HELP_STRING([--enable-cryptonly],[Enable wolfCrypt Only build (default: disabled)])], [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 " * PSA: $ENABLED_PSA"
echo " * System CA certs: $ENABLED_SYS_CA_CERTS" echo " * System CA certs: $ENABLED_SYS_CA_CERTS"
echo " * ERR Queues per Thread: $ENABLED_ERRORQUEUEPERTHREAD" echo " * ERR Queues per Thread: $ENABLED_ERRORQUEUEPERTHREAD"
echo " * rwlock: $ENABLED_RWLOCK"
echo "" echo ""
echo "---" echo "---"

4
wolfssl/wolfcrypt/wc_port.h
View File

@ -175,10 +175,6 @@
/* definitions are in linuxkm/linuxkm_wc_port.h */ /* definitions are in linuxkm/linuxkm_wc_port.h */
#else #else
#define WOLFSSL_PTHREADS #define WOLFSSL_PTHREADS
#ifdef HAVE_PTHREAD_RWLOCK_T
#undef WOLFSSL_USE_RWLOCK
#define WOLFSSL_USE_RWLOCK
#endif
#include <pthread.h> #include <pthread.h>
#endif #endif
#endif #endif