arm.md (enabled): Test the value of arch_enabled rather than just using it.

2010-08-27  Ramana Radhakrishnan  <ramana.radhakrishnan@arm.com>

	* config/arm/arm.md (enabled): Test the value of arch_enabled
        rather than just using it.

From-SVN: r163585

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index edd3c4c79a74d21a86122db301c8a625d149284f..2767fde83aee1adc8fbca4861e9e69c97afae086 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-27  Ramana Radhakrishnan  <ramana.radhakrishnan@arm.com>
+
+       * config/arm/arm.md (enabled): Test the value of arch_enabled
+        rather than just using it.
+
 2010-08-27  Olivier Hainque  <hainque@adacore.com>
             Eric Botcazou  <ebotcazou@adacore.com>
 

diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md
index 70273d58c3815cb7358040dadb2f089b6a45e9e2..5a8d8ebbc18438d8c731c5e32552d71476bd5fba 100644 (file)
--- a/gcc/config/arm/arm.md
+++ b/gcc/config/arm/arm.md
@@ -234,10 +234,12 @@
   (const_string "yes"))
 
 ; Enable all alternatives that are both arch_enabled and insn_enabled.
-(define_attr "enabled" "no,yes"
-  (if_then_else (eq_attr "insn_enabled" "yes")
-               (attr "arch_enabled")
-               (const_string "no")))
+ (define_attr "enabled" "no,yes"
+   (if_then_else (eq_attr "insn_enabled" "yes")
+               (if_then_else (eq_attr "arch_enabled" "yes")
+                             (const_string "yes")
+                             (const_string "no"))
+                (const_string "no")))
 
 ; POOL_RANGE is how far away from a constant pool entry that this insn
 ; can be placed.  If the distance is zero, then this insn will never