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

13 files changed, 57 insertions, 55 deletions

diff --git a/libgfortran/m4/cshift1.m4 b/libgfortran/m4/cshift1.m4
index 989f91c..aad1749 100644
--- a/libgfortran/m4/cshift1.m4
+++ b/libgfortran/m4/cshift1.m4
@@ -26,15 +26,15 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"'
 include(iparm.m4)dnl
 
-void __cshift1_`'atype_kind (const gfc_array_char * ret,
-			     const gfc_array_char * array,
-			     const atype * h, const atype_name * pwhich);
-export_proto_np(__cshift1_`'atype_kind);
+void cshift1_`'atype_kind (const gfc_array_char * ret,
+			   const gfc_array_char * array,
+			   const atype * h, const atype_name * pwhich);
+export_proto(cshift1_`'atype_kind);
 
 void
-__cshift1_`'atype_kind (const gfc_array_char * ret,
-			const gfc_array_char * array,
-			const atype * h, const atype_name * pwhich)
+cshift1_`'atype_kind (const gfc_array_char * ret,
+		      const gfc_array_char * array,
+		      const atype * h, const atype_name * pwhich)
 {
   /* r.* indicates the return array.  */
   index_type rstride[GFC_MAX_DIMENSIONS - 1];
diff --git a/libgfortran/m4/dotprod.m4 b/libgfortran/m4/dotprod.m4
index 3e3245c..99ed53f 100644
--- a/libgfortran/m4/dotprod.m4
+++ b/libgfortran/m4/dotprod.m4
@@ -27,12 +27,12 @@ include(iparm.m4)dnl
 
 typedef GFC_ARRAY_DESCRIPTOR(GFC_MAX_DIMENSIONS, char) char_array;
 
-extern rtype_name __dot_product_`'rtype_code (rtype * a, rtype * b);
-export_proto_np(__dot_product_`'rtype_code);
+extern rtype_name dot_product_`'rtype_code (rtype * a, rtype * b);
+export_proto(dot_product_`'rtype_code);
 
 /* Both parameters will already have been converted to the result type.  */
 rtype_name
-__dot_product_`'rtype_code (rtype * a, rtype * b)
+dot_product_`'rtype_code (rtype * a, rtype * b)
 {
   rtype_name *pa;
   rtype_name *pb;
diff --git a/libgfortran/m4/dotprodc.m4 b/libgfortran/m4/dotprodc.m4
index 38ef7fc..d16b992 100644
--- a/libgfortran/m4/dotprodc.m4
+++ b/libgfortran/m4/dotprodc.m4
@@ -28,12 +28,12 @@ include(iparm.m4)dnl
 
 typedef GFC_ARRAY_DESCRIPTOR(GFC_MAX_DIMENSIONS, char) char_array;
 
-extern rtype_name __dot_product_`'rtype_code (rtype * a, rtype * b);
-export_proto_np(__dot_product_`'rtype_code);
+extern rtype_name dot_product_`'rtype_code (rtype * a, rtype * b);
+export_proto(dot_product_`'rtype_code);
 
 /* Both parameters will already have been converted to the result type.  */
 rtype_name
-__dot_product_`'rtype_code (rtype * a, rtype * b)
+dot_product_`'rtype_code (rtype * a, rtype * b)
 {
   rtype_name *pa;
   rtype_name *pb;
diff --git a/libgfortran/m4/dotprodl.m4 b/libgfortran/m4/dotprodl.m4
index dc196e0..779ca01 100644
--- a/libgfortran/m4/dotprodl.m4
+++ b/libgfortran/m4/dotprodl.m4
@@ -25,11 +25,11 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"'
 include(iparm.m4)dnl
 
-extern rtype_name __dot_product_`'rtype_code (gfc_array_l4 *, gfc_array_l4 *);
-export_proto_np(__dot_product_`'rtype_code);
+extern rtype_name dot_product_`'rtype_code (gfc_array_l4 *, gfc_array_l4 *);
+export_proto(dot_product_`'rtype_code);
 
 rtype_name
-__dot_product_`'rtype_code (gfc_array_l4 * a, gfc_array_l4 * b)
+dot_product_`'rtype_code (gfc_array_l4 * a, gfc_array_l4 * b)
 {
   GFC_LOGICAL_4 *pa;
   GFC_LOGICAL_4 *pb;
diff --git a/libgfortran/m4/eoshift1.m4 b/libgfortran/m4/eoshift1.m4
index f8ae460..603901d 100644
--- a/libgfortran/m4/eoshift1.m4
+++ b/libgfortran/m4/eoshift1.m4
@@ -29,17 +29,17 @@ include(iparm.m4)dnl
 static const char zeros[16] =
   {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 
-extern void __eoshift1_`'atype_kind (const gfc_array_char *,
+extern void eoshift1_`'atype_kind (const gfc_array_char *,
 				     const gfc_array_char *,
 				     const atype *, const char *,
 				     const atype_name *);
-export_proto_np(__eoshift1_`'atype_kind);
+export_proto(eoshift1_`'atype_kind);
 
 void
-__eoshift1_`'atype_kind (const gfc_array_char *ret,
-			 const gfc_array_char *array,
-			 const atype *h, const char *pbound,
-			 const atype_name *pwhich)
+eoshift1_`'atype_kind (const gfc_array_char *ret,
+		       const gfc_array_char *array,
+		       const atype *h, const char *pbound,
+		       const atype_name *pwhich)
 {
   /* r.* indicates the return array.  */
   index_type rstride[GFC_MAX_DIMENSIONS - 1];
diff --git a/libgfortran/m4/eoshift3.m4 b/libgfortran/m4/eoshift3.m4
index 4e706dc..0ded29e 100644
--- a/libgfortran/m4/eoshift3.m4
+++ b/libgfortran/m4/eoshift3.m4
@@ -29,15 +29,15 @@ include(iparm.m4)dnl
 static const char zeros[16] =
   {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 
-extern void __eoshift3_`'atype_kind (gfc_array_char *, gfc_array_char *,
+extern void eoshift3_`'atype_kind (gfc_array_char *, gfc_array_char *,
 				     atype *, const gfc_array_char *,
 				     atype_name *);
-export_proto_np(__eoshift3_`'atype_kind);
+export_proto(eoshift3_`'atype_kind);
 
 void
-__eoshift3_`'atype_kind (gfc_array_char *ret, gfc_array_char *array,
-			 atype *h, const gfc_array_char *bound,
-			 atype_name *pwhich)
+eoshift3_`'atype_kind (gfc_array_char *ret, gfc_array_char *array,
+		       atype *h, const gfc_array_char *bound,
+		       atype_name *pwhich)
 {
   /* r.* indicates the return array.  */
   index_type rstride[GFC_MAX_DIMENSIONS - 1];
diff --git a/libgfortran/m4/iforeach.m4 b/libgfortran/m4/iforeach.m4
index b67770b..e6c9a09 100644
--- a/libgfortran/m4/iforeach.m4
+++ b/libgfortran/m4/iforeach.m4
@@ -4,11 +4,11 @@ dnl This file is part of the GNU Fortran 95 Runtime Library (libgfortran)
 dnl Distributed under the GNU LGPL.  See COPYING for details.
 define(START_FOREACH_FUNCTION,
 `
-extern void `__'name`'rtype_qual`_'atype_code (rtype * retarray, atype *array);
-export_proto_np(`__'name`'rtype_qual`_'atype_code);
+extern void name`'rtype_qual`_'atype_code (rtype * retarray, atype *array);
+export_proto(name`'rtype_qual`_'atype_code);
 
 void
-`__'name`'rtype_qual`_'atype_code (rtype * retarray, atype *array)
+name`'rtype_qual`_'atype_code (rtype * retarray, atype *array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -90,11 +90,12 @@ define(FINISH_FOREACH_FUNCTION,
 }')dnl
 define(START_MASKED_FOREACH_FUNCTION,
 `
-extern void `__m'name`'rtype_qual`_'atype_code (rtype *, atype *, gfc_array_l4 *);
-export_proto_np(`__m'name`'rtype_qual`_'atype_code);
+extern void `m'name`'rtype_qual`_'atype_code (rtype *, atype *, gfc_array_l4 *);
+export_proto(`m'name`'rtype_qual`_'atype_code);
 
 void
-`__m'name`'rtype_qual`_'atype_code (rtype * retarray, atype *array, gfc_array_l4 * mask)
+`m'name`'rtype_qual`_'atype_code (rtype * retarray, atype *array,
+				  gfc_array_l4 * mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
diff --git a/libgfortran/m4/ifunction.m4 b/libgfortran/m4/ifunction.m4
index 0a377a5..ee63838 100644
--- a/libgfortran/m4/ifunction.m4
+++ b/libgfortran/m4/ifunction.m4
@@ -19,11 +19,11 @@ dnl You should not return or break from the inner loop of the implementation.
 dnl Care should also be taken to avoid using the names defined in iparm.m4
 define(START_ARRAY_FUNCTION,
 `
-extern void `__'name`'rtype_qual`_'atype_code (rtype *, atype *, index_type *);
-export_proto_np(`__'name`'rtype_qual`_'atype_code);
+extern void name`'rtype_qual`_'atype_code (rtype *, atype *, index_type *);
+export_proto(name`'rtype_qual`_'atype_code);
 
 void
-`__'name`'rtype_qual`_'atype_code (rtype *retarray, atype *array, index_type *pdim)
+name`'rtype_qual`_'atype_code (rtype *retarray, atype *array, index_type *pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS - 1];
   index_type extent[GFC_MAX_DIMENSIONS - 1];
@@ -143,12 +143,13 @@ define(FINISH_ARRAY_FUNCTION,
 }')dnl
 define(START_MASKED_ARRAY_FUNCTION,
 `
-extern void `__m'name`'rtype_qual`_'atype_code (rtype *, atype *, index_type *,
-						gfc_array_l4 *);
-export_proto_np(`__m'name`'rtype_qual`_'atype_code);
+extern void `m'name`'rtype_qual`_'atype_code (rtype *, atype *, index_type *,
+					       gfc_array_l4 *);
+export_proto(`m'name`'rtype_qual`_'atype_code);
 
 void
-`__m'name`'rtype_qual`_'atype_code (rtype * retarray, atype * array, index_type *pdim, gfc_array_l4 * mask)
+`m'name`'rtype_qual`_'atype_code (rtype * retarray, atype * array,
+				  index_type *pdim, gfc_array_l4 * mask)
 {
   index_type count[GFC_MAX_DIMENSIONS - 1];
   index_type extent[GFC_MAX_DIMENSIONS - 1];
diff --git a/libgfortran/m4/matmul.m4 b/libgfortran/m4/matmul.m4
index ef631d3..3bab232 100644
--- a/libgfortran/m4/matmul.m4
+++ b/libgfortran/m4/matmul.m4
@@ -38,11 +38,11 @@ include(iparm.m4)dnl
          C(I,J) = C(I,J)+A(I,K)*B(K,J)
 */
 
-extern void `__matmul_'rtype_code (rtype * retarray, rtype * a, rtype * b);
-export_proto_np(`__matmul_'rtype_code);
+extern void matmul_`'rtype_code (rtype * retarray, rtype * a, rtype * b);
+export_proto(matmul_`'rtype_code);
 
 void
-`__matmul_'rtype_code (rtype * retarray, rtype * a, rtype * b)
+matmul_`'rtype_code (rtype * retarray, rtype * a, rtype * b)
 {
   rtype_name *abase;
   rtype_name *bbase;
diff --git a/libgfortran/m4/matmull.m4 b/libgfortran/m4/matmull.m4
index 4091ef6..131de03 100644
--- a/libgfortran/m4/matmull.m4
+++ b/libgfortran/m4/matmull.m4
@@ -28,11 +28,11 @@ include(iparm.m4)dnl
 /* Dimensions: retarray(x,y) a(x, count) b(count,y).
    Either a or b can be rank 1.  In this case x or y is 1.  */
 
-extern void `__matmul_'rtype_code (rtype *, gfc_array_l4 *, gfc_array_l4 *);
-export_proto_np(`__matmul_'rtype_code);
+extern void matmul_`'rtype_code (rtype *, gfc_array_l4 *, gfc_array_l4 *);
+export_proto(matmul_`'rtype_code);
 
 void
-`__matmul_'rtype_code (rtype * retarray, gfc_array_l4 * a, gfc_array_l4 * b)
+matmul_`'rtype_code (rtype * retarray, gfc_array_l4 * a, gfc_array_l4 * b)
 {
   GFC_INTEGER_4 *abase;
   GFC_INTEGER_4 *bbase;
diff --git a/libgfortran/m4/reshape.m4 b/libgfortran/m4/reshape.m4
index 7355a7a..119154a 100644
--- a/libgfortran/m4/reshape.m4
+++ b/libgfortran/m4/reshape.m4
@@ -31,12 +31,12 @@ typedef GFC_ARRAY_DESCRIPTOR(1, index_type) shape_type;
    return array.  */
 dnl Only the kind (ie size) is used to name the function.
 
-extern void `__reshape_'rtype_kind (rtype *, rtype *, shape_type *,
+extern void reshape_`'rtype_kind (rtype *, rtype *, shape_type *,
 				    rtype *, shape_type *);
-extern_proto_np(`__reshape_'rtype_kind);
+export_proto(reshape_`'rtype_kind);
 
 void
-`__reshape_'rtype_kind (rtype * ret, rtype * source, shape_type * shape,
+reshape_`'rtype_kind (rtype * ret, rtype * source, shape_type * shape,
                       rtype * pad, shape_type * order)
 {
   /* r.* indicates the return array.  */
diff --git a/libgfortran/m4/shape.m4 b/libgfortran/m4/shape.m4
index e10fe0c..296611f 100644
--- a/libgfortran/m4/shape.m4
+++ b/libgfortran/m4/shape.m4
@@ -25,11 +25,11 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"'
 include(iparm.m4)dnl
 
-extern void `__shape_'rtype_kind (rtype * ret, const rtype * array);
-export_proto_np(`__shape_'rtype_kind);
+extern void shape_`'rtype_kind (rtype * ret, const rtype * array);
+export_proto(shape_`'rtype_kind);
 
 void
-`__shape_'rtype_kind (rtype * ret, const rtype * array)
+shape_`'rtype_kind (rtype * ret, const rtype * array)
 {
   int n;
   index_type stride;
diff --git a/libgfortran/m4/transpose.m4 b/libgfortran/m4/transpose.m4
index e519b29..1e14225 100644
--- a/libgfortran/m4/transpose.m4
+++ b/libgfortran/m4/transpose.m4
@@ -24,11 +24,11 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"'
 include(iparm.m4)dnl
 
-extern void `__transpose_'rtype_kind (rtype * ret, rtype * source);
-export_proto_np(`__transpose_'rtype_kind);
+extern void transpose_`'rtype_kind (rtype * ret, rtype * source);
+export_proto(transpose_`'rtype_kind);
 
 void
-`__transpose_'rtype_kind (rtype * ret, rtype * source)
+transpose_`'rtype_kind (rtype * ret, rtype * source)
 {
   /* r.* indicates the return array.  */
   index_type rxstride, rystride;