From 41c3c71382f31a5a913bd09a74295d101d837055 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=8Cestm=C3=ADr=20Kalina?= Date: Fri, 17 Mar 2023 17:32:26 +0100 Subject: [PATCH] thread: remove remnants of ossl_crypto_mem_barrier MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Tomas Mraz Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/20538) --- crypto/thread/arch/thread_none.c | 4 ---- crypto/thread/arch/thread_win.c | 5 ----- include/internal/thread_arch.h | 2 -- 3 files changed, 11 deletions(-) diff --git a/crypto/thread/arch/thread_none.c b/crypto/thread/arch/thread_none.c index 431a9b6a35..c9c047c8e7 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 b4c0500936..5bef48458e 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 171ea2286b..bf00000606 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 */