X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=blobdiff_plain;f=libgfortran%2Fintrinsics%2Fetime.c;h=c5a6ee9ddf5c2d10ca80cdcb4dd11b41fe69c2ce;hp=62ae2884ba4a73b7bd48fdc13526922f5b44a3be;hb=49118851f84c16a92b047973e38c237b2332bd0c;hpb=b417ea8c5d4118ac4ba24787c9b3a5b3a82f0c86

diff --git a/libgfortran/intrinsics/etime.c b/libgfortran/intrinsics/etime.c
index 62ae2884ba4..c5a6ee9ddf5 100644
--- a/libgfortran/intrinsics/etime.c
+++ b/libgfortran/intrinsics/etime.c
@@ -1,5 +1,5 @@
 /* Implementation of the ETIME intrinsic.
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
    Contributed by Steven G. Kargl <kargls@comcast.net>.
 
 This file is part of the GNU Fortran 95 runtime library (libgfortran).
@@ -25,8 +25,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public
 License along with libgfortran; see the file COPYING.  If not,
-write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #include "config.h"
 #include <sys/types.h>
@@ -46,7 +46,6 @@ void
 etime_sub (gfc_array_r4 *t, GFC_REAL_4 *result)
 {
   GFC_REAL_4 tu, ts, tt, *tp;
-  index_type dim;
 
 #if defined(HAVE_SYS_TIME_H) && defined(HAVE_SYS_RESOURCE_H)
   struct rusage rt;
@@ -72,9 +71,6 @@ etime_sub (gfc_array_r4 *t, GFC_REAL_4 *result)
   if (((t->dim[0].ubound + 1 - t->dim[0].lbound)) < 2)
     runtime_error ("Insufficient number of elements in TARRAY.");
 
-  if (t->dim[0].stride == 0)
-    t->dim[0].stride = 1;
-
   tp = t->data;
 
   *tp = tu;
@@ -94,25 +90,3 @@ etime (gfc_array_r4 *t)
   etime_sub (t, &val);
   return val;
 }
-
-/* LAPACK's test programs declares ETIME external, therefore we 
-   need this.  */
-
-extern GFC_REAL_4 etime_ (GFC_REAL_4 *t);
-export_proto_np(etime_);
-
-GFC_REAL_4
-etime_ (GFC_REAL_4 *t)
-{
-  gfc_array_r4 desc;
-  GFC_REAL_4 val;
-
-  /* We only fill in the fields that are used in etime_sub.  */
-  desc.dim[0].lbound = 0;
-  desc.dim[0].ubound = 1;
-  desc.dim[0].stride = 1;
-  desc.data = t;
-
-  etime_sub (&desc, &val);
-  return val;
-}