* features/Makefile (WHICH): Add arm-with-m and arm-with-m-fpa-layout.

        * arm-tdep.c (arm_register_g_packet_guesses): Fix comment.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b5e94db..41ab7df 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-21  Jonathan Larmour  <jifl@eCosCentric.com>
+
+       * features/Makefile (WHICH): Add arm-with-m and arm-with-m-fpa-layout.
+       * arm-tdep.c (arm_register_g_packet_guesses): Fix comment.
+
 2012-04-20  Nigel Stephens  <nigel@mips.com>
             Maciej W. Rozycki  <macro@codesourcery.com>
 

diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index 08c5ed4..b14b944 100644 (file)
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -9686,7 +9686,7 @@ arm_register_g_packet_guesses (struct gdbarch *gdbarch)
         cater for remote targets whose register set layout is the
         same as the FPA layout.  */
       register_remote_g_packet_guess (gdbarch,
-                                     /* r0-r12,sp,lr,pc; f0-f7; fps,cpsr */
+                                     /* r0-r12,sp,lr,pc; f0-f7; fps,xpsr */
                                      (16 * INT_REGISTER_SIZE)
                                      + (8 * FP_REGISTER_SIZE)
                                      + (2 * INT_REGISTER_SIZE),

diff --git a/gdb/features/Makefile b/gdb/features/Makefile
index 873ed85..83f5077 100644 (file)
--- a/gdb/features/Makefile
+++ b/gdb/features/Makefile
@@ -31,6 +31,7 @@
 #   make GDB=/path/to/gdb XMLTOC="xml files" cfiles
 
 WHICH = arm-with-iwmmxt arm-with-vfpv2 arm-with-vfpv3 arm-with-neon \
+       arm-with-m arm-with-m-fpa-layout \
        i386/i386 i386/i386-linux \
        i386/i386-mmx i386/i386-mmx-linux \
        i386/amd64 i386/amd64-linux \