Update

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

diff --git a/l4/pkg/libgfortran/lib/contrib/m4/shape.m4 b/l4/pkg/libgfortran/lib/contrib/m4/shape.m4
index c079cca990347af81030f76a69d9de2cd9ca9d30..ffdcebe8d8e6908517231b0cd1d229fc813c7d00 100644 (file)
--- a/l4/pkg/libgfortran/lib/contrib/m4/shape.m4
+++ b/l4/pkg/libgfortran/lib/contrib/m4/shape.m4
@@ -1,8 +1,8 @@
 `/* Implementation of the SHAPE intrinsic
-   Copyright 2002, 2006, 2007, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2002-2015 Free Software Foundation, Inc.
    Contributed by Paul Brook <paul@nowt.org>
 
-This file is part of the GNU Fortran 95 runtime library (libgfortran).
+This file is part of the GNU Fortran runtime library (libgfortran).
 
 Libgfortran is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public
@@ -46,11 +46,11 @@ shape_'rtype_kind` ('rtype` * const restrict ret,
 
   rank = GFC_DESCRIPTOR_RANK (array);
 
-  if (ret->data == NULL)
+  if (ret->base_addr == NULL)
     {
       GFC_DIMENSION_SET(ret->dim[0], 0, rank - 1, 1);
       ret->offset = 0;
-      ret->data = internal_malloc_size (sizeof ('rtype_name`) * rank);
+      ret->base_addr = xmallocarray (rank, sizeof ('rtype_name`));
     }
 
   stride = GFC_DESCRIPTOR_STRIDE(ret,0);
@@ -61,7 +61,7 @@ shape_'rtype_kind` ('rtype` * const restrict ret,
   for (n = 0; n < rank; n++)
     {
       extent = GFC_DESCRIPTOR_EXTENT(array,n);
-      ret->data[n * stride] = extent > 0 ? extent : 0 ;
+      ret->base_addr[n * stride] = extent > 0 ? extent : 0 ;
     }
 }