diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index bd7b1b37a1d..49e6bb661ac 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* linux-x86-low.c (xmltarget_amd64_linux_no_xml): Define only
+	if __x86_64__ is defined.
+
 2010-04-16  Pierre Muller  <muller@ics.u-strasbg.fr>
 
 	* configure: Regenerate.
diff --git a/gdb/gdbserver/linux-x86-low.c b/gdb/gdbserver/linux-x86-low.c
index ec01f37e6de..f254f383898 100644
--- a/gdb/gdbserver/linux-x86-low.c
+++ b/gdb/gdbserver/linux-x86-low.c
@@ -46,10 +46,13 @@ static const char *xmltarget_i386_linux_no_xml = "@<target>\
 <architecture>i386</architecture>\
 <osabi>GNU/Linux</osabi>\
 </target>";
+
+#ifdef __x86_64__
 static const char *xmltarget_amd64_linux_no_xml = "@<target>\
 <architecture>i386:x86-64</architecture>\
 <osabi>GNU/Linux</osabi>\
 </target>";
+#endif
 
 #include <sys/reg.h>
 #include <sys/procfs.h>