From: Čestmír Kalina <ckalina@redhat.com>
Date: Fri, 17 Mar 2023 16:32:26 +0000 (+0100)
Subject: thread: remove remnants of ossl_crypto_mem_barrier
X-Git-Tag: openssl-3.2.0-alpha1~1125
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41c3c71382f31a5a913bd09a74295d101d837055;p=thirdparty%2Fopenssl.git

thread: remove remnants of ossl_crypto_mem_barrier

Commit ac21c1780a63a8d9a3a6217eb52fe0d188fa7655 VMS knows POSIX threads too!
removed ossl_crypto_mem_barrier for POSIX systems.

Remove it for Win32 and other architectures as well.

Resolves issue #19506 Unable to build under bcc32c environment (Embarcadero
clang compiler).

Signed-off-by: Čestmír Kalina <ckalina@redhat.com>

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20538)
---

diff --git a/crypto/thread/arch/thread_none.c b/crypto/thread/arch/thread_none.c
index 431a9b6a352..c9c047c8e78 100644
--- a/crypto/thread/arch/thread_none.c
+++ b/crypto/thread/arch/thread_none.c
@@ -70,8 +70,4 @@ void ossl_crypto_condvar_free(CRYPTO_CONDVAR **cv)
 {
 }
 
-void ossl_crypto_mem_barrier(void)
-{
-}
-
 #endif
diff --git a/crypto/thread/arch/thread_win.c b/crypto/thread/arch/thread_win.c
index b4c05009361..5bef48458e1 100644
--- a/crypto/thread/arch/thread_win.c
+++ b/crypto/thread/arch/thread_win.c
@@ -179,9 +179,4 @@ void ossl_crypto_condvar_free(CRYPTO_CONDVAR **cv)
     *cv_p = NULL;
 }
 
-void ossl_crypto_mem_barrier(void)
-{
-    MemoryBarrier();
-}
-
 #endif
diff --git a/include/internal/thread_arch.h b/include/internal/thread_arch.h
index 171ea2286b1..bf000006061 100644
--- a/include/internal/thread_arch.h
+++ b/include/internal/thread_arch.h
@@ -117,6 +117,4 @@ int ossl_crypto_thread_native_exit(void);
 int ossl_crypto_thread_native_is_self(CRYPTO_THREAD *thread);
 int ossl_crypto_thread_native_clean(CRYPTO_THREAD *thread);
 
-void ossl_crypto_mem_barrier(void);
-
 #endif /* OSSL_INTERNAL_THREAD_ARCH_H */