Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/crypto/external/bsd/openssl/dist/crypto openssl: Omit needle...



details:   https://anonhg.NetBSD.org/src/rev/80af8fb409ed
branches:  trunk
changeset: 374056:80af8fb409ed
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Mar 29 10:21:27 2023 +0000

description:
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.

diffstat:

 crypto/external/bsd/openssl/dist/crypto/threads_pthread.c |  3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diffs (19 lines):

diff -r 31fea65664b5 -r 80af8fb409ed crypto/external/bsd/openssl/dist/crypto/threads_pthread.c
--- a/crypto/external/bsd/openssl/dist/crypto/threads_pthread.c Wed Mar 29 10:19:39 2023 +0000
+++ b/crypto/external/bsd/openssl/dist/crypto/threads_pthread.c Wed Mar 29 10:21:27 2023 +0000
@@ -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;
 



Home | Main Index | Thread Index | Old Index