From patchwork Thu Apr 28 16:43:11 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulrich Weigand X-Patchwork-Id: 1216 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.159.109) by localhost6.localdomain6 with IMAP4-SSL; 08 Jun 2011 14:50:15 -0000 Delivered-To: patches@linaro.org Received: by 10.224.2.73 with SMTP id 9cs153784qai; Thu, 28 Apr 2011 09:43:16 -0700 (PDT) Received: by 10.213.104.73 with SMTP id n9mr3261063ebo.1.1304008996010; Thu, 28 Apr 2011 09:43:16 -0700 (PDT) Received: from mtagate6.uk.ibm.com (mtagate6.uk.ibm.com [194.196.100.166]) by mx.google.com with ESMTPS id i8si5750497wer.100.2011.04.28.09.43.15 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 28 Apr 2011 09:43:15 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning uweigand@de.ibm.com does not designate 194.196.100.166 as permitted sender) client-ip=194.196.100.166; Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning uweigand@de.ibm.com does not designate 194.196.100.166 as permitted sender) smtp.mail=uweigand@de.ibm.com Received: from d06nrmr1806.portsmouth.uk.ibm.com (d06nrmr1806.portsmouth.uk.ibm.com [9.149.39.193]) by mtagate6.uk.ibm.com (8.13.1/8.13.1) with ESMTP id p3SGhC4i030901 for ; Thu, 28 Apr 2011 16:43:12 GMT Received: from d06av02.portsmouth.uk.ibm.com (d06av02.portsmouth.uk.ibm.com [9.149.37.228]) by d06nrmr1806.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p3SGiH942023430 for ; Thu, 28 Apr 2011 17:44:17 +0100 Received: from d06av02.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av02.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p3SGhCSj020160 for ; Thu, 28 Apr 2011 10:43:12 -0600 Received: from tuxmaker.boeblingen.de.ibm.com (tuxmaker.boeblingen.de.ibm.com [9.152.85.9]) by d06av02.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with SMTP id p3SGhBpZ020148 for ; Thu, 28 Apr 2011 10:43:11 -0600 Message-Id: <201104281643.p3SGhBpZ020148@d06av02.portsmouth.uk.ibm.com> Received: by tuxmaker.boeblingen.de.ibm.com (sSMTP sendmail emulation); Thu, 28 Apr 2011 18:43:11 +0200 Subject: [commit, arm] Fix incorrect "fpscr" register number To: patches@linaro.org Date: Thu, 28 Apr 2011 18:43:11 +0200 (CEST) From: "Ulrich Weigand" X-Mailer: ELM [version 2.5 PL2] MIME-Version: 1.0 http://sourceware.org/ml/gdb-patches/2011-04/msg00019.html ChangeLog: * arm-tdep.c (arm_gdbarch_init): Enfore correct register number for "fpscr" in target description. Index: gdb/arm-tdep.c =================================================================== RCS file: /cvs/src/src/gdb/arm-tdep.c,v retrieving revision 1.340 diff -u -p -r1.340 arm-tdep.c --- gdb/arm-tdep.c 1 Apr 2011 11:57:02 -0000 1.340 +++ gdb/arm-tdep.c 1 Apr 2011 18:41:32 -0000 @@ -8387,8 +8387,13 @@ arm_gdbarch_init (struct gdbarch_info in 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;