Merge GDB 7.5.1

gdb/features/i386/x32-linux.xml

Index: gdb/features/i386/x32-linux.xml
diff --git a/gdb/features/i386/amd64-linux.xml b/gdb/features/i386/x32-linux.xml
similarity index 65%
copy from gdb/features/i386/amd64-linux.xml
copy to gdb/features/i386/x32-linux.xml
index d10e755a582b8e74fb74b1878c0ff3c743df8bfa..6a1bc7f87d28f2eb8aeffc9f013adccc2e44b2ef 100644
--- a/gdb/features/i386/amd64-linux.xml
+++ b/gdb/features/i386/x32-linux.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0"?>
-<!-- Copyright (C) 2010-2012 Free Software Foundation, Inc.
+<!-- Copyright (C) 2012 Free Software Foundation, Inc.
 
      Copying and distribution of this file, with or without modification,
      are permitted in any medium without royalty provided the copyright
      notice and this notice are preserved.  -->
 
-<!-- AMD64 - Includes Linux-only special "register".  -->
+<!-- X32 - Includes Linux-only special "register".  -->
 
 <!DOCTYPE target SYSTEM "gdb-target.dtd">
 <target>
-  <architecture>i386:x86-64</architecture>
+  <architecture>i386:x64-32</architecture>
   <osabi>GNU/Linux</osabi>
-  <xi:include href="64bit-core.xml"/>
+  <xi:include href="x32-core.xml"/>
   <xi:include href="64bit-sse.xml"/>
   <xi:include href="64bit-linux.xml"/>
 </target>