Merge GDB 7.5.1

gdb/features/i386/x32-avx-linux.xml

Index: gdb/features/i386/x32-avx-linux.xml
diff --git a/gdb/features/i386/amd64-avx-linux.xml b/gdb/features/i386/x32-avx-linux.xml
similarity index 66%
copy from gdb/features/i386/amd64-avx-linux.xml
copy to gdb/features/i386/x32-avx-linux.xml
index 1fc157ce1e47799ea243c36ea1de7f3a69e99662..9ce4b2afab27034c1728d1bda4b985e8efb82096 100644
--- a/gdb/features/i386/amd64-avx-linux.xml
+++ b/gdb/features/i386/x32-avx-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 with AVX - Includes Linux-only special "register".  -->
+<!-- X32 with AVX - 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"/>
   <xi:include href="64bit-avx.xml"/>