Merge GDB 7.5.1

gdb/features/arm-with-m-fpa-layout.xml

Index: gdb/features/arm-with-m-fpa-layout.xml
diff --git a/gdb/features/arm-m-profile.xml b/gdb/features/arm-with-m-fpa-layout.xml
similarity index 52%
copy from gdb/features/arm-m-profile.xml
copy to gdb/features/arm-with-m-fpa-layout.xml
index 967665df5536d511529ffbe7fde7f9f9e9ea7727..e3a114966aca406d6503e2c2987283bcf27ce9b9 100644
--- a/gdb/features/arm-m-profile.xml
+++ b/gdb/features/arm-with-m-fpa-layout.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0"?>
-<!-- Copyright (C) 2010-2012 Free Software Foundation, Inc.
+<!-- Copyright (C) 2007, 2008, 2009, 2010, 2011 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.  -->
 
-<!DOCTYPE feature SYSTEM "gdb-target.dtd">
+<!-- A target description for an M-profile device, for stubs that
+     transfer registers using the historical fpa layout.  -->
+
+<!DOCTYPE target SYSTEM "gdb-target.dtd">
+<target>
 <feature name="org.gnu.gdb.arm.m-profile">
   <reg name="r0" bitsize="32"/>
   <reg name="r1" bitsize="32"/>
@@ -23,5 +27,19 @@
   <reg name="sp" bitsize="32" type="data_ptr"/>
   <reg name="lr" bitsize="32"/>
   <reg name="pc" bitsize="32" type="code_ptr"/>
+
+  <!-- Slack for unused FPA registers (f0-f7 + fps).
+       See arm-fpa.xml.  -->
+  <reg name="" bitsize="96" type="arm_fpa_ext" regnum="16"/>
+  <reg name="" bitsize="96" type="arm_fpa_ext"/>
+  <reg name="" bitsize="96" type="arm_fpa_ext"/>
+  <reg name="" bitsize="96" type="arm_fpa_ext"/>
+  <reg name="" bitsize="96" type="arm_fpa_ext"/>
+  <reg name="" bitsize="96" type="arm_fpa_ext"/>
+  <reg name="" bitsize="96" type="arm_fpa_ext"/>
+  <reg name="" bitsize="96" type="arm_fpa_ext"/>
+  <reg name="" bitsize="32"/>
+
   <reg name="xpsr" bitsize="32" regnum="25"/>
 </feature>
+</target>