iresolve.c (gfc_resolve_all, [...]): Use PREFIX.

gcc/fortran/
        * iresolve.c (gfc_resolve_all, gfc_resolve_any, gfc_resolve_count,
        gfc_resolve_cshift, gfc_resolve_dot_product, gfc_resolve_eoshift,
        gfc_resolve_matmul, gfc_resolve_maxloc, gfc_resolve_maxval,
        gfc_resolve_minloc, gfc_resolve_minval, gfc_resolve_pack,
        gfc_resolve_product, gfc_resolve_reshape, gfc_resolve_shape,
        gfc_resolve_spread, gfc_resolve_sum, gfc_resolve_transpose,
        gfc_resolve_unpack: Use PREFIX.
libgfortran/
        * intrinsics/cshift0.c, intrinsics/eoshift0.c, intrinsics/eoshift2.c,
        intrinsics/pack_generic.c, intrinsics/reshape_generic.c,
        intrinsics/spread_generic.c, intrinsics/transpose_generic.c,
        intrinsics/unpack_generic.c, m4/cshift1.m4, m4/dotprod.m4,
        m4/dotprodc.m4, m4/dotprodl.m4, m4/eoshift1.m4, m4/eoshift3.m4,
        m4/iforeach.m4, m4/ifunction.m4, m4/matmul.m4, m4/matmull.m4,
        m4/reshape.m4, m4/shape.m4, m4/transpose.m4: Use standard prefix
        instead of "__".
        * generated/*: Rebuild.

From-SVN: r92075

8 files changed, 85 insertions, 85 deletions

diff --git a/libgfortran/intrinsics/cshift0.c b/libgfortran/intrinsics/cshift0.c
index 9fd8785..4783eda 100644
--- a/libgfortran/intrinsics/cshift0.c
+++ b/libgfortran/intrinsics/cshift0.c
@@ -66,8 +66,8 @@ DEF_COPY_LOOP(ldouble, long double)
 
 
 static void
-__cshift0 (gfc_array_char * ret, const gfc_array_char * array,
-	   ssize_t shift, int which)
+cshift0 (gfc_array_char * ret, const gfc_array_char * array,
+	 ssize_t shift, int which)
 {
   /* r.* indicates the return array.  */
   index_type rstride[GFC_MAX_DIMENSIONS - 1];
@@ -238,24 +238,24 @@ __cshift0 (gfc_array_char * ret, const gfc_array_char * array,
 }
 
 
-extern void __cshift0_4 (gfc_array_char *, const gfc_array_char *,
-			 const GFC_INTEGER_4 *, const GFC_INTEGER_4 *);
-export_proto_np(__cshift0_4);
+extern void cshift0_4 (gfc_array_char *, const gfc_array_char *,
+		       const GFC_INTEGER_4 *, const GFC_INTEGER_4 *);
+export_proto(cshift0_4);
 
 void
-__cshift0_4 (gfc_array_char * ret, const gfc_array_char * array,
-    const GFC_INTEGER_4 * pshift, const GFC_INTEGER_4 * pdim)
+cshift0_4 (gfc_array_char *ret, const gfc_array_char *array,
+	   const GFC_INTEGER_4 *pshift, const GFC_INTEGER_4 *pdim)
 {
-  __cshift0 (ret, array, *pshift, pdim ? *pdim : 1);
+  cshift0 (ret, array, *pshift, pdim ? *pdim : 1);
 }
 
-extern void __cshift0_8 (gfc_array_char *, const gfc_array_char *,
-			 const GFC_INTEGER_8 *, const GFC_INTEGER_8 *);
-export_proto_np(__cshift0_8);
+extern void cshift0_8 (gfc_array_char *, const gfc_array_char *,
+		       const GFC_INTEGER_8 *, const GFC_INTEGER_8 *);
+export_proto(cshift0_8);
 
 void
-__cshift0_8 (gfc_array_char * ret, const gfc_array_char * array,
-    const GFC_INTEGER_8 * pshift, const GFC_INTEGER_8 * pdim)
+cshift0_8 (gfc_array_char *ret, const gfc_array_char *array,
+	   const GFC_INTEGER_8 *pshift, const GFC_INTEGER_8 *pdim)
 {
-  __cshift0 (ret, array, *pshift, pdim ? *pdim : 1);
+  cshift0 (ret, array, *pshift, pdim ? *pdim : 1);
 }
diff --git a/libgfortran/intrinsics/eoshift0.c b/libgfortran/intrinsics/eoshift0.c
index df749a4..66f0ab1 100644
--- a/libgfortran/intrinsics/eoshift0.c
+++ b/libgfortran/intrinsics/eoshift0.c
@@ -32,8 +32,8 @@ static const char zeros[16] =
    sizeof(int) < sizeof (index_type).  */
 
 static void
-__eoshift0 (gfc_array_char * ret, const gfc_array_char * array,
-    int shift, const char * pbound, int which)
+eoshift0 (gfc_array_char * ret, const gfc_array_char * array,
+	  int shift, const char * pbound, int which)
 {
   /* r.* indicates the return array.  */
   index_type rstride[GFC_MAX_DIMENSIONS - 1];
@@ -187,28 +187,28 @@ __eoshift0 (gfc_array_char * ret, const gfc_array_char * array,
     }
 }
 
-extern void __eoshift0_4 (gfc_array_char *, const gfc_array_char *,
-			  const GFC_INTEGER_4 *, const char *,
-			  const GFC_INTEGER_4 *);
-export_proto_np(__eoshift0_4);
+extern void eoshift0_4 (gfc_array_char *, const gfc_array_char *,
+			const GFC_INTEGER_4 *, const char *,
+			const GFC_INTEGER_4 *);
+export_proto(eoshift0_4);
 
 void
-__eoshift0_4 (gfc_array_char * ret, const gfc_array_char * array,
-    const GFC_INTEGER_4 * pshift, const char * pbound,
-    const GFC_INTEGER_4 * pdim)
+eoshift0_4 (gfc_array_char *ret, const gfc_array_char *array,
+	    const GFC_INTEGER_4 *pshift, const char *pbound,
+	    const GFC_INTEGER_4 *pdim)
 {
-  __eoshift0 (ret, array, *pshift, pbound, pdim ? *pdim : 1);
+  eoshift0 (ret, array, *pshift, pbound, pdim ? *pdim : 1);
 }
 
-extern void __eoshift0_8 (gfc_array_char *, const gfc_array_char *,
-			  const GFC_INTEGER_8 *, const char *,
-			  const GFC_INTEGER_8 *);
-export_proto_np(__eoshift0_8);
+extern void eoshift0_8 (gfc_array_char *, const gfc_array_char *,
+			const GFC_INTEGER_8 *, const char *,
+			const GFC_INTEGER_8 *);
+export_proto(eoshift0_8);
 
 void
-__eoshift0_8 (gfc_array_char * ret, const gfc_array_char * array,
-    const GFC_INTEGER_8 * pshift, const char * pbound,
-    const GFC_INTEGER_8 * pdim)
+eoshift0_8 (gfc_array_char *ret, const gfc_array_char *array,
+	    const GFC_INTEGER_8 *pshift, const char *pbound,
+	    const GFC_INTEGER_8 *pdim)
 {
-  __eoshift0 (ret, array, *pshift, pbound, pdim ? *pdim : 1);
+  eoshift0 (ret, array, *pshift, pbound, pdim ? *pdim : 1);
 }
diff --git a/libgfortran/intrinsics/eoshift2.c b/libgfortran/intrinsics/eoshift2.c
index 388486d..e7409e6 100644
--- a/libgfortran/intrinsics/eoshift2.c
+++ b/libgfortran/intrinsics/eoshift2.c
@@ -32,8 +32,8 @@ static const char zeros[16] =
    sizeof(int) < sizeof (index_type).  */
 
 static void
-__eoshift2 (gfc_array_char * ret, const gfc_array_char * array,
-    int shift, const gfc_array_char * bound, int which)
+eoshift2 (gfc_array_char *ret, const gfc_array_char *array,
+	  int shift, const gfc_array_char *bound, int which)
 {
   /* r.* indicates the return array.  */
   index_type rstride[GFC_MAX_DIMENSIONS - 1];
@@ -203,28 +203,28 @@ __eoshift2 (gfc_array_char * ret, const gfc_array_char * array,
     }
 }
 
-extern void __eoshift2_4 (gfc_array_char *, const gfc_array_char *,
-			  const GFC_INTEGER_4 *, const gfc_array_char *,
-			  const GFC_INTEGER_4 *);
-export_proto_np(__eoshift2_4);
+extern void eoshift2_4 (gfc_array_char *, const gfc_array_char *,
+			const GFC_INTEGER_4 *, const gfc_array_char *,
+			const GFC_INTEGER_4 *);
+export_proto(eoshift2_4);
 
 void
-__eoshift2_4 (gfc_array_char * ret, const gfc_array_char * array,
-    const GFC_INTEGER_4 * pshift, const gfc_array_char * bound,
-    const GFC_INTEGER_4 * pdim)
+eoshift2_4 (gfc_array_char *ret, const gfc_array_char *array,
+	    const GFC_INTEGER_4 *pshift, const gfc_array_char *bound,
+	    const GFC_INTEGER_4 *pdim)
 {
-  __eoshift2 (ret, array, *pshift, bound, pdim ? *pdim : 1);
+  eoshift2 (ret, array, *pshift, bound, pdim ? *pdim : 1);
 }
 
-extern void __eoshift2_8 (gfc_array_char *, const gfc_array_char *,
-			  const GFC_INTEGER_8 *, const gfc_array_char *,
-			  const GFC_INTEGER_8 *);
-export_proto_np(__eoshift2_8);
+extern void eoshift2_8 (gfc_array_char *, const gfc_array_char *,
+			const GFC_INTEGER_8 *, const gfc_array_char *,
+			const GFC_INTEGER_8 *);
+export_proto(eoshift2_8);
 
 void
-__eoshift2_8 (gfc_array_char * ret, const gfc_array_char * array,
-    const GFC_INTEGER_8 * pshift, const gfc_array_char * bound,
-    const GFC_INTEGER_8 * pdim)
+eoshift2_8 (gfc_array_char *ret, const gfc_array_char *array,
+	    const GFC_INTEGER_8 *pshift, const gfc_array_char *bound,
+	    const GFC_INTEGER_8 *pdim)
 {
-  __eoshift2 (ret, array, *pshift, bound, pdim ? *pdim : 1);
+  eoshift2 (ret, array, *pshift, bound, pdim ? *pdim : 1);
 }
diff --git a/libgfortran/intrinsics/pack_generic.c b/libgfortran/intrinsics/pack_generic.c
index 0332b79..6180135 100644
--- a/libgfortran/intrinsics/pack_generic.c
+++ b/libgfortran/intrinsics/pack_generic.c
@@ -65,13 +65,13 @@ Boston, MA 02111-1307, USA.  */
 There are two variants of the PACK intrinsic: one, where MASK is
 array valued, and the other one where MASK is scalar.  */
 
-extern void __pack (gfc_array_char *, const gfc_array_char *,
-		    const gfc_array_l4 *, const gfc_array_char *);
-export_proto_np(__pack);
+extern void pack (gfc_array_char *, const gfc_array_char *,
+		  const gfc_array_l4 *, const gfc_array_char *);
+export_proto(pack);
 
 void
-__pack (gfc_array_char * ret, const gfc_array_char * array,
-	const gfc_array_l4 * mask, const gfc_array_char * vector)
+pack (gfc_array_char *ret, const gfc_array_char *array,
+      const gfc_array_l4 *mask, const gfc_array_char *vector)
 {
   /* r.* indicates the return array.  */
   index_type rstride0;
@@ -269,13 +269,13 @@ __pack (gfc_array_char * ret, const gfc_array_char * array,
     }
 }
 
-extern void __pack_s (gfc_array_char *ret, const gfc_array_char *array,
-		      const GFC_LOGICAL_4 *, const gfc_array_char *);
-export_proto_np(__pack_s);
+extern void pack_s (gfc_array_char *ret, const gfc_array_char *array,
+		    const GFC_LOGICAL_4 *, const gfc_array_char *);
+export_proto(pack_s);
 
 void
-__pack_s (gfc_array_char * ret, const gfc_array_char * array,
-	  const GFC_LOGICAL_4 * mask, const gfc_array_char * vector)
+pack_s (gfc_array_char *ret, const gfc_array_char *array,
+	const GFC_LOGICAL_4 *mask, const gfc_array_char *vector)
 {
   /* r.* indicates the return array.  */
   index_type rstride0;
diff --git a/libgfortran/intrinsics/reshape_generic.c b/libgfortran/intrinsics/reshape_generic.c
index aecc6b6..18568af 100644
--- a/libgfortran/intrinsics/reshape_generic.c
+++ b/libgfortran/intrinsics/reshape_generic.c
@@ -28,16 +28,15 @@ Boston, MA 02111-1307, USA.  */
 typedef GFC_ARRAY_DESCRIPTOR(1, index_type) shape_type;
 typedef GFC_ARRAY_DESCRIPTOR(GFC_MAX_DIMENSIONS, char) parray;
 
-extern void __reshape (parray *, parray *, shape_type *,
-		       parray *, shape_type *);
-export_proto_np(__reshape);
+extern void reshape (parray *, parray *, shape_type *, parray *, shape_type *);
+export_proto(reshape);
 
 /* The shape parameter is ignored. We can currently deduce the shape from the
    return array.  */
 
 void
-__reshape (parray * ret, parray * source, shape_type * shape,
-           parray * pad, shape_type * order)
+reshape (parray *ret, parray *source, shape_type *shape,
+	 parray *pad, shape_type *order)
 {
   /* r.* indicates the return array.  */
   index_type rcount[GFC_MAX_DIMENSIONS - 1];
diff --git a/libgfortran/intrinsics/spread_generic.c b/libgfortran/intrinsics/spread_generic.c
index 0cada54..44c4027 100644
--- a/libgfortran/intrinsics/spread_generic.c
+++ b/libgfortran/intrinsics/spread_generic.c
@@ -1,4 +1,4 @@
-/* Generic implementation of the RESHAPE intrinsic
+/* Generic implementation of the SPREAD intrinsic
    Copyright 2002 Free Software Foundation, Inc.
    Contributed by Paul Brook <paul@nowt.org>
 
@@ -25,13 +25,13 @@ Boston, MA 02111-1307, USA.  */
 #include <string.h>
 #include "libgfortran.h"
 
-extern void __spread (const gfc_array_char *, const gfc_array_char *,
-		      const index_type *, const index_type *);
-export_proto_np(__spread);
+extern void spread (const gfc_array_char *, const gfc_array_char *,
+		    const index_type *, const index_type *);
+export_proto(spread);
 
 void
-__spread (const gfc_array_char * ret, const gfc_array_char * source,
-    const index_type * along, const index_type * pncopies)
+spread (const gfc_array_char *ret, const gfc_array_char *source,
+	const index_type *along, const index_type *pncopies)
 {
   /* r.* indicates the return array.  */
   index_type rstride[GFC_MAX_DIMENSIONS - 1];
diff --git a/libgfortran/intrinsics/transpose_generic.c b/libgfortran/intrinsics/transpose_generic.c
index ba3014f..af66be5 100644
--- a/libgfortran/intrinsics/transpose_generic.c
+++ b/libgfortran/intrinsics/transpose_generic.c
@@ -25,11 +25,11 @@ Boston, MA 02111-1307, USA.  */
 #include <assert.h>
 #include "libgfortran.h"
 
-extern void __transpose (gfc_array_char *, gfc_array_char *);
-export_proto_np(__transpose);
+extern void transpose (gfc_array_char *, gfc_array_char *);
+export_proto(transpose);
 
 void
-__transpose (gfc_array_char * ret, gfc_array_char * source)
+transpose (gfc_array_char *ret, gfc_array_char *source)
 {
   /* r.* indicates the return array.  */
   index_type rxstride, rystride;
diff --git a/libgfortran/intrinsics/unpack_generic.c b/libgfortran/intrinsics/unpack_generic.c
index 16deea4..1add5c8 100644
--- a/libgfortran/intrinsics/unpack_generic.c
+++ b/libgfortran/intrinsics/unpack_generic.c
@@ -25,13 +25,13 @@ Boston, MA 02111-1307, USA.  */
 #include <string.h>
 #include "libgfortran.h"
 
-extern void __unpack1 (const gfc_array_char *, const gfc_array_char *,
-		       const gfc_array_l4 *, const gfc_array_char *);
-export_proto_np(__unpack1);
+extern void unpack1 (const gfc_array_char *, const gfc_array_char *,
+		     const gfc_array_l4 *, const gfc_array_char *);
+iexport_proto(unpack1);
 
 void
-__unpack1 (const gfc_array_char * ret, const gfc_array_char * vector,
-    const gfc_array_l4 * mask, const gfc_array_char * field)
+unpack1 (const gfc_array_char *ret, const gfc_array_char *vector,
+	 const gfc_array_l4 *mask, const gfc_array_char *field)
 {
   /* r.* indicates the return array.  */
   index_type rstride[GFC_MAX_DIMENSIONS];
@@ -143,18 +143,19 @@ __unpack1 (const gfc_array_char * ret, const gfc_array_char * vector,
         }
     }
 }
+iexport(unpack1);
 
-extern void __unpack0 (const gfc_array_char *, const gfc_array_char *,
-		       const gfc_array_l4 *, char *);
-export_proto_np(__unpack0);
+extern void unpack0 (const gfc_array_char *, const gfc_array_char *,
+		     const gfc_array_l4 *, char *);
+export_proto(unpack0);
 
 void
-__unpack0 (const gfc_array_char * ret, const gfc_array_char * vector,
-    const gfc_array_l4 * mask, char * field)
+unpack0 (const gfc_array_char *ret, const gfc_array_char *vector,
+	 const gfc_array_l4 *mask, char *field)
 {
   gfc_array_char tmp;
 
   tmp.dtype = 0;
   tmp.data = field;
-  __unpack1 (ret, vector, mask, &tmp);
+  unpack1 (ret, vector, mask, &tmp);
 }