Tomas Hozza 3fed71
diff --git a/configure.in b/configure.in
Tomas Hozza 3fed71
index b79aab0..da67ad5 100644
Tomas Hozza 3fed71
--- a/configure.in
Tomas Hozza 3fed71
+++ b/configure.in
Tomas Hozza 3fed71
@@ -3774,6 +3774,10 @@ if test "$use_atomic" = "yes"; then
Adam Tkac 5e22ac
 	AC_MSG_RESULT($arch)
Adam Tkac 5e22ac
 fi
Adam Tkac 5e22ac
 
Adam Tkac 5e22ac
+if test ! "$arch" = "x86_64" -a "$have_xaddq" = "yes"; then
Adam Tkac 5e22ac
+	AC_MSG_ERROR([XADDQ present but disabled by Fedora patch!])
Adam Tkac 5e22ac
+fi
Adam Tkac 5e22ac
+
Adam Tkac 5e22ac
 if test "$have_atomic" = "yes"; then
Adam Tkac 5e22ac
 	AC_MSG_CHECKING([compiler support for inline assembly code])
Adam Tkac 5e22ac
 
Tomas Hozza 3fed71
diff --git a/lib/isc/include/isc/platform.h.in b/lib/isc/include/isc/platform.h.in
Tomas Hozza 3fed71
index 2c6e2a5..bf34499 100644
Tomas Hozza 3fed71
--- a/lib/isc/include/isc/platform.h.in
Tomas Hozza 3fed71
+++ b/lib/isc/include/isc/platform.h.in
Tomas Hozza 3fed71
@@ -285,7 +285,11 @@
Adam Tkac 5e22ac
  * If the "xaddq" operation (64bit xadd) is available on this architecture,
Adam Tkac 5e22ac
  * ISC_PLATFORM_HAVEXADDQ will be defined.
Adam Tkac 5e22ac
  */
Adam Tkac 5e22ac
-@ISC_PLATFORM_HAVEXADDQ@
Adam Tkac 5e22ac
+#ifdef __x86_64__
Adam Tkac 5e22ac
+#define ISC_PLATFORM_HAVEXADDQ 1
Adam Tkac 5e22ac
+#else
Adam Tkac 5e22ac
+#undef ISC_PLATFORM_HAVEXADDQ
Adam Tkac 5e22ac
+#endif
Adam Tkac 5e22ac
 
Adam Tkac 5e22ac
 /*
Tomas Hozza 3fed71
  * If the 32-bit "atomic swap" operation is available on this