* config/i386/i386.c (ix86_expand_movmem, ix86_expand_setmem): Add

[pf3gnuchains/gcc-fork.git] / libgfortran / generated / maxloc0_4_i8.c

diff --git a/libgfortran/generated/maxloc0_4_i8.c b/libgfortran/generated/maxloc0_4_i8.c
index 987b424..695ef0f 100644 (file)
--- a/libgfortran/generated/maxloc0_4_i8.c
+++ b/libgfortran/generated/maxloc0_4_i8.c
@@ -50,7 +50,7 @@ maxloc0_4_i8 (gfc_array_i4 * const restrict retarray,
   index_type sstride[GFC_MAX_DIMENSIONS];
   index_type dstride;
   const GFC_INTEGER_8 *base;
-  GFC_INTEGER_4 *dest;
+  GFC_INTEGER_4 * restrict dest;
   index_type rank;
   index_type n;
 
@@ -69,7 +69,7 @@ maxloc0_4_i8 (gfc_array_i4 * const restrict retarray,
     }
   else
     {
-      if (compile_options.bounds_check)
+      if (unlikely (compile_options.bounds_check))
        {
          int ret_rank;
          index_type ret_extent;
@@ -77,13 +77,13 @@ maxloc0_4_i8 (gfc_array_i4 * const restrict retarray,
          ret_rank = GFC_DESCRIPTOR_RANK (retarray);
          if (ret_rank != 1)
            runtime_error ("rank of return array in MAXLOC intrinsic"
-                          " should be 1, is %d", ret_rank);
+                          " should be 1, is %ld", (long int) ret_rank);
 
          ret_extent = retarray->dim[0].ubound + 1 - retarray->dim[0].lbound;
          if (ret_extent != rank)
            runtime_error ("Incorrect extent in return value of"
-                          " MAXLOC intrnisic: is %ld, should be %d",
-                          (long int) ret_extent, rank);
+                          " MAXLOC intrnisic: is %ld, should be %ld",
+                          (long int) ret_extent, (long int) rank);
        }
     }
 
@@ -193,7 +193,7 @@ mmaxloc0_4_i8 (gfc_array_i4 * const restrict retarray,
     }
   else
     {
-      if (compile_options.bounds_check)
+      if (unlikely (compile_options.bounds_check))
        {
          int ret_rank, mask_rank;
          index_type ret_extent;
@@ -203,18 +203,19 @@ mmaxloc0_4_i8 (gfc_array_i4 * const restrict retarray,
          ret_rank = GFC_DESCRIPTOR_RANK (retarray);
          if (ret_rank != 1)
            runtime_error ("rank of return array in MAXLOC intrinsic"
-                          " should be 1, is %d", ret_rank);
+                          " should be 1, is %ld", (long int) ret_rank);
 
          ret_extent = retarray->dim[0].ubound + 1 - retarray->dim[0].lbound;
          if (ret_extent != rank)
            runtime_error ("Incorrect extent in return value of"
-                          " MAXLOC intrnisic: is %ld, should be %d",
-                          (long int) ret_extent, rank);
+                          " MAXLOC intrnisic: is %ld, should be %ld",
+                          (long int) ret_extent, (long int) rank);
        
          mask_rank = GFC_DESCRIPTOR_RANK (mask);
          if (rank != mask_rank)
            runtime_error ("rank of MASK argument in MAXLOC intrnisic"
-                          "should be %d, is %d", rank, mask_rank);
+                          "should be %ld, is %ld", (long int) rank,
+                          (long int) mask_rank);
 
          for (n=0; n<rank; n++)
            {
@@ -222,8 +223,8 @@ mmaxloc0_4_i8 (gfc_array_i4 * const restrict retarray,
              mask_extent = mask->dim[n].ubound + 1 - mask->dim[n].lbound;
              if (array_extent != mask_extent)
                runtime_error ("Incorrect extent in MASK argument of"
-                              " MAXLOC intrinsic in dimension %d:"
-                              " is %ld, should be %ld", n + 1,
+                              " MAXLOC intrinsic in dimension %ld:"
+                              " is %ld, should be %ld", (long int) n + 1,
                               (long int) mask_extent, (long int) array_extent);
            }
        }
@@ -352,7 +353,7 @@ smaxloc0_4_i8 (gfc_array_i4 * const restrict retarray,
     }
   else
     {
-      if (compile_options.bounds_check)
+      if (unlikely (compile_options.bounds_check))
        {
          int ret_rank;
          index_type ret_extent;
@@ -360,7 +361,7 @@ smaxloc0_4_i8 (gfc_array_i4 * const restrict retarray,
          ret_rank = GFC_DESCRIPTOR_RANK (retarray);
          if (ret_rank != 1)
            runtime_error ("rank of return array in MAXLOC intrinsic"
-                          " should be 1, is %d", ret_rank);
+                          " should be 1, is %ld", (long int) ret_rank);
 
          ret_extent = retarray->dim[0].ubound + 1 - retarray->dim[0].lbound;
            if (ret_extent != rank)