Module Name: src
Committed By: riastradh
Date: Wed Mar 29 10:21:27 UTC 2023
Modified Files:
src/crypto/external/bsd/openssl/dist/crypto: threads_pthread.c
Log Message:
openssl: Omit needless #ifdef notyet around __atomic_is_lock_free.
At the time this was done, our gcc version did not have it, but now
it does, so let's reduce the local diff.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
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.4 src/crypto/external/bsd/openssl/dist/crypto/threads_pthread.c:1.5
--- src/crypto/external/bsd/openssl/dist/crypto/threads_pthread.c:1.4 Thu Jan 23 02:54:53 2020
+++ src/crypto/external/bsd/openssl/dist/crypto/threads_pthread.c Wed Mar 29 10:21:27 2023
@@ -162,15 +162,12 @@ 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;
