[llvm-commits] [dragonegg] r155559 - /dragonegg/branches/release_31/src/Convert.cpp

Duncan Sands baldrick at free.fr
Wed Apr 25 10:32:51 PDT 2012


Author: baldrick
Date: Wed Apr 25 12:32:51 2012
New Revision: 155559

URL: http://llvm.org/viewvc/llvm-project?rev=155559&view=rev
Log:
Port commit 155558 from mainline.  Original commit message:
Fix the gcc-4.5 build: it doesn't have gimple_assign_rhs3.

Modified:
    dragonegg/branches/release_31/src/Convert.cpp

Modified: dragonegg/branches/release_31/src/Convert.cpp
URL: http://llvm.org/viewvc/llvm-project/dragonegg/branches/release_31/src/Convert.cpp?rev=155559&r1=155558&r2=155559&view=diff
==============================================================================
--- dragonegg/branches/release_31/src/Convert.cpp (original)
+++ dragonegg/branches/release_31/src/Convert.cpp Wed Apr 25 12:32:51 2012
@@ -8532,7 +8532,9 @@
   tree_code code = gimple_assign_rhs_code(stmt);
   tree rhs1 = gimple_assign_rhs1(stmt);
   tree rhs2 = gimple_assign_rhs2(stmt);
+#if (GCC_MINOR > 6)
   tree rhs3 = gimple_assign_rhs3(stmt);
+#endif
 
   Value *RHS = 0;
   switch (code) {
@@ -8680,9 +8682,11 @@
     RHS = EmitReg_WIDEN_MULT_EXPR(type, rhs1, rhs2); break;
 
   // Ternary expressions.
+#if (GCC_MINOR > 6)
   case COND_EXPR:
   case VEC_COND_EXPR:
     RHS = EmitReg_CondExpr(rhs1, rhs2, rhs3); break;
+#endif
   }
 
   return TriviallyTypeConvert(RHS, getRegType(type));





More information about the llvm-commits mailing list