aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gas/ChangeLog5
-rw-r--r--gas/config/tc-arm.c2
-rw-r--r--gas/testsuite/ChangeLog4
-rw-r--r--gas/testsuite/gas/arm/vstr-thumb-bad.d2
4 files changed, 11 insertions, 2 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index de4de62..cc6d283 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-15 Will Newton <will.newton@linaro.org>
+
+ * config/tc-arm.c (do_neon_ldr_str): Fix error check for PC register
+ in vstr in Thumb mode for pre-ARMv7 cores.
+
2013-03-14 Andreas Schwab <schwab@suse.de>
* doc/c-arc.texi (ARC Directives): Revert last change and use
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index 27d2361..ee09e14 100644
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -15690,7 +15690,7 @@ do_neon_ldr_str (void)
And is UNPREDICTABLE in thumb mode. */
if (!is_ldr
&& inst.operands[1].reg == REG_PC
- && ARM_CPU_HAS_FEATURE (selected_cpu, arm_ext_v7))
+ && (ARM_CPU_HAS_FEATURE (selected_cpu, arm_ext_v7) || thumb_mode))
{
if (!thumb_mode && warn_on_deprecated)
as_warn (_("Use of PC here is deprecated"));
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index cba8216..1817e5d 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-15 Will Newton <will.newton@linaro.org>
+
+ * gas/arm/vstr-thumb-bad.d: Assemble with -mcpu=arm1156t2f-s.
+
2013-03-12 Sebastian Huber <sebastian.huber@embedded-brains.de>
* gas/nios2/nios2.exp: Use run_dump_tests.
diff --git a/gas/testsuite/gas/arm/vstr-thumb-bad.d b/gas/testsuite/gas/arm/vstr-thumb-bad.d
index 798f16d..354689f 100644
--- a/gas/testsuite/gas/arm/vstr-thumb-bad.d
+++ b/gas/testsuite/gas/arm/vstr-thumb-bad.d
@@ -1,4 +1,4 @@
# name: VFP PC-relative VSTR thumb mode
-# as: -mfpu=vfp3 -mthumb -mcpu=cortex-a8
+# as: -mfpu=vfp -mthumb -mcpu=arm1156t2f-s
# source: vstr-bad.s
# error-output: vstr-thumb-bad.l