Module Name: src
Committed By: christos
Date: Sat Feb 24 21:47:34 UTC 2018
Modified Files:
src/crypto/external/bsd/openssl/dist/crypto: threads_pthread.c
Log Message:
we don't yet have __atomic_is_lock_free
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/openssl/dist/crypto/threads_pthread.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/dist/crypto/threads_pthread.c
diff -u src/crypto/external/bsd/openssl/dist/crypto/threads_pthread.c:1.1.1.1 src/crypto/external/bsd/openssl/dist/crypto/threads_pthread.c:1.2
--- src/crypto/external/bsd/openssl/dist/crypto/threads_pthread.c:1.1.1.1 Thu Feb 8 15:56:48 2018
+++ src/crypto/external/bsd/openssl/dist/crypto/threads_pthread.c Sat Feb 24 16:47:34 2018
@@ -150,12 +150,15 @@ int CRYPTO_THREAD_compare_id(CRYPTO_THRE
int CRYPTO_atomic_add(int *val, int amount, int *ret, CRYPTO_RWLOCK *lock)
{
+#ifdef notyet
+// We don't provide yet __atomic_is_lock_free
# if defined(__GNUC__) && defined(__ATOMIC_ACQ_REL)
if (__atomic_is_lock_free(sizeof(*val), val)) {
*ret = __atomic_add_fetch(val, amount, __ATOMIC_ACQ_REL);
return 1;
}
# endif
+#endif
if (!CRYPTO_THREAD_write_lock(lock))
return 0;
