From acb8dd1183acb4ed4b9b967004a0499cf44de45c Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Mon, 1 Apr 2019 12:15:50 +0200
Subject: [PATCH] Fix WASM build (#13763)

Broken by https://github.com/mono/mono/pull/13712.
---
 mono/utils/mono-membar.h       | 10 ++--------
 mono/utils/mono-threads-wasm.c |  5 +++++
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/mono/utils/mono-membar.h b/mono/utils/mono-membar.h
index e48935172e8..5aa985ac695 100644
--- a/mono/utils/mono-membar.h
+++ b/mono/utils/mono-membar.h
@@ -30,10 +30,6 @@ static inline void mono_memory_write_barrier (void)
 {
 }
 
-static inline void mono_memory_barrier_process_wide (void)
-{
-}
-
 #elif _MSC_VER
 #ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
@@ -65,8 +61,6 @@ static inline void mono_memory_write_barrier (void)
 	_WriteBarrier ();
 	MemoryBarrier ();
 }
-
-void mono_memory_barrier_process_wide (void);
 #elif defined(USE_GCC_ATOMIC_OPS)
 static inline void mono_memory_barrier (void)
 {
@@ -82,10 +76,10 @@ static inline void mono_memory_write_barrier (void)
 {
 	mono_memory_barrier ();
 }
-
-void mono_memory_barrier_process_wide (void);
 #else
 #error "Don't know how to do memory barriers!"
 #endif
 
+void mono_memory_barrier_process_wide (void);
+
 #endif	/* _MONO_UTILS_MONO_MEMBAR_H_ */
diff --git a/mono/utils/mono-threads-wasm.c b/mono/utils/mono-threads-wasm.c
index dbc53ca66e9..fadc1cc2244 100644
--- a/mono/utils/mono-threads-wasm.c
+++ b/mono/utils/mono-threads-wasm.c
@@ -187,4 +187,9 @@ mono_background_exec (void)
 	g_slist_free (j);
 }
 
+void
+mono_memory_barrier_process_wide (void)
+{
+}
+
 #endif
-- 
2.11.4.GIT