1 files changed, 18 insertions, 0 deletions
diff --git a/contrib/gcc/builtins.c b/contrib/gcc/builtins.c
index a65d725..3321821 100644
--- a/contrib/gcc/builtins.c
+++ b/contrib/gcc/builtins.c
@@ -7355,6 +7355,12 @@ fold_builtin_ceil (tree fndecl, tree arglist)
 	}
     }
 
+  /* Fold floor (x) where x is nonnegative to trunc (x).  */
+  if (tree_expr_nonnegative_p (arg))
+    return build_function_call_expr (mathfn_built_in (TREE_TYPE (arg),
+						      BUILT_IN_TRUNC),
+				     arglist);
+
   return fold_trunc_transparent_mathfn (fndecl, arglist);
 }
 
@@ -7442,6 +7448,18 @@ fold_builtin_int_roundingfn (tree fndecl, tree arglist)
 	}
     }
 
+  switch (DECL_FUNCTION_CODE (fndecl))
+    {
+    CASE_FLT_FN (BUILT_IN_LFLOOR):
+    CASE_FLT_FN (BUILT_IN_LLFLOOR):
+      /* Fold lfloor (x) where x is nonnegative to FIX_TRUNC (x).  */
+      if (tree_expr_nonnegative_p (arg))
+	return fold_build1 (FIX_TRUNC_EXPR, TREE_TYPE (TREE_TYPE (fndecl)),
+			    arg);
+      break;
+    default:;
+    }
+
   return fold_fixed_mathfn (fndecl, arglist);
 }