From: Ulrich Weigand <uweigand@de.ibm.com>
Date: Fri, 1 Apr 2011 19:38:15 +0000 (+0000)
Subject: 	* arm-tdep.c (arm_gdbarch_init): Enfore correct register number
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2b9e5ea6041faa2392694bb215e12a134cef2145;p=binutils-gdb.git

	* arm-tdep.c (arm_gdbarch_init): Enfore correct register number
	for "fpscr" in target description.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 954bc2cec11..5e717a4bf5d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-01  Ulrich Weigand  <ulrich.weigand@linaro.org>
+
+	* arm-tdep.c (arm_gdbarch_init): Enfore correct register number
+	for "fpscr" in target description.
+
 2011-04-01  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	* dwarf2read.c (find_slot_in_mapped_hash): New variable back_to,
diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index 9d8f5ba86e3..bb52ad4255e 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -8387,8 +8387,13 @@ arm_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
 	      if (!valid_p)
 		break;
 	    }
+	  if (!valid_p && i == 16)
+	    valid_p = 1;
 
-	  if (!valid_p && i != 16)
+	  /* Also require FPSCR.  */
+	  valid_p &= tdesc_numbered_register (feature, tdesc_data,
+					      ARM_FPSCR_REGNUM, "fpscr");
+	  if (!valid_p)
 	    {
 	      tdesc_data_cleanup (tdesc_data);
 	      return NULL;