Index: webkit24-gtk/hacks.mk
===================================================================
RCS file: webkit24-gtk/hacks.mk
diff -N webkit24-gtk/hacks.mk
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ webkit24-gtk/hacks.mk	20 Mar 2016 11:46:07 -0000
@@ -0,0 +1,16 @@
+# $NetBSD: hacks.mk,v 1.1 2015/10/05 16:25:30 leot Exp $
+
+.if !defined(WEBKIT24_GTK_HACKS_MK)
+WEBKIT24_GTK_HACKS_MK=	defined
+
+# [Sun Mar 20 12:21:27 CET 2016 : leot]
+# On i386 archs -latomic is added during the build phase and lead to a failure
+# when linking various binaries/libraries.
+# Forcing -march=i586 (or better) avoids that (i[56]86 provide required
+# 64-bit compare-and-swap instruction).
+.if ${MACHINE_ARCH} == "i386"
+PKG_HACKS+=	i386-atomicops
+CXXFLAGS+=	-march=i586
+.endif
+
+.endif	# WEBKIT24_GTK_HACKS_MK
Index: webkit24-gtk3/hacks.mk
===================================================================
RCS file: webkit24-gtk3/hacks.mk
diff -N webkit24-gtk3/hacks.mk
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ webkit24-gtk3/hacks.mk	20 Mar 2016 11:46:07 -0000
@@ -0,0 +1,16 @@
+# $NetBSD: hacks.mk,v 1.1 2015/10/05 16:25:30 leot Exp $
+
+.if !defined(WEBKIT24_GTK_HACKS_MK)
+WEBKIT24_GTK_HACKS_MK=	defined
+
+# [Sun Mar 20 12:21:27 CET 2016 : leot]
+# On i386 archs -latomic is added during the build phase and lead to a failure
+# when linking various binaries/libraries.
+# Forcing -march=i586 (or better) avoids that (i[56]86 provide required
+# 64-bit compare-and-swap instruction).
+.if ${MACHINE_ARCH} == "i386"
+PKG_HACKS+=	i386-atomicops
+CXXFLAGS+=	-march=i586
+.endif
+
+.endif	# WEBKIT24_GTK_HACKS_MK