--- databases/mariadb104-server.orig/Makefile
+++ databases/mariadb104-server/Makefile
@@ -179,6 +179,10 @@
 
 .include <bsd.port.pre.mk>
 
+.if ${ARCH} == "i386"
+EXTRA_PATCHES+=	${MASTERDIR}/files/extrapatch-MDEV-13728
+.endif
+
 .if ${ARCH} != amd64
 PLIST_SUB+=	WSREP="@comment "
 .endif
diff -urN databases/mariadb104-server.orig/files/extrapatch-MDEV-13728 databases/mariadb104-server/files/extrapatch-MDEV-13728
--- databases/mariadb104-server.orig/files/extrapatch-MDEV-13728
+++ databases/mariadb104-server/files/extrapatch-MDEV-13728
@@ -0,0 +1,119 @@
+--- include/my_atomic.h.orig
++++ include/my_atomic.h
+@@ -113,6 +113,7 @@
+ #elif defined(HAVE_GCC_C11_ATOMICS)
+ #include "atomic/gcc_builtins.h"
+ #endif
++#include "atomic/gcc_sync.h"
+
+ #if SIZEOF_LONG == 4
+ #define my_atomic_addlong(A,B) my_atomic_add32((int32*) (A), (B))
+--- include/atomic/gcc_sync.h.orig
++++ include/atomic/gcc_sync.h
+@@ -0,0 +1,106 @@
++#ifndef GCC_SYNC_INCLUDED
++#define GCC_SYNC_INCLUDED
++
++/* Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; version 2 of the License.
++
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with this program; if not, write to the Free Software
++   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
++
++/* Old GCC __sync builtins introduced in GCC 4.1 */
++
++static inline int my_atomic_cas32(int32 volatile *a, int32 *cmp, int32 set)
++{
++  int32 cmp_val= *cmp;
++  int32 sav= __sync_val_compare_and_swap(a, cmp_val, set);
++  int ret= (sav == cmp_val);
++  if (!ret)
++    *cmp = sav;
++  return ret;
++}
++
++static inline int my_atomic_cas64(int64 volatile *a, int64 *cmp, int64 set)
++{
++  int64 cmp_val= *cmp;
++  int64 sav= __sync_val_compare_and_swap(a, cmp_val, set);
++  int ret= (sav == cmp_val);
++  if (!ret)
++    *cmp = sav;
++  return ret;
++}
++
++static inline int my_atomic_casptr(void * volatile *a, void **cmp, void *set)
++{
++  void *cmp_val= *cmp;
++  void *sav= __sync_val_compare_and_swap(a, cmp_val, set);
++  int ret= (sav == cmp_val);
++  if (!ret)
++    *cmp = sav;
++  return ret;
++}
++
++static inline int32 my_atomic_add32(int32 volatile *a, int32 v)
++{
++  return __sync_fetch_and_add(a, v);
++}
++
++static inline int64 my_atomic_add64(int64 volatile *a, int64 v)
++{
++  return __sync_fetch_and_add(a, v);
++}
++
++static inline int32 my_atomic_fas32(int32 volatile *a, int32 v)
++{
++  return __sync_lock_test_and_set(a, v);
++}
++
++static inline int64 my_atomic_fas64(int64 volatile *a, int64 v)
++{
++  return __sync_lock_test_and_set(a, v);
++}
++
++static inline void * my_atomic_fasptr(void * volatile *a, void * v)
++{
++  return __sync_lock_test_and_set(a, v);
++}
++
++static inline int32 my_atomic_load32(int32 volatile *a)
++{
++  return __sync_fetch_and_or(a, 0);
++}
++
++static inline int64 my_atomic_load64(int64 volatile *a)
++{
++  return __sync_fetch_and_or(a, 0);
++}
++
++static inline void* my_atomic_loadptr(void * volatile *a)
++{
++  return __sync_fetch_and_or(a, 0);
++}
++
++static inline void my_atomic_store32(int32 volatile *a, int32 v)
++{
++  (void) __sync_lock_test_and_set(a, v);
++}
++
++static inline void my_atomic_store64(int64 volatile *a, int64 v)
++{
++  (void) __sync_lock_test_and_set(a, v);
++}
++
++static inline void my_atomic_storeptr(void * volatile *a, void *v)
++{
++  (void) __sync_lock_test_and_set(a, v);
++}
++
++#endif /* GCC_SYNC_INCLUDED */
--- databases/mariadb104-client.orig/Makefile
+++ databases/mariadb104-client/Makefile
@@ -6,8 +6,6 @@
 
 COMMENT=	Multithreaded SQL database (client)
 
-BROKEN_i386=	compile error: undeclared identifier 'my_atomic_add32'
-
 MASTERDIR=	${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX:C/-client/-server/}
 
 FILESDIR=	${.CURDIR}/files