From: Nathan Binkert <nate@binkert.org>
Date: Wed, 13 May 2009 05:33:05 +0000 (-0700)
Subject: gcc: work around a bogus gcc error
X-Git-Tag: Calvin_Submission~311
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=82c9e6a5fc9bd2b68e19e00381e5e87f291da659;p=gem5.git

gcc: work around a bogus gcc error
---

diff --git a/src/arch/arm/isa/util.isa b/src/arch/arm/isa/util.isa
index 4fe0d732c..20eb80ecf 100644
--- a/src/arch/arm/isa/util.isa
+++ b/src/arch/arm/isa/util.isa
@@ -242,8 +242,8 @@ output exec {{
             return ((arm_NEG(lhs) && arm_NEG(rhs)) ||
                     (arm_NEG(lhs) && arm_POS(result)) ||
                     (arm_NEG(rhs) && arm_POS(result)));
-        else
-            return 0;
+
+        return 0;
     }
 
     // Generate the appropriate carry bit for a subtraction operation
@@ -254,8 +254,8 @@ output exec {{
             return ((arm_NEG(lhs) && arm_POS(rhs)) ||
                     (arm_NEG(lhs) && arm_POS(result)) ||
                     (arm_POS(rhs) && arm_POS(result)));
-        else
-            return 0;
+
+        return 0;
     }
 
     inline int32_t
@@ -264,8 +264,8 @@ output exec {{
         if ((lhs | rhs) >> 30)
             return ((arm_NEG(lhs) && arm_NEG(rhs) && arm_POS(result)) ||
                     (arm_POS(lhs) && arm_POS(rhs) && arm_NEG(result)));
-        else
-            return 0;
+
+        return 0;
     }
 
     inline int32_t
@@ -274,8 +274,8 @@ output exec {{
         if ((lhs >= rhs) || ((rhs | lhs) >> 31))
             return ((arm_NEG(lhs) && arm_POS(rhs) && arm_POS(result)) ||
                     (arm_POS(lhs) && arm_NEG(rhs) && arm_NEG(result)));
-        else
-            return 0;
+
+        return 0;
     }
 
 }};