Merge GDB 7.5.1

gdb/features/i386/x32-avx.xml

Index: gdb/features/i386/x32-avx.xml
diff --git a/gdb/features/i386/amd64-avx.xml b/gdb/features/i386/x32-avx.xml
similarity index 68%
copy from gdb/features/i386/amd64-avx.xml
copy to gdb/features/i386/x32-avx.xml
index 1fa7c47f4dd64d6ab944627454fa45d3e544ffe3..57a32c9befe538be3ab57ef3c9f82c01ef9d96ce 100644
--- a/gdb/features/i386/amd64-avx.xml
+++ b/gdb/features/i386/x32-avx.xml
@@ -1,16 +1,16 @@
 <?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 -->
+<!-- X32 with AVX -->
 
 <!DOCTYPE target SYSTEM "gdb-target.dtd">
 <target>
-  <architecture>i386:x86-64</architecture>
-  <xi:include href="64bit-core.xml"/>
+  <architecture>i386:x64-32</architecture>
+  <xi:include href="x32-core.xml"/>
   <xi:include href="64bit-sse.xml"/>
   <xi:include href="64bit-avx.xml"/>
 </target>