diff -Naurp bind-9.9.5/configure.in bind-9.9.5.oden/configure.in
--- bind-9.9.5/configure.in	2014-02-02 14:04:02.208262521 +0100
+++ bind-9.9.5.oden/configure.in	2014-02-02 14:04:16.207263303 +0100
@@ -2902,6 +2902,10 @@ if test "$use_atomic" = "yes"; then
 	AC_MSG_RESULT($arch)
 fi
 
+if test ! "$arch" = "x86_64" -a "$have_xaddq" = "yes"; then
+	AC_MSG_ERROR([XADDQ present but disabled by Fedora patch!])
+fi
+
 if test "$have_atomic" = "yes"; then
 	AC_MSG_CHECKING([compiler support for inline assembly code])
 
diff -Naurp bind-9.9.5/lib/isc/include/isc/platform.h.in bind-9.9.5.oden/lib/isc/include/isc/platform.h.in
--- bind-9.9.5/lib/isc/include/isc/platform.h.in	2014-01-27 19:58:24.000000000 +0100
+++ bind-9.9.5.oden/lib/isc/include/isc/platform.h.in	2014-02-02 14:04:16.207263303 +0100
@@ -272,7 +272,11 @@
  * If the "xaddq" operation (64bit xadd) is available on this architecture,
  * ISC_PLATFORM_HAVEXADDQ will be defined.
  */
-@ISC_PLATFORM_HAVEXADDQ@
+#ifdef __x86_64__
+#define ISC_PLATFORM_HAVEXADDQ 1
+#else
+#undef ISC_PLATFORM_HAVEXADDQ
+#endif
 
 /*
  * If the "atomic swap" operation is available on this architecture,