diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f7a7d93579ce5c59c16332c247e21cdbcc9d82fc..a864650a4eb681a0071d70ba06287f60d91bc5f5 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2003-04-28  David O'Brien  <obrien@FreeBSD.org>
+
+	* config/i386/i386.h (builtin_define): Add __amd64 and __amd64__.
+
 2003-04-28  Jakub Jelinek  <jakub@redhat.com>
 
 	* builtins.def (BUILT_IN_BCOPY, BUILT_IN_MEMMOVE): New.
diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h
index 7c43c6b1f9ac11c02d6d8ad65b4d777faa92f55e..e448ef139f193b6b91ec79d570e79173ccfd4b9c 100644
--- a/gcc/config/i386/i386.h
+++ b/gcc/config/i386/i386.h
@@ -520,6 +520,8 @@ extern int x86_prefetch_sse;
 	  builtin_assert ("machine=x86_64");			\
 	  builtin_define ("__x86_64");				\
 	  builtin_define ("__x86_64__");			\
+	  builtin_define ("__amd64");				\
+	  builtin_define ("__amd64__");				\
 	}							\
       else							\
 	{							\