From 63be509029db0b15f445400c75722862cf252b25 Mon Sep 17 00:00:00 2001 From: Ramana Radhakrishnan Date: Fri, 26 Jun 2015 09:08:03 +0000 Subject: [PATCH] [Patch ARM] Fix thinko in use of TARGET_UNIFIED_ASM While paving the way to turn on unified syntax in ARM state I came across this use of TARGET_UNIFIED_ASM that really doesn't make sense. The idea that pop has different encoding sizes is a property of the Thumb instruction set rather than a property of which form of unified syntax was used. I still have quite a large patch set for the unified asm switch but it seems useful to get this one out of the way to catch any other issues. Tested with an appropriate set of multilibs on arm-none-eabi / applied. Bootstrapped on armhf. Applied to trunk. 2015-06-26 Ramana Radhakrishnan * config/arm/arm.c (arm_output_multireg_pop): Fix use of TARGET_UNIFIED_ASM. From-SVN: r224997 --- gcc/ChangeLog | 5 +++++ gcc/config/arm/arm.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 21627b470db..ecc209fec3c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2015-06-26 Ramana Radhakrishnan + + * config/arm/arm.c (arm_output_multireg_pop): Fix use of + TARGET_UNIFIED_ASM. + 2015-06-26 Richard Biener * match.pd: Allow associating FLOAT_TYPE_P when flag_associative_math. diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c index 83f326996ce..9f300415ede 100644 --- a/gcc/config/arm/arm.c +++ b/gcc/config/arm/arm.c @@ -17589,7 +17589,7 @@ arm_output_multireg_pop (rtx *operands, bool return_pc, rtx cond, bool reverse, } conditional = reverse ? "%?%D0" : "%?%d0"; - if ((regno_base == SP_REGNUM) && TARGET_UNIFIED_ASM) + if ((regno_base == SP_REGNUM) && TARGET_THUMB) { /* Output pop (not stmfd) because it has a shorter encoding. */ gcc_assert (update); -- 2.30.2