From 2e61d171bc1fa47ea4d551b87546ebcf78f61e4a Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Fri, 5 Dec 2008 02:02:12 +0000
Subject: [PATCH] 2505.   [port]          Treat amd64 similarly to x86_64 when
 determining                         atomic operation support. [RT #19031]

---
 CHANGES      | 3 +++
 config.h.in  | 6 +++---
 configure    | 6 +++---
 configure.in | 4 ++--
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/CHANGES b/CHANGES
index 5135511a8e..01be30c527 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2505.	[port]		Treat amd64 similarly to x86_64 when determining
+			atomic operation support. [RT #19031]
+
 2504.	[bug]		Address race condition in the socket code. [RT #18899]
 
 2503.	[port]		linux: improve compatibility with Linux Standard
diff --git a/config.h.in b/config.h.in
index 55861cc9cb..c80b3ade27 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1,6 +1,6 @@
 /* config.h.in.  Generated from configure.in by autoheader.  */
 /*
- * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2008  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -16,7 +16,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: config.h.in,v 1.108 2008/12/01 07:50:17 marka Exp $ */
+/* $Id: config.h.in,v 1.111 2008/12/22 04:27:15 marka Exp $ */
 
 /*! \file */
 
@@ -109,7 +109,7 @@ int sigwait(const unsigned int *set, int *sig);
  * The silly continuation line is to keep configure from
  * commenting out the #undef.
  */
- 
+
 #undef \
 	va_start
 #define	va_start(ap, last) \
diff --git a/configure b/configure
index 70249909d6..86b51c5d64 100755
--- a/configure
+++ b/configure
@@ -14,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 #
-# $Id: configure,v 1.445 2008/12/01 07:50:17 marka Exp $
+# $Id: configure,v 1.446 2008/12/05 02:02:12 marka Exp $
 #
 # Portions Copyright (C) 1996-2001  Nominum, Inc.
 #
@@ -29,7 +29,7 @@
 # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
 # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-# From configure.in Revision: 1.459 .
+# From configure.in Revision: 1.460 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61.
 #
@@ -29588,7 +29588,7 @@ fi
 
 
 	;;
-	x86_64-*)
+	x86_64-*|amd64-*)
 		have_xaddq=yes
 		arch=x86_64
 	;;
diff --git a/configure.in b/configure.in
index b314f85da8..e7f49c9b97 100644
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_DIVERT_PUSH(1)dnl
 esyscmd([sed "s/^/# /" COPYRIGHT])dnl
 AC_DIVERT_POP()dnl
 
-AC_REVISION($Revision: 1.459 $)
+AC_REVISION($Revision: 1.460 $)
 
 AC_INIT(lib/dns/name.c)
 AC_PREREQ(2.59)
@@ -2241,7 +2241,7 @@ main() {
 		[arch=x86_32],
 		[arch=x86_32])
 	;;
-	x86_64-*)
+	x86_64-*|amd64-*)
 		have_xaddq=yes
 		arch=x86_64
 	;;