Further fix for round on m3cc

Author: demoitem

m3-sys/m3cc/gcc-4.7/gcc/tree.c

@@ -9471,8 +9471,8 @@ build_common_builtin_nodes (void)
     {
       ftype = build_function_type_list (long_integer_type_node, long_double_type_node,
 				        NULL_TREE);
-      local_define_builtin ("__builtin_lroundl", ftype, BUILT_IN_LROUNDL,
-			    "lroundl", ECF_NOTHROW | ECF_LEAF);
+      local_define_builtin ("__builtin_lroundq", ftype, BUILT_IN_LROUNDL,
+			    "lroundq", ECF_NOTHROW | ECF_LEAF);
     }
 
   if (!builtin_decl_explicit_p (BUILT_IN_ALLOCA))

m3-sys/m3cc/gcc/gcc/m3cg/parse.c

@@ -1016,7 +1016,7 @@ static GTY (()) tree bytes_per_integer_tree;
 #define memcmp_proc builtin_decl_explicit (BUILT_IN_MEMCMP)
 #define lroundf_proc  builtin_decl_explicit (BUILT_IN_LROUNDF)
 #define lround_proc  builtin_decl_explicit (BUILT_IN_LROUND)
-#define lroundl_proc  builtin_decl_explicit (BUILT_IN_LROUNDL)
+#define lroundq_proc  builtin_decl_explicit (BUILT_IN_LROUNDL)
 static GTY (()) tree set_union_proc;
 static GTY (()) tree set_diff_proc;
 static GTY (()) tree set_inter_proc;
@@ -5146,7 +5146,6 @@ M3CG_HANDLER (MAX) { m3_minmax (type, 0); }
 
 M3CG_HANDLER (ROUND)
 {
-/* not just yet needs more testing
   //Use the builtins for rounding.
   m3_start_call ();
   m3_pop_param (src_t);
@@ -5159,19 +5158,19 @@ M3CG_HANDLER (ROUND)
     if (LONG_DOUBLE_TYPE_SIZE == 64) {
       m3_call_direct (lround_proc, t_int_64);
     } else {
-      m3_call_direct (lroundl_proc, t_int_64);
+      m3_call_direct (lroundq_proc, t_int_64);
     }
   }
   EXPR_REF (-1) = m3_build1 (FIX_TRUNC_EXPR, dst_t, EXPR_REF (-1));
-*/
 
 /*
-  original code which produces erroneous results on 64 bit architectures
-  for all odd integers as floats beyond about 2^16. In those cases the
-  number is rounded up when it should not, as there is no fractional part.
-  See test p126.
+  the original code, which produces erroneous results for reel
+  on 64 bit architectures for all odd integers-as-floats beyond about 2^16.
+  In those cases this code rounds up when it should leave untouched,
+  as there is no fractional part.  See test p126.
 */
 
+/*
   REAL_VALUE_TYPE r;
 
   memset (&r, 0, sizeof(r));
@@ -5192,7 +5191,7 @@ M3CG_HANDLER (ROUND)
                              m3_build2 (PLUS_EXPR, src_t, arg,
                                         m3_build3 (COND_EXPR, src_t,
                                                    cond, pos, neg)));
-
+*/
 }
 
 M3CG_HANDLER (TRUNC)