[r163585, fixes bootstrap failure from r163281 2010-08-16 <mikpe@it.uu.se>]

Subject: [Patch ARM] Unbreak ARM bootstrap.
From: Ramana Radhakrishnan <ramana dot radhakrishnan at arm dot com>
Date: Fri, 27 Aug 2010 11:12:31 +0100
List-Archive: <http://gcc.gnu.org/ml/gcc-patches/>

Hi, 

This unbreaks bootstraps on arm-linux-gnueabi which started failing
because of issues with warnings of -Werror=c++-compat because the return
value was being type-casted automatically from one enum type to another.

 error: enum conversion in return is invalid in C++ [-Werror=c++-compat]
 error: enum conversion in return is invalid in C++ [-Werror=c
++-compat] 
error: enum conversion in return is invalid in C++ [-Werror=c++-compat]

Verified that stage2 proceeds further with this. Committing as obvious
in the next few minutes unless someone has any objections to this.

cheers
Ramana

gcc/

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.

--- gcc-4.6-20100821/gcc/config/arm/arm.md.~1~	2010-08-18 10:25:33.000000000 +0200
+++ gcc-4.6-20100821/gcc/config/arm/arm.md	2010-09-03 01:25:54.000000000 +0200
@@ -234,10 +234,12 @@ (define_attr "insn_enabled" "no,yes"
   (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