Changeset 94102 in vbox

Timestamp:

Mar 6, 2022 9:17:18 PM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

150349

Message:

libs/openssl-3.0.1: More build fixes for the thread support, bugref:10128

Location:

trunk/src/libs/openssl-3.0.1

Files:

• crypto/threads_iprt.c (modified) (1 diff)
• include/internal/thread_once.h (modified) (1 diff)

trunk/src/libs/openssl-3.0.1/crypto/threads_iprt.c

@@ -139 +139 @@
 }
 
+int CRYPTO_atomic_or(uint64_t *val, uint64_t op, uint64_t *ret,
+                     CRYPTO_RWLOCK *lock)
+{
+    uint64_t u64RetOld = ASMAtomicUoReadU64(val);
+    uint64_t u64New;
+    do
+        u64New = u64RetOld | op;
+    while (!ASMAtomicCmpXchgExU64(val, u64New, u64RetOld, &u64RetOld));
+    *ret = u64RetOld;
+
+    return 1;
+}
+
+int CRYPTO_atomic_load(uint64_t *val, uint64_t *ret, CRYPTO_RWLOCK *lock)
+{
+    *ret = ASMAtomicReadU64((uint64_t volatile *)val);
+    return 1;
+}
+
 #endif
 

trunk/src/libs/openssl-3.0.1/include/internal/thread_once.h

@@ -124 +124 @@
  * these errors back (here) and force (in RUN_ONCE()).
  */
-#  undef DEFINE_RUN_ONCE              /* currently unused */
-#  undef DECLARE_RUN_ONCE             /* currently unused */
+#  define DEFINE_RUN_ONCE(init)                                       \
+    static int init(void);                                            \
+    int init##_ossl_ret_ = 0;                                         \
+    DECLCALLBACK(int) init##_ossl_(void *pvUser)               \
+    {                                                                 \
+        init##_ossl_ret_ = init();                                    \
+        return init##_ossl_ret_ ? VINF_SUCCESS : VERR_INTERNAL_ERROR; \
+    }                                                                 \
+    static int init(void)
+
+#  define DECLARE_RUN_ONCE(init)                \
+    extern int init##_ossl_ret_;                \
+    extern DECLCALLBACK(int) init##_ossl_(void *pvUser);
+
 #  undef DEFINE_RUN_ONCE_STATIC_ALT  /* currently unused */