Update

[l4.git] / l4 / pkg / libgfortran / lib / contrib / m4 / ifunction_logical.m4

diff --git a/l4/pkg/libgfortran/lib/contrib/m4/ifunction_logical.m4 b/l4/pkg/libgfortran/lib/contrib/m4/ifunction_logical.m4
index e72f1d8a8f7b3c3d75d3adef5a325442ed3fcb9a..fd3afb074f8e1ac94e0c8baa447330f1a3bd1b8a 100644 (file)
--- a/l4/pkg/libgfortran/lib/contrib/m4/ifunction_logical.m4
+++ b/l4/pkg/libgfortran/lib/contrib/m4/ifunction_logical.m4
@@ -1,6 +1,6 @@
 dnl Support macro file for intrinsic functions.
 dnl Contains the generic sections of the array functions.
 dnl Support macro file for intrinsic functions.
 dnl Contains the generic sections of the array functions.

-dnl This file is part of the GNU Fortran 95 Runtime Library (libgfortran)
+dnl This file is part of the GNU Fortran Runtime Library (libgfortran)

 dnl Distributed under the GNU GPL with exception.  See COPYING for details.
 dnl
 dnl Pass the implementation for a single section as the parameter to
 dnl Distributed under the GNU GPL with exception.  See COPYING for details.
 dnl
 dnl Pass the implementation for a single section as the parameter to


@@ -71,7 +71,7 @@ name`'rtype_qual`_'atype_code (rtype * const restrict retarray,
        extent[n] = 0;
     }
 
        extent[n] = 0;
     }
 

-  if (retarray->data == NULL)
+  if (retarray->base_addr == NULL)

     {
       size_t alloc_size, str;
 
     {
       size_t alloc_size, str;
 


@@ -89,8 +89,7 @@ name`'rtype_qual`_'atype_code (rtype * const restrict retarray,
       retarray->offset = 0;
       retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank;
 
       retarray->offset = 0;
       retarray->dtype = (array->dtype & ~GFC_DTYPE_RANK_MASK) | rank;
 

-      alloc_size = sizeof (rtype_name) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1)
-                  * extent[rank-1];
+      alloc_size = GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1];

 
       if (alloc_size == 0)
        {
 
       if (alloc_size == 0)
        {


@@ -99,7 +98,7 @@ name`'rtype_qual`_'atype_code (rtype * const restrict retarray,
          return;
        }
       else
          return;
        }
       else

-       retarray->data = internal_malloc_size (alloc_size);
+       retarray->base_addr = xmallocarray (alloc_size, sizeof (rtype_name));

     }
   else
     {
     }
   else
     {


@@ -133,7 +132,7 @@ name`'rtype_qual`_'atype_code (rtype * const restrict retarray,
        return;
     }
 
        return;
     }
 

-  base = array->data;
+  base = array->base_addr;

 
   if (src_kind == 1 || src_kind == 2 || src_kind == 4 || src_kind == 8
 #ifdef HAVE_GFC_LOGICAL_16
 
   if (src_kind == 1 || src_kind == 2 || src_kind == 4 || src_kind == 8
 #ifdef HAVE_GFC_LOGICAL_16


@@ -147,7 +146,7 @@ name`'rtype_qual`_'atype_code (rtype * const restrict retarray,
   else
     internal_error (NULL, "Funny sized logical array in u_name intrinsic");
 
   else
     internal_error (NULL, "Funny sized logical array in u_name intrinsic");
 

-  dest = retarray->data;
+  dest = retarray->base_addr;

 
   continue_loop = 1;
   while (continue_loop)
 
   continue_loop = 1;
   while (continue_loop)