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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@92075 138bc75d-0d04-0410-961f-82ee72b054a4

88 files changed, 526 insertions, 474 deletions

diff --git a/libgfortran/generated/all_l4.c b/libgfortran/generated/all_l4.c
index 3c81520ae49..78a52094536 100644
--- a/libgfortran/generated/all_l4.c
+++ b/libgfortran/generated/all_l4.c
@@ -25,11 +25,11 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"
 
 
-extern void __all_l4 (gfc_array_l4 *, gfc_array_l4 *, index_type *);
-export_proto_np(__all_l4);
+extern void all_l4 (gfc_array_l4 *, gfc_array_l4 *, index_type *);
+export_proto(all_l4);
 
 void
-__all_l4 (gfc_array_l4 *retarray, gfc_array_l4 *array, index_type *pdim)
+all_l4 (gfc_array_l4 *retarray, gfc_array_l4 *array, index_type *pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS - 1];
   index_type extent[GFC_MAX_DIMENSIONS - 1];
diff --git a/libgfortran/generated/all_l8.c b/libgfortran/generated/all_l8.c
index c7a8df01b5d..1573ed1ef24 100644
--- a/libgfortran/generated/all_l8.c
+++ b/libgfortran/generated/all_l8.c
@@ -25,11 +25,11 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"
 
 
-extern void __all_l8 (gfc_array_l8 *, gfc_array_l8 *, index_type *);
-export_proto_np(__all_l8);
+extern void all_l8 (gfc_array_l8 *, gfc_array_l8 *, index_type *);
+export_proto(all_l8);
 
 void
-__all_l8 (gfc_array_l8 *retarray, gfc_array_l8 *array, index_type *pdim)
+all_l8 (gfc_array_l8 *retarray, gfc_array_l8 *array, index_type *pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS - 1];
   index_type extent[GFC_MAX_DIMENSIONS - 1];
diff --git a/libgfortran/generated/any_l4.c b/libgfortran/generated/any_l4.c
index da3f2b7295d..43475a94c83 100644
--- a/libgfortran/generated/any_l4.c
+++ b/libgfortran/generated/any_l4.c
@@ -25,11 +25,11 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"
 
 
-extern void __any_l4 (gfc_array_l4 *, gfc_array_l4 *, index_type *);
-export_proto_np(__any_l4);
+extern void any_l4 (gfc_array_l4 *, gfc_array_l4 *, index_type *);
+export_proto(any_l4);
 
 void
-__any_l4 (gfc_array_l4 *retarray, gfc_array_l4 *array, index_type *pdim)
+any_l4 (gfc_array_l4 *retarray, gfc_array_l4 *array, index_type *pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS - 1];
   index_type extent[GFC_MAX_DIMENSIONS - 1];
diff --git a/libgfortran/generated/any_l8.c b/libgfortran/generated/any_l8.c
index 8258db932b9..012f7fbf37d 100644
--- a/libgfortran/generated/any_l8.c
+++ b/libgfortran/generated/any_l8.c
@@ -25,11 +25,11 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"
 
 
-extern void __any_l8 (gfc_array_l8 *, gfc_array_l8 *, index_type *);
-export_proto_np(__any_l8);
+extern void any_l8 (gfc_array_l8 *, gfc_array_l8 *, index_type *);
+export_proto(any_l8);
 
 void
-__any_l8 (gfc_array_l8 *retarray, gfc_array_l8 *array, index_type *pdim)
+any_l8 (gfc_array_l8 *retarray, gfc_array_l8 *array, index_type *pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS - 1];
   index_type extent[GFC_MAX_DIMENSIONS - 1];
diff --git a/libgfortran/generated/count_4_l4.c b/libgfortran/generated/count_4_l4.c
index 0e3e2981647..6150cc1bec8 100644
--- a/libgfortran/generated/count_4_l4.c
+++ b/libgfortran/generated/count_4_l4.c
@@ -25,11 +25,11 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"
 
 
-extern void __count_4_l4 (gfc_array_i4 *, gfc_array_l4 *, index_type *);
-export_proto_np(__count_4_l4);
+extern void count_4_l4 (gfc_array_i4 *, gfc_array_l4 *, index_type *);
+export_proto(count_4_l4);
 
 void
-__count_4_l4 (gfc_array_i4 *retarray, gfc_array_l4 *array, index_type *pdim)
+count_4_l4 (gfc_array_i4 *retarray, gfc_array_l4 *array, index_type *pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS - 1];
   index_type extent[GFC_MAX_DIMENSIONS - 1];
diff --git a/libgfortran/generated/count_4_l8.c b/libgfortran/generated/count_4_l8.c
index 7e9a376960c..1d5b11bb35d 100644
--- a/libgfortran/generated/count_4_l8.c
+++ b/libgfortran/generated/count_4_l8.c
@@ -25,11 +25,11 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"
 
 
-extern void __count_4_l8 (gfc_array_i4 *, gfc_array_l8 *, index_type *);
-export_proto_np(__count_4_l8);
+extern void count_4_l8 (gfc_array_i4 *, gfc_array_l8 *, index_type *);
+export_proto(count_4_l8);
 
 void
-__count_4_l8 (gfc_array_i4 *retarray, gfc_array_l8 *array, index_type *pdim)
+count_4_l8 (gfc_array_i4 *retarray, gfc_array_l8 *array, index_type *pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS - 1];
   index_type extent[GFC_MAX_DIMENSIONS - 1];
diff --git a/libgfortran/generated/count_8_l4.c b/libgfortran/generated/count_8_l4.c
index c23895b6601..334c7285367 100644
--- a/libgfortran/generated/count_8_l4.c
+++ b/libgfortran/generated/count_8_l4.c
@@ -25,11 +25,11 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"
 
 
-extern void __count_8_l4 (gfc_array_i8 *, gfc_array_l4 *, index_type *);
-export_proto_np(__count_8_l4);
+extern void count_8_l4 (gfc_array_i8 *, gfc_array_l4 *, index_type *);
+export_proto(count_8_l4);
 
 void
-__count_8_l4 (gfc_array_i8 *retarray, gfc_array_l4 *array, index_type *pdim)
+count_8_l4 (gfc_array_i8 *retarray, gfc_array_l4 *array, index_type *pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS - 1];
   index_type extent[GFC_MAX_DIMENSIONS - 1];
diff --git a/libgfortran/generated/count_8_l8.c b/libgfortran/generated/count_8_l8.c
index 1535af40561..cc9f66c68dd 100644
--- a/libgfortran/generated/count_8_l8.c
+++ b/libgfortran/generated/count_8_l8.c
@@ -25,11 +25,11 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"
 
 
-extern void __count_8_l8 (gfc_array_i8 *, gfc_array_l8 *, index_type *);
-export_proto_np(__count_8_l8);
+extern void count_8_l8 (gfc_array_i8 *, gfc_array_l8 *, index_type *);
+export_proto(count_8_l8);
 
 void
-__count_8_l8 (gfc_array_i8 *retarray, gfc_array_l8 *array, index_type *pdim)
+count_8_l8 (gfc_array_i8 *retarray, gfc_array_l8 *array, index_type *pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS - 1];
   index_type extent[GFC_MAX_DIMENSIONS - 1];
diff --git a/libgfortran/generated/cshift1_4.c b/libgfortran/generated/cshift1_4.c
index 9293eaeb209..5226d475ebc 100644
--- a/libgfortran/generated/cshift1_4.c
+++ b/libgfortran/generated/cshift1_4.c
@@ -25,15 +25,15 @@ Boston, MA 02111-1307, USA.  */
 #include <string.h>
 #include "libgfortran.h"
 
-void __cshift1_4 (const gfc_array_char * ret,
-			     const gfc_array_char * array,
-			     const gfc_array_i4 * h, const GFC_INTEGER_4 * pwhich);
-export_proto_np(__cshift1_4);
+void cshift1_4 (const gfc_array_char * ret,
+			   const gfc_array_char * array,
+			   const gfc_array_i4 * h, const GFC_INTEGER_4 * pwhich);
+export_proto(cshift1_4);
 
 void
-__cshift1_4 (const gfc_array_char * ret,
-			const gfc_array_char * array,
-			const gfc_array_i4 * h, const GFC_INTEGER_4 * pwhich)
+cshift1_4 (const gfc_array_char * ret,
+		      const gfc_array_char * array,
+		      const gfc_array_i4 * h, const GFC_INTEGER_4 * pwhich)
 {
   /* r.* indicates the return array.  */
   index_type rstride[GFC_MAX_DIMENSIONS - 1];
diff --git a/libgfortran/generated/cshift1_8.c b/libgfortran/generated/cshift1_8.c
index 803984f045b..05694222342 100644
--- a/libgfortran/generated/cshift1_8.c
+++ b/libgfortran/generated/cshift1_8.c
@@ -25,15 +25,15 @@ Boston, MA 02111-1307, USA.  */
 #include <string.h>
 #include "libgfortran.h"
 
-void __cshift1_8 (const gfc_array_char * ret,
-			     const gfc_array_char * array,
-			     const gfc_array_i8 * h, const GFC_INTEGER_8 * pwhich);
-export_proto_np(__cshift1_8);
+void cshift1_8 (const gfc_array_char * ret,
+			   const gfc_array_char * array,
+			   const gfc_array_i8 * h, const GFC_INTEGER_8 * pwhich);
+export_proto(cshift1_8);
 
 void
-__cshift1_8 (const gfc_array_char * ret,
-			const gfc_array_char * array,
-			const gfc_array_i8 * h, const GFC_INTEGER_8 * pwhich)
+cshift1_8 (const gfc_array_char * ret,
+		      const gfc_array_char * array,
+		      const gfc_array_i8 * h, const GFC_INTEGER_8 * pwhich)
 {
   /* r.* indicates the return array.  */
   index_type rstride[GFC_MAX_DIMENSIONS - 1];
diff --git a/libgfortran/generated/dotprod_c4.c b/libgfortran/generated/dotprod_c4.c
index ff60a23601c..6b02f95f3f7 100644
--- a/libgfortran/generated/dotprod_c4.c
+++ b/libgfortran/generated/dotprod_c4.c
@@ -27,12 +27,12 @@ Boston, MA 02111-1307, USA.  */
 
 typedef GFC_ARRAY_DESCRIPTOR(GFC_MAX_DIMENSIONS, char) char_array;
 
-extern GFC_COMPLEX_4 __dot_product_c4 (gfc_array_c4 * a, gfc_array_c4 * b);
-export_proto_np(__dot_product_c4);
+extern GFC_COMPLEX_4 dot_product_c4 (gfc_array_c4 * a, gfc_array_c4 * b);
+export_proto(dot_product_c4);
 
 /* Both parameters will already have been converted to the result type.  */
 GFC_COMPLEX_4
-__dot_product_c4 (gfc_array_c4 * a, gfc_array_c4 * b)
+dot_product_c4 (gfc_array_c4 * a, gfc_array_c4 * b)
 {
   GFC_COMPLEX_4 *pa;
   GFC_COMPLEX_4 *pb;
diff --git a/libgfortran/generated/dotprod_c8.c b/libgfortran/generated/dotprod_c8.c
index cf22c377cf6..41324c5b39d 100644
--- a/libgfortran/generated/dotprod_c8.c
+++ b/libgfortran/generated/dotprod_c8.c
@@ -27,12 +27,12 @@ Boston, MA 02111-1307, USA.  */
 
 typedef GFC_ARRAY_DESCRIPTOR(GFC_MAX_DIMENSIONS, char) char_array;
 
-extern GFC_COMPLEX_8 __dot_product_c8 (gfc_array_c8 * a, gfc_array_c8 * b);
-export_proto_np(__dot_product_c8);
+extern GFC_COMPLEX_8 dot_product_c8 (gfc_array_c8 * a, gfc_array_c8 * b);
+export_proto(dot_product_c8);
 
 /* Both parameters will already have been converted to the result type.  */
 GFC_COMPLEX_8
-__dot_product_c8 (gfc_array_c8 * a, gfc_array_c8 * b)
+dot_product_c8 (gfc_array_c8 * a, gfc_array_c8 * b)
 {
   GFC_COMPLEX_8 *pa;
   GFC_COMPLEX_8 *pb;
diff --git a/libgfortran/generated/dotprod_i4.c b/libgfortran/generated/dotprod_i4.c
index c0d67264c41..6cfe6b7dc69 100644
--- a/libgfortran/generated/dotprod_i4.c
+++ b/libgfortran/generated/dotprod_i4.c
@@ -26,12 +26,12 @@ Boston, MA 02111-1307, USA.  */
 
 typedef GFC_ARRAY_DESCRIPTOR(GFC_MAX_DIMENSIONS, char) char_array;
 
-extern GFC_INTEGER_4 __dot_product_i4 (gfc_array_i4 * a, gfc_array_i4 * b);
-export_proto_np(__dot_product_i4);
+extern GFC_INTEGER_4 dot_product_i4 (gfc_array_i4 * a, gfc_array_i4 * b);
+export_proto(dot_product_i4);
 
 /* Both parameters will already have been converted to the result type.  */
 GFC_INTEGER_4
-__dot_product_i4 (gfc_array_i4 * a, gfc_array_i4 * b)
+dot_product_i4 (gfc_array_i4 * a, gfc_array_i4 * b)
 {
   GFC_INTEGER_4 *pa;
   GFC_INTEGER_4 *pb;
diff --git a/libgfortran/generated/dotprod_i8.c b/libgfortran/generated/dotprod_i8.c
index 57224318f67..f041780663b 100644
--- a/libgfortran/generated/dotprod_i8.c
+++ b/libgfortran/generated/dotprod_i8.c
@@ -26,12 +26,12 @@ Boston, MA 02111-1307, USA.  */
 
 typedef GFC_ARRAY_DESCRIPTOR(GFC_MAX_DIMENSIONS, char) char_array;
 
-extern GFC_INTEGER_8 __dot_product_i8 (gfc_array_i8 * a, gfc_array_i8 * b);
-export_proto_np(__dot_product_i8);
+extern GFC_INTEGER_8 dot_product_i8 (gfc_array_i8 * a, gfc_array_i8 * b);
+export_proto(dot_product_i8);
 
 /* Both parameters will already have been converted to the result type.  */
 GFC_INTEGER_8
-__dot_product_i8 (gfc_array_i8 * a, gfc_array_i8 * b)
+dot_product_i8 (gfc_array_i8 * a, gfc_array_i8 * b)
 {
   GFC_INTEGER_8 *pa;
   GFC_INTEGER_8 *pb;
diff --git a/libgfortran/generated/dotprod_l4.c b/libgfortran/generated/dotprod_l4.c
index 6248c9c5b2f..437347c88e6 100644
--- a/libgfortran/generated/dotprod_l4.c
+++ b/libgfortran/generated/dotprod_l4.c
@@ -24,11 +24,11 @@ Boston, MA 02111-1307, USA.  */
 #include <assert.h>
 #include "libgfortran.h"
 
-extern GFC_LOGICAL_4 __dot_product_l4 (gfc_array_l4 *, gfc_array_l4 *);
-export_proto_np(__dot_product_l4);
+extern GFC_LOGICAL_4 dot_product_l4 (gfc_array_l4 *, gfc_array_l4 *);
+export_proto(dot_product_l4);
 
 GFC_LOGICAL_4
-__dot_product_l4 (gfc_array_l4 * a, gfc_array_l4 * b)
+dot_product_l4 (gfc_array_l4 * a, gfc_array_l4 * b)
 {
   GFC_LOGICAL_4 *pa;
   GFC_LOGICAL_4 *pb;
diff --git a/libgfortran/generated/dotprod_l8.c b/libgfortran/generated/dotprod_l8.c
index 708628883ad..b553ea22528 100644
--- a/libgfortran/generated/dotprod_l8.c
+++ b/libgfortran/generated/dotprod_l8.c
@@ -24,11 +24,11 @@ Boston, MA 02111-1307, USA.  */
 #include <assert.h>
 #include "libgfortran.h"
 
-extern GFC_LOGICAL_8 __dot_product_l8 (gfc_array_l4 *, gfc_array_l4 *);
-export_proto_np(__dot_product_l8);
+extern GFC_LOGICAL_8 dot_product_l8 (gfc_array_l4 *, gfc_array_l4 *);
+export_proto(dot_product_l8);
 
 GFC_LOGICAL_8
-__dot_product_l8 (gfc_array_l4 * a, gfc_array_l4 * b)
+dot_product_l8 (gfc_array_l4 * a, gfc_array_l4 * b)
 {
   GFC_LOGICAL_4 *pa;
   GFC_LOGICAL_4 *pb;
diff --git a/libgfortran/generated/dotprod_r4.c b/libgfortran/generated/dotprod_r4.c
index 801e43e808d..9a731a69d10 100644
--- a/libgfortran/generated/dotprod_r4.c
+++ b/libgfortran/generated/dotprod_r4.c
@@ -26,12 +26,12 @@ Boston, MA 02111-1307, USA.  */
 
 typedef GFC_ARRAY_DESCRIPTOR(GFC_MAX_DIMENSIONS, char) char_array;
 
-extern GFC_REAL_4 __dot_product_r4 (gfc_array_r4 * a, gfc_array_r4 * b);
-export_proto_np(__dot_product_r4);
+extern GFC_REAL_4 dot_product_r4 (gfc_array_r4 * a, gfc_array_r4 * b);
+export_proto(dot_product_r4);
 
 /* Both parameters will already have been converted to the result type.  */
 GFC_REAL_4
-__dot_product_r4 (gfc_array_r4 * a, gfc_array_r4 * b)
+dot_product_r4 (gfc_array_r4 * a, gfc_array_r4 * b)
 {
   GFC_REAL_4 *pa;
   GFC_REAL_4 *pb;
diff --git a/libgfortran/generated/dotprod_r8.c b/libgfortran/generated/dotprod_r8.c
index edde2b2a69b..0b251e319cf 100644
--- a/libgfortran/generated/dotprod_r8.c
+++ b/libgfortran/generated/dotprod_r8.c
@@ -26,12 +26,12 @@ Boston, MA 02111-1307, USA.  */
 
 typedef GFC_ARRAY_DESCRIPTOR(GFC_MAX_DIMENSIONS, char) char_array;
 
-extern GFC_REAL_8 __dot_product_r8 (gfc_array_r8 * a, gfc_array_r8 * b);
-export_proto_np(__dot_product_r8);
+extern GFC_REAL_8 dot_product_r8 (gfc_array_r8 * a, gfc_array_r8 * b);
+export_proto(dot_product_r8);
 
 /* Both parameters will already have been converted to the result type.  */
 GFC_REAL_8
-__dot_product_r8 (gfc_array_r8 * a, gfc_array_r8 * b)
+dot_product_r8 (gfc_array_r8 * a, gfc_array_r8 * b)
 {
   GFC_REAL_8 *pa;
   GFC_REAL_8 *pb;
diff --git a/libgfortran/generated/eoshift1_4.c b/libgfortran/generated/eoshift1_4.c
index aaccb54c007..c99e27c371a 100644
--- a/libgfortran/generated/eoshift1_4.c
+++ b/libgfortran/generated/eoshift1_4.c
@@ -28,17 +28,17 @@ Boston, MA 02111-1307, USA.  */
 static const char zeros[16] =
   {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 
-extern void __eoshift1_4 (const gfc_array_char *,
+extern void eoshift1_4 (const gfc_array_char *,
 				     const gfc_array_char *,
 				     const gfc_array_i4 *, const char *,
 				     const GFC_INTEGER_4 *);
-export_proto_np(__eoshift1_4);
+export_proto(eoshift1_4);
 
 void
-__eoshift1_4 (const gfc_array_char *ret,
-			 const gfc_array_char *array,
-			 const gfc_array_i4 *h, const char *pbound,
-			 const GFC_INTEGER_4 *pwhich)
+eoshift1_4 (const gfc_array_char *ret,
+		       const gfc_array_char *array,
+		       const gfc_array_i4 *h, const char *pbound,
+		       const GFC_INTEGER_4 *pwhich)
 {
   /* r.* indicates the return array.  */
   index_type rstride[GFC_MAX_DIMENSIONS - 1];
diff --git a/libgfortran/generated/eoshift1_8.c b/libgfortran/generated/eoshift1_8.c
index 3f37eb8f187..bac8236536b 100644
--- a/libgfortran/generated/eoshift1_8.c
+++ b/libgfortran/generated/eoshift1_8.c
@@ -28,17 +28,17 @@ Boston, MA 02111-1307, USA.  */
 static const char zeros[16] =
   {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 
-extern void __eoshift1_8 (const gfc_array_char *,
+extern void eoshift1_8 (const gfc_array_char *,
 				     const gfc_array_char *,
 				     const gfc_array_i8 *, const char *,
 				     const GFC_INTEGER_8 *);
-export_proto_np(__eoshift1_8);
+export_proto(eoshift1_8);
 
 void
-__eoshift1_8 (const gfc_array_char *ret,
-			 const gfc_array_char *array,
-			 const gfc_array_i8 *h, const char *pbound,
-			 const GFC_INTEGER_8 *pwhich)
+eoshift1_8 (const gfc_array_char *ret,
+		       const gfc_array_char *array,
+		       const gfc_array_i8 *h, const char *pbound,
+		       const GFC_INTEGER_8 *pwhich)
 {
   /* r.* indicates the return array.  */
   index_type rstride[GFC_MAX_DIMENSIONS - 1];
diff --git a/libgfortran/generated/eoshift3_4.c b/libgfortran/generated/eoshift3_4.c
index 7609b2e127d..39903904bc2 100644
--- a/libgfortran/generated/eoshift3_4.c
+++ b/libgfortran/generated/eoshift3_4.c
@@ -28,15 +28,15 @@ Boston, MA 02111-1307, USA.  */
 static const char zeros[16] =
   {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 
-extern void __eoshift3_4 (gfc_array_char *, gfc_array_char *,
+extern void eoshift3_4 (gfc_array_char *, gfc_array_char *,
 				     gfc_array_i4 *, const gfc_array_char *,
 				     GFC_INTEGER_4 *);
-export_proto_np(__eoshift3_4);
+export_proto(eoshift3_4);
 
 void
-__eoshift3_4 (gfc_array_char *ret, gfc_array_char *array,
-			 gfc_array_i4 *h, const gfc_array_char *bound,
-			 GFC_INTEGER_4 *pwhich)
+eoshift3_4 (gfc_array_char *ret, gfc_array_char *array,
+		       gfc_array_i4 *h, const gfc_array_char *bound,
+		       GFC_INTEGER_4 *pwhich)
 {
   /* r.* indicates the return array.  */
   index_type rstride[GFC_MAX_DIMENSIONS - 1];
diff --git a/libgfortran/generated/eoshift3_8.c b/libgfortran/generated/eoshift3_8.c
index 3274bcec7ad..10bffdff0e1 100644
--- a/libgfortran/generated/eoshift3_8.c
+++ b/libgfortran/generated/eoshift3_8.c
@@ -28,15 +28,15 @@ Boston, MA 02111-1307, USA.  */
 static const char zeros[16] =
   {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 
-extern void __eoshift3_8 (gfc_array_char *, gfc_array_char *,
+extern void eoshift3_8 (gfc_array_char *, gfc_array_char *,
 				     gfc_array_i8 *, const gfc_array_char *,
 				     GFC_INTEGER_8 *);
-export_proto_np(__eoshift3_8);
+export_proto(eoshift3_8);
 
 void
-__eoshift3_8 (gfc_array_char *ret, gfc_array_char *array,
-			 gfc_array_i8 *h, const gfc_array_char *bound,
-			 GFC_INTEGER_8 *pwhich)
+eoshift3_8 (gfc_array_char *ret, gfc_array_char *array,
+		       gfc_array_i8 *h, const gfc_array_char *bound,
+		       GFC_INTEGER_8 *pwhich)
 {
   /* r.* indicates the return array.  */
   index_type rstride[GFC_MAX_DIMENSIONS - 1];
diff --git a/libgfortran/generated/matmul_c4.c b/libgfortran/generated/matmul_c4.c
index a05a3219fba..409d461babc 100644
--- a/libgfortran/generated/matmul_c4.c
+++ b/libgfortran/generated/matmul_c4.c
@@ -37,11 +37,11 @@ Boston, MA 02111-1307, USA.  */
          C(I,J) = C(I,J)+A(I,K)*B(K,J)
 */
 
-extern void __matmul_c4 (gfc_array_c4 * retarray, gfc_array_c4 * a, gfc_array_c4 * b);
-export_proto_np(__matmul_c4);
+extern void matmul_c4 (gfc_array_c4 * retarray, gfc_array_c4 * a, gfc_array_c4 * b);
+export_proto(matmul_c4);
 
 void
-__matmul_c4 (gfc_array_c4 * retarray, gfc_array_c4 * a, gfc_array_c4 * b)
+matmul_c4 (gfc_array_c4 * retarray, gfc_array_c4 * a, gfc_array_c4 * b)
 {
   GFC_COMPLEX_4 *abase;
   GFC_COMPLEX_4 *bbase;
diff --git a/libgfortran/generated/matmul_c8.c b/libgfortran/generated/matmul_c8.c
index 42833b9f6c1..a36029f63a6 100644
--- a/libgfortran/generated/matmul_c8.c
+++ b/libgfortran/generated/matmul_c8.c
@@ -37,11 +37,11 @@ Boston, MA 02111-1307, USA.  */
          C(I,J) = C(I,J)+A(I,K)*B(K,J)
 */
 
-extern void __matmul_c8 (gfc_array_c8 * retarray, gfc_array_c8 * a, gfc_array_c8 * b);
-export_proto_np(__matmul_c8);
+extern void matmul_c8 (gfc_array_c8 * retarray, gfc_array_c8 * a, gfc_array_c8 * b);
+export_proto(matmul_c8);
 
 void
-__matmul_c8 (gfc_array_c8 * retarray, gfc_array_c8 * a, gfc_array_c8 * b)
+matmul_c8 (gfc_array_c8 * retarray, gfc_array_c8 * a, gfc_array_c8 * b)
 {
   GFC_COMPLEX_8 *abase;
   GFC_COMPLEX_8 *bbase;
diff --git a/libgfortran/generated/matmul_i4.c b/libgfortran/generated/matmul_i4.c
index de8a9199d71..c25eb6b97bf 100644
--- a/libgfortran/generated/matmul_i4.c
+++ b/libgfortran/generated/matmul_i4.c
@@ -37,11 +37,11 @@ Boston, MA 02111-1307, USA.  */
          C(I,J) = C(I,J)+A(I,K)*B(K,J)
 */
 
-extern void __matmul_i4 (gfc_array_i4 * retarray, gfc_array_i4 * a, gfc_array_i4 * b);
-export_proto_np(__matmul_i4);
+extern void matmul_i4 (gfc_array_i4 * retarray, gfc_array_i4 * a, gfc_array_i4 * b);
+export_proto(matmul_i4);
 
 void
-__matmul_i4 (gfc_array_i4 * retarray, gfc_array_i4 * a, gfc_array_i4 * b)
+matmul_i4 (gfc_array_i4 * retarray, gfc_array_i4 * a, gfc_array_i4 * b)
 {
   GFC_INTEGER_4 *abase;
   GFC_INTEGER_4 *bbase;
diff --git a/libgfortran/generated/matmul_i8.c b/libgfortran/generated/matmul_i8.c
index b4831e22bd9..14b29033e3c 100644
--- a/libgfortran/generated/matmul_i8.c
+++ b/libgfortran/generated/matmul_i8.c
@@ -37,11 +37,11 @@ Boston, MA 02111-1307, USA.  */
          C(I,J) = C(I,J)+A(I,K)*B(K,J)
 */
 
-extern void __matmul_i8 (gfc_array_i8 * retarray, gfc_array_i8 * a, gfc_array_i8 * b);
-export_proto_np(__matmul_i8);
+extern void matmul_i8 (gfc_array_i8 * retarray, gfc_array_i8 * a, gfc_array_i8 * b);
+export_proto(matmul_i8);
 
 void
-__matmul_i8 (gfc_array_i8 * retarray, gfc_array_i8 * a, gfc_array_i8 * b)
+matmul_i8 (gfc_array_i8 * retarray, gfc_array_i8 * a, gfc_array_i8 * b)
 {
   GFC_INTEGER_8 *abase;
   GFC_INTEGER_8 *bbase;
diff --git a/libgfortran/generated/matmul_l4.c b/libgfortran/generated/matmul_l4.c
index 491392b7d95..3205a77626e 100644
--- a/libgfortran/generated/matmul_l4.c
+++ b/libgfortran/generated/matmul_l4.c
@@ -27,11 +27,11 @@ Boston, MA 02111-1307, USA.  */
 /* 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_l4 (gfc_array_l4 *, gfc_array_l4 *, gfc_array_l4 *);
-export_proto_np(__matmul_l4);
+extern void matmul_l4 (gfc_array_l4 *, gfc_array_l4 *, gfc_array_l4 *);
+export_proto(matmul_l4);
 
 void
-__matmul_l4 (gfc_array_l4 * retarray, gfc_array_l4 * a, gfc_array_l4 * b)
+matmul_l4 (gfc_array_l4 * retarray, gfc_array_l4 * a, gfc_array_l4 * b)
 {
   GFC_INTEGER_4 *abase;
   GFC_INTEGER_4 *bbase;
diff --git a/libgfortran/generated/matmul_l8.c b/libgfortran/generated/matmul_l8.c
index 2a479e7bbd4..4710891b508 100644
--- a/libgfortran/generated/matmul_l8.c
+++ b/libgfortran/generated/matmul_l8.c
@@ -27,11 +27,11 @@ Boston, MA 02111-1307, USA.  */
 /* 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_l8 (gfc_array_l8 *, gfc_array_l4 *, gfc_array_l4 *);
-export_proto_np(__matmul_l8);
+extern void matmul_l8 (gfc_array_l8 *, gfc_array_l4 *, gfc_array_l4 *);
+export_proto(matmul_l8);
 
 void
-__matmul_l8 (gfc_array_l8 * retarray, gfc_array_l4 * a, gfc_array_l4 * b)
+matmul_l8 (gfc_array_l8 * retarray, gfc_array_l4 * a, gfc_array_l4 * b)
 {
   GFC_INTEGER_4 *abase;
   GFC_INTEGER_4 *bbase;
diff --git a/libgfortran/generated/matmul_r4.c b/libgfortran/generated/matmul_r4.c
index b12a8a48719..fbff32f4ebf 100644
--- a/libgfortran/generated/matmul_r4.c
+++ b/libgfortran/generated/matmul_r4.c
@@ -37,11 +37,11 @@ Boston, MA 02111-1307, USA.  */
          C(I,J) = C(I,J)+A(I,K)*B(K,J)
 */
 
-extern void __matmul_r4 (gfc_array_r4 * retarray, gfc_array_r4 * a, gfc_array_r4 * b);
-export_proto_np(__matmul_r4);
+extern void matmul_r4 (gfc_array_r4 * retarray, gfc_array_r4 * a, gfc_array_r4 * b);
+export_proto(matmul_r4);
 
 void
-__matmul_r4 (gfc_array_r4 * retarray, gfc_array_r4 * a, gfc_array_r4 * b)
+matmul_r4 (gfc_array_r4 * retarray, gfc_array_r4 * a, gfc_array_r4 * b)
 {
   GFC_REAL_4 *abase;
   GFC_REAL_4 *bbase;
diff --git a/libgfortran/generated/matmul_r8.c b/libgfortran/generated/matmul_r8.c
index b0c45c0726a..d7634ea2f0d 100644
--- a/libgfortran/generated/matmul_r8.c
+++ b/libgfortran/generated/matmul_r8.c
@@ -37,11 +37,11 @@ Boston, MA 02111-1307, USA.  */
          C(I,J) = C(I,J)+A(I,K)*B(K,J)
 */
 
-extern void __matmul_r8 (gfc_array_r8 * retarray, gfc_array_r8 * a, gfc_array_r8 * b);
-export_proto_np(__matmul_r8);
+extern void matmul_r8 (gfc_array_r8 * retarray, gfc_array_r8 * a, gfc_array_r8 * b);
+export_proto(matmul_r8);
 
 void
-__matmul_r8 (gfc_array_r8 * retarray, gfc_array_r8 * a, gfc_array_r8 * b)
+matmul_r8 (gfc_array_r8 * retarray, gfc_array_r8 * a, gfc_array_r8 * b)
 {
   GFC_REAL_8 *abase;
   GFC_REAL_8 *bbase;
diff --git a/libgfortran/generated/maxloc0_4_i4.c b/libgfortran/generated/maxloc0_4_i4.c
index aa7d42841f6..6ac1ebf3501 100644
--- a/libgfortran/generated/maxloc0_4_i4.c
+++ b/libgfortran/generated/maxloc0_4_i4.c
@@ -28,11 +28,11 @@ Boston, MA 02111-1307, USA.  */
 
 
 
-extern void __maxloc0_4_i4 (gfc_array_i4 * retarray, gfc_array_i4 *array);
-export_proto_np(__maxloc0_4_i4);
+extern void maxloc0_4_i4 (gfc_array_i4 * retarray, gfc_array_i4 *array);
+export_proto(maxloc0_4_i4);
 
 void
-__maxloc0_4_i4 (gfc_array_i4 * retarray, gfc_array_i4 *array)
+maxloc0_4_i4 (gfc_array_i4 * retarray, gfc_array_i4 *array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -122,11 +122,12 @@ __maxloc0_4_i4 (gfc_array_i4 * retarray, gfc_array_i4 *array)
 }
 
 
-extern void __mmaxloc0_4_i4 (gfc_array_i4 *, gfc_array_i4 *, gfc_array_l4 *);
-export_proto_np(__mmaxloc0_4_i4);
+extern void mmaxloc0_4_i4 (gfc_array_i4 *, gfc_array_i4 *, gfc_array_l4 *);
+export_proto(mmaxloc0_4_i4);
 
 void
-__mmaxloc0_4_i4 (gfc_array_i4 * retarray, gfc_array_i4 *array, gfc_array_l4 * mask)
+mmaxloc0_4_i4 (gfc_array_i4 * retarray, gfc_array_i4 *array,
+				  gfc_array_l4 * mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
diff --git a/libgfortran/generated/maxloc0_4_i8.c b/libgfortran/generated/maxloc0_4_i8.c
index 100910eec09..44783a7804f 100644
--- a/libgfortran/generated/maxloc0_4_i8.c
+++ b/libgfortran/generated/maxloc0_4_i8.c
@@ -28,11 +28,11 @@ Boston, MA 02111-1307, USA.  */
 
 
 
-extern void __maxloc0_4_i8 (gfc_array_i4 * retarray, gfc_array_i8 *array);
-export_proto_np(__maxloc0_4_i8);
+extern void maxloc0_4_i8 (gfc_array_i4 * retarray, gfc_array_i8 *array);
+export_proto(maxloc0_4_i8);
 
 void
-__maxloc0_4_i8 (gfc_array_i4 * retarray, gfc_array_i8 *array)
+maxloc0_4_i8 (gfc_array_i4 * retarray, gfc_array_i8 *array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -122,11 +122,12 @@ __maxloc0_4_i8 (gfc_array_i4 * retarray, gfc_array_i8 *array)
 }
 
 
-extern void __mmaxloc0_4_i8 (gfc_array_i4 *, gfc_array_i8 *, gfc_array_l4 *);
-export_proto_np(__mmaxloc0_4_i8);
+extern void mmaxloc0_4_i8 (gfc_array_i4 *, gfc_array_i8 *, gfc_array_l4 *);
+export_proto(mmaxloc0_4_i8);
 
 void
-__mmaxloc0_4_i8 (gfc_array_i4 * retarray, gfc_array_i8 *array, gfc_array_l4 * mask)
+mmaxloc0_4_i8 (gfc_array_i4 * retarray, gfc_array_i8 *array,
+				  gfc_array_l4 * mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
diff --git a/libgfortran/generated/maxloc0_4_r4.c b/libgfortran/generated/maxloc0_4_r4.c
index 0b75c05aa3f..4665b691b66 100644
--- a/libgfortran/generated/maxloc0_4_r4.c
+++ b/libgfortran/generated/maxloc0_4_r4.c
@@ -28,11 +28,11 @@ Boston, MA 02111-1307, USA.  */
 
 
 
-extern void __maxloc0_4_r4 (gfc_array_i4 * retarray, gfc_array_r4 *array);
-export_proto_np(__maxloc0_4_r4);
+extern void maxloc0_4_r4 (gfc_array_i4 * retarray, gfc_array_r4 *array);
+export_proto(maxloc0_4_r4);
 
 void
-__maxloc0_4_r4 (gfc_array_i4 * retarray, gfc_array_r4 *array)
+maxloc0_4_r4 (gfc_array_i4 * retarray, gfc_array_r4 *array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -122,11 +122,12 @@ __maxloc0_4_r4 (gfc_array_i4 * retarray, gfc_array_r4 *array)
 }
 
 
-extern void __mmaxloc0_4_r4 (gfc_array_i4 *, gfc_array_r4 *, gfc_array_l4 *);
-export_proto_np(__mmaxloc0_4_r4);
+extern void mmaxloc0_4_r4 (gfc_array_i4 *, gfc_array_r4 *, gfc_array_l4 *);
+export_proto(mmaxloc0_4_r4);
 
 void
-__mmaxloc0_4_r4 (gfc_array_i4 * retarray, gfc_array_r4 *array, gfc_array_l4 * mask)
+mmaxloc0_4_r4 (gfc_array_i4 * retarray, gfc_array_r4 *array,
+				  gfc_array_l4 * mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
diff --git a/libgfortran/generated/maxloc0_4_r8.c b/libgfortran/generated/maxloc0_4_r8.c
index 1463d8062ce..af3c7a57ebf 100644
--- a/libgfortran/generated/maxloc0_4_r8.c
+++ b/libgfortran/generated/maxloc0_4_r8.c
@@ -28,11 +28,11 @@ Boston, MA 02111-1307, USA.  */
 
 
 
-extern void __maxloc0_4_r8 (gfc_array_i4 * retarray, gfc_array_r8 *array);
-export_proto_np(__maxloc0_4_r8);
+extern void maxloc0_4_r8 (gfc_array_i4 * retarray, gfc_array_r8 *array);
+export_proto(maxloc0_4_r8);
 
 void
-__maxloc0_4_r8 (gfc_array_i4 * retarray, gfc_array_r8 *array)
+maxloc0_4_r8 (gfc_array_i4 * retarray, gfc_array_r8 *array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -122,11 +122,12 @@ __maxloc0_4_r8 (gfc_array_i4 * retarray, gfc_array_r8 *array)
 }
 
 
-extern void __mmaxloc0_4_r8 (gfc_array_i4 *, gfc_array_r8 *, gfc_array_l4 *);
-export_proto_np(__mmaxloc0_4_r8);
+extern void mmaxloc0_4_r8 (gfc_array_i4 *, gfc_array_r8 *, gfc_array_l4 *);
+export_proto(mmaxloc0_4_r8);
 
 void
-__mmaxloc0_4_r8 (gfc_array_i4 * retarray, gfc_array_r8 *array, gfc_array_l4 * mask)
+mmaxloc0_4_r8 (gfc_array_i4 * retarray, gfc_array_r8 *array,
+				  gfc_array_l4 * mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
diff --git a/libgfortran/generated/maxloc0_8_i4.c b/libgfortran/generated/maxloc0_8_i4.c
index 822ddd06d34..6e5a299d7fc 100644
--- a/libgfortran/generated/maxloc0_8_i4.c
+++ b/libgfortran/generated/maxloc0_8_i4.c
@@ -28,11 +28,11 @@ Boston, MA 02111-1307, USA.  */
 
 
 
-extern void __maxloc0_8_i4 (gfc_array_i8 * retarray, gfc_array_i4 *array);
-export_proto_np(__maxloc0_8_i4);
+extern void maxloc0_8_i4 (gfc_array_i8 * retarray, gfc_array_i4 *array);
+export_proto(maxloc0_8_i4);
 
 void
-__maxloc0_8_i4 (gfc_array_i8 * retarray, gfc_array_i4 *array)
+maxloc0_8_i4 (gfc_array_i8 * retarray, gfc_array_i4 *array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -122,11 +122,12 @@ __maxloc0_8_i4 (gfc_array_i8 * retarray, gfc_array_i4 *array)
 }
 
 
-extern void __mmaxloc0_8_i4 (gfc_array_i8 *, gfc_array_i4 *, gfc_array_l4 *);
-export_proto_np(__mmaxloc0_8_i4);
+extern void mmaxloc0_8_i4 (gfc_array_i8 *, gfc_array_i4 *, gfc_array_l4 *);
+export_proto(mmaxloc0_8_i4);
 
 void
-__mmaxloc0_8_i4 (gfc_array_i8 * retarray, gfc_array_i4 *array, gfc_array_l4 * mask)
+mmaxloc0_8_i4 (gfc_array_i8 * retarray, gfc_array_i4 *array,
+				  gfc_array_l4 * mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
diff --git a/libgfortran/generated/maxloc0_8_i8.c b/libgfortran/generated/maxloc0_8_i8.c
index 8a4ed813fb8..5b8f7663246 100644
--- a/libgfortran/generated/maxloc0_8_i8.c
+++ b/libgfortran/generated/maxloc0_8_i8.c
@@ -28,11 +28,11 @@ Boston, MA 02111-1307, USA.  */
 
 
 
-extern void __maxloc0_8_i8 (gfc_array_i8 * retarray, gfc_array_i8 *array);
-export_proto_np(__maxloc0_8_i8);
+extern void maxloc0_8_i8 (gfc_array_i8 * retarray, gfc_array_i8 *array);
+export_proto(maxloc0_8_i8);
 
 void
-__maxloc0_8_i8 (gfc_array_i8 * retarray, gfc_array_i8 *array)
+maxloc0_8_i8 (gfc_array_i8 * retarray, gfc_array_i8 *array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -122,11 +122,12 @@ __maxloc0_8_i8 (gfc_array_i8 * retarray, gfc_array_i8 *array)
 }
 
 
-extern void __mmaxloc0_8_i8 (gfc_array_i8 *, gfc_array_i8 *, gfc_array_l4 *);
-export_proto_np(__mmaxloc0_8_i8);
+extern void mmaxloc0_8_i8 (gfc_array_i8 *, gfc_array_i8 *, gfc_array_l4 *);
+export_proto(mmaxloc0_8_i8);
 
 void
-__mmaxloc0_8_i8 (gfc_array_i8 * retarray, gfc_array_i8 *array, gfc_array_l4 * mask)
+mmaxloc0_8_i8 (gfc_array_i8 * retarray, gfc_array_i8 *array,
+				  gfc_array_l4 * mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
diff --git a/libgfortran/generated/maxloc0_8_r4.c b/libgfortran/generated/maxloc0_8_r4.c
index 73a3e2d75b1..50efd99778a 100644
--- a/libgfortran/generated/maxloc0_8_r4.c
+++ b/libgfortran/generated/maxloc0_8_r4.c
@@ -28,11 +28,11 @@ Boston, MA 02111-1307, USA.  */
 
 
 
-extern void __maxloc0_8_r4 (gfc_array_i8 * retarray, gfc_array_r4 *array);
-export_proto_np(__maxloc0_8_r4);
+extern void maxloc0_8_r4 (gfc_array_i8 * retarray, gfc_array_r4 *array);
+export_proto(maxloc0_8_r4);
 
 void
-__maxloc0_8_r4 (gfc_array_i8 * retarray, gfc_array_r4 *array)
+maxloc0_8_r4 (gfc_array_i8 * retarray, gfc_array_r4 *array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -122,11 +122,12 @@ __maxloc0_8_r4 (gfc_array_i8 * retarray, gfc_array_r4 *array)
 }
 
 
-extern void __mmaxloc0_8_r4 (gfc_array_i8 *, gfc_array_r4 *, gfc_array_l4 *);
-export_proto_np(__mmaxloc0_8_r4);
+extern void mmaxloc0_8_r4 (gfc_array_i8 *, gfc_array_r4 *, gfc_array_l4 *);
+export_proto(mmaxloc0_8_r4);
 
 void
-__mmaxloc0_8_r4 (gfc_array_i8 * retarray, gfc_array_r4 *array, gfc_array_l4 * mask)
+mmaxloc0_8_r4 (gfc_array_i8 * retarray, gfc_array_r4 *array,
+				  gfc_array_l4 * mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
diff --git a/libgfortran/generated/maxloc0_8_r8.c b/libgfortran/generated/maxloc0_8_r8.c
index cc3e8d5dc2e..d355893c844 100644
--- a/libgfortran/generated/maxloc0_8_r8.c
+++ b/libgfortran/generated/maxloc0_8_r8.c
@@ -28,11 +28,11 @@ Boston, MA 02111-1307, USA.  */
 
 
 
-extern void __maxloc0_8_r8 (gfc_array_i8 * retarray, gfc_array_r8 *array);
-export_proto_np(__maxloc0_8_r8);
+extern void maxloc0_8_r8 (gfc_array_i8 * retarray, gfc_array_r8 *array);
+export_proto(maxloc0_8_r8);
 
 void
-__maxloc0_8_r8 (gfc_array_i8 * retarray, gfc_array_r8 *array)
+maxloc0_8_r8 (gfc_array_i8 * retarray, gfc_array_r8 *array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -122,11 +122,12 @@ __maxloc0_8_r8 (gfc_array_i8 * retarray, gfc_array_r8 *array)
 }
 
 
-extern void __mmaxloc0_8_r8 (gfc_array_i8 *, gfc_array_r8 *, gfc_array_l4 *);
-export_proto_np(__mmaxloc0_8_r8);
+extern void mmaxloc0_8_r8 (gfc_array_i8 *, gfc_array_r8 *, gfc_array_l4 *);
+export_proto(mmaxloc0_8_r8);
 
 void
-__mmaxloc0_8_r8 (gfc_array_i8 * retarray, gfc_array_r8 *array, gfc_array_l4 * mask)
+mmaxloc0_8_r8 (gfc_array_i8 * retarray, gfc_array_r8 *array,
+				  gfc_array_l4 * mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
diff --git a/libgfortran/generated/maxloc1_4_i4.c b/libgfortran/generated/maxloc1_4_i4.c
index 7905c017934..197ab597b71 100644
--- a/libgfortran/generated/maxloc1_4_i4.c
+++ b/libgfortran/generated/maxloc1_4_i4.c
@@ -27,11 +27,11 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"
 
 
-extern void __maxloc1_4_i4 (gfc_array_i4 *, gfc_array_i4 *, index_type *);
-export_proto_np(__maxloc1_4_i4);
+extern void maxloc1_4_i4 (gfc_array_i4 *, gfc_array_i4 *, index_type *);
+export_proto(maxloc1_4_i4);
 
 void
-__maxloc1_4_i4 (gfc_array_i4 *retarray, gfc_array_i4 *array, index_type *pdim)
+maxloc1_4_i4 (gfc_array_i4 *retarray, gfc_array_i4 *array, index_type *pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS - 1];
   index_type extent[GFC_MAX_DIMENSIONS - 1];
@@ -157,12 +157,13 @@ __maxloc1_4_i4 (gfc_array_i4 *retarray, gfc_array_i4 *array, index_type *pdim)
 }
 
 
-extern void __mmaxloc1_4_i4 (gfc_array_i4 *, gfc_array_i4 *, index_type *,
-						gfc_array_l4 *);
-export_proto_np(__mmaxloc1_4_i4);
+extern void mmaxloc1_4_i4 (gfc_array_i4 *, gfc_array_i4 *, index_type *,
+					       gfc_array_l4 *);
+export_proto(mmaxloc1_4_i4);
 
 void
-__mmaxloc1_4_i4 (gfc_array_i4 * retarray, gfc_array_i4 * array, index_type *pdim, gfc_array_l4 * mask)
+mmaxloc1_4_i4 (gfc_array_i4 * retarray, gfc_array_i4 * 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/generated/maxloc1_4_i8.c b/libgfortran/generated/maxloc1_4_i8.c
index a08cb037b53..9c8d057463c 100644
--- a/libgfortran/generated/maxloc1_4_i8.c
+++ b/libgfortran/generated/maxloc1_4_i8.c
@@ -27,11 +27,11 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"
 
 
-extern void __maxloc1_4_i8 (gfc_array_i4 *, gfc_array_i8 *, index_type *);
-export_proto_np(__maxloc1_4_i8);
+extern void maxloc1_4_i8 (gfc_array_i4 *, gfc_array_i8 *, index_type *);
+export_proto(maxloc1_4_i8);
 
 void
-__maxloc1_4_i8 (gfc_array_i4 *retarray, gfc_array_i8 *array, index_type *pdim)
+maxloc1_4_i8 (gfc_array_i4 *retarray, gfc_array_i8 *array, index_type *pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS - 1];
   index_type extent[GFC_MAX_DIMENSIONS - 1];
@@ -157,12 +157,13 @@ __maxloc1_4_i8 (gfc_array_i4 *retarray, gfc_array_i8 *array, index_type *pdim)
 }
 
 
-extern void __mmaxloc1_4_i8 (gfc_array_i4 *, gfc_array_i8 *, index_type *,
-						gfc_array_l4 *);
-export_proto_np(__mmaxloc1_4_i8);
+extern void mmaxloc1_4_i8 (gfc_array_i4 *, gfc_array_i8 *, index_type *,
+					       gfc_array_l4 *);
+export_proto(mmaxloc1_4_i8);
 
 void
-__mmaxloc1_4_i8 (gfc_array_i4 * retarray, gfc_array_i8 * array, index_type *pdim, gfc_array_l4 * mask)
+mmaxloc1_4_i8 (gfc_array_i4 * retarray, gfc_array_i8 * 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/generated/maxloc1_4_r4.c b/libgfortran/generated/maxloc1_4_r4.c
index 5c5c3af2cc0..688809e072d 100644
--- a/libgfortran/generated/maxloc1_4_r4.c
+++ b/libgfortran/generated/maxloc1_4_r4.c
@@ -27,11 +27,11 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"
 
 
-extern void __maxloc1_4_r4 (gfc_array_i4 *, gfc_array_r4 *, index_type *);
-export_proto_np(__maxloc1_4_r4);
+extern void maxloc1_4_r4 (gfc_array_i4 *, gfc_array_r4 *, index_type *);
+export_proto(maxloc1_4_r4);
 
 void
-__maxloc1_4_r4 (gfc_array_i4 *retarray, gfc_array_r4 *array, index_type *pdim)
+maxloc1_4_r4 (gfc_array_i4 *retarray, gfc_array_r4 *array, index_type *pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS - 1];
   index_type extent[GFC_MAX_DIMENSIONS - 1];
@@ -157,12 +157,13 @@ __maxloc1_4_r4 (gfc_array_i4 *retarray, gfc_array_r4 *array, index_type *pdim)
 }
 
 
-extern void __mmaxloc1_4_r4 (gfc_array_i4 *, gfc_array_r4 *, index_type *,
-						gfc_array_l4 *);
-export_proto_np(__mmaxloc1_4_r4);
+extern void mmaxloc1_4_r4 (gfc_array_i4 *, gfc_array_r4 *, index_type *,
+					       gfc_array_l4 *);
+export_proto(mmaxloc1_4_r4);
 
 void
-__mmaxloc1_4_r4 (gfc_array_i4 * retarray, gfc_array_r4 * array, index_type *pdim, gfc_array_l4 * mask)
+mmaxloc1_4_r4 (gfc_array_i4 * retarray, gfc_array_r4 * 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/generated/maxloc1_4_r8.c b/libgfortran/generated/maxloc1_4_r8.c
index 665c5b5dcaf..eb71efcaffa 100644
--- a/libgfortran/generated/maxloc1_4_r8.c
+++ b/libgfortran/generated/maxloc1_4_r8.c
@@ -27,11 +27,11 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"
 
 
-extern void __maxloc1_4_r8 (gfc_array_i4 *, gfc_array_r8 *, index_type *);
-export_proto_np(__maxloc1_4_r8);
+extern void maxloc1_4_r8 (gfc_array_i4 *, gfc_array_r8 *, index_type *);
+export_proto(maxloc1_4_r8);
 
 void
-__maxloc1_4_r8 (gfc_array_i4 *retarray, gfc_array_r8 *array, index_type *pdim)
+maxloc1_4_r8 (gfc_array_i4 *retarray, gfc_array_r8 *array, index_type *pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS - 1];
   index_type extent[GFC_MAX_DIMENSIONS - 1];
@@ -157,12 +157,13 @@ __maxloc1_4_r8 (gfc_array_i4 *retarray, gfc_array_r8 *array, index_type *pdim)
 }
 
 
-extern void __mmaxloc1_4_r8 (gfc_array_i4 *, gfc_array_r8 *, index_type *,
-						gfc_array_l4 *);
-export_proto_np(__mmaxloc1_4_r8);
+extern void mmaxloc1_4_r8 (gfc_array_i4 *, gfc_array_r8 *, index_type *,
+					       gfc_array_l4 *);
+export_proto(mmaxloc1_4_r8);
 
 void
-__mmaxloc1_4_r8 (gfc_array_i4 * retarray, gfc_array_r8 * array, index_type *pdim, gfc_array_l4 * mask)
+mmaxloc1_4_r8 (gfc_array_i4 * retarray, gfc_array_r8 * 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/generated/maxloc1_8_i4.c b/libgfortran/generated/maxloc1_8_i4.c
index dc11e701bb5..2e171ba32fe 100644
--- a/libgfortran/generated/maxloc1_8_i4.c
+++ b/libgfortran/generated/maxloc1_8_i4.c
@@ -27,11 +27,11 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"
 
 
-extern void __maxloc1_8_i4 (gfc_array_i8 *, gfc_array_i4 *, index_type *);
-export_proto_np(__maxloc1_8_i4);
+extern void maxloc1_8_i4 (gfc_array_i8 *, gfc_array_i4 *, index_type *);
+export_proto(maxloc1_8_i4);
 
 void
-__maxloc1_8_i4 (gfc_array_i8 *retarray, gfc_array_i4 *array, index_type *pdim)
+maxloc1_8_i4 (gfc_array_i8 *retarray, gfc_array_i4 *array, index_type *pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS - 1];
   index_type extent[GFC_MAX_DIMENSIONS - 1];
@@ -157,12 +157,13 @@ __maxloc1_8_i4 (gfc_array_i8 *retarray, gfc_array_i4 *array, index_type *pdim)
 }
 
 
-extern void __mmaxloc1_8_i4 (gfc_array_i8 *, gfc_array_i4 *, index_type *,
-						gfc_array_l4 *);
-export_proto_np(__mmaxloc1_8_i4);
+extern void mmaxloc1_8_i4 (gfc_array_i8 *, gfc_array_i4 *, index_type *,
+					       gfc_array_l4 *);
+export_proto(mmaxloc1_8_i4);
 
 void
-__mmaxloc1_8_i4 (gfc_array_i8 * retarray, gfc_array_i4 * array, index_type *pdim, gfc_array_l4 * mask)
+mmaxloc1_8_i4 (gfc_array_i8 * retarray, gfc_array_i4 * 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/generated/maxloc1_8_i8.c b/libgfortran/generated/maxloc1_8_i8.c
index 68dd21f0491..4615125d1be 100644
--- a/libgfortran/generated/maxloc1_8_i8.c
+++ b/libgfortran/generated/maxloc1_8_i8.c
@@ -27,11 +27,11 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"
 
 
-extern void __maxloc1_8_i8 (gfc_array_i8 *, gfc_array_i8 *, index_type *);
-export_proto_np(__maxloc1_8_i8);
+extern void maxloc1_8_i8 (gfc_array_i8 *, gfc_array_i8 *, index_type *);
+export_proto(maxloc1_8_i8);
 
 void
-__maxloc1_8_i8 (gfc_array_i8 *retarray, gfc_array_i8 *array, index_type *pdim)
+maxloc1_8_i8 (gfc_array_i8 *retarray, gfc_array_i8 *array, index_type *pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS - 1];
   index_type extent[GFC_MAX_DIMENSIONS - 1];
@@ -157,12 +157,13 @@ __maxloc1_8_i8 (gfc_array_i8 *retarray, gfc_array_i8 *array, index_type *pdim)
 }
 
 
-extern void __mmaxloc1_8_i8 (gfc_array_i8 *, gfc_array_i8 *, index_type *,
-						gfc_array_l4 *);
-export_proto_np(__mmaxloc1_8_i8);
+extern void mmaxloc1_8_i8 (gfc_array_i8 *, gfc_array_i8 *, index_type *,
+					       gfc_array_l4 *);
+export_proto(mmaxloc1_8_i8);
 
 void
-__mmaxloc1_8_i8 (gfc_array_i8 * retarray, gfc_array_i8 * array, index_type *pdim, gfc_array_l4 * mask)
+mmaxloc1_8_i8 (gfc_array_i8 * retarray, gfc_array_i8 * 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/generated/maxloc1_8_r4.c b/libgfortran/generated/maxloc1_8_r4.c
index adeac9a35a5..4d7f93cbd30 100644
--- a/libgfortran/generated/maxloc1_8_r4.c
+++ b/libgfortran/generated/maxloc1_8_r4.c
@@ -27,11 +27,11 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"
 
 
-extern void __maxloc1_8_r4 (gfc_array_i8 *, gfc_array_r4 *, index_type *);
-export_proto_np(__maxloc1_8_r4);
+extern void maxloc1_8_r4 (gfc_array_i8 *, gfc_array_r4 *, index_type *);
+export_proto(maxloc1_8_r4);
 
 void
-__maxloc1_8_r4 (gfc_array_i8 *retarray, gfc_array_r4 *array, index_type *pdim)
+maxloc1_8_r4 (gfc_array_i8 *retarray, gfc_array_r4 *array, index_type *pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS - 1];
   index_type extent[GFC_MAX_DIMENSIONS - 1];
@@ -157,12 +157,13 @@ __maxloc1_8_r4 (gfc_array_i8 *retarray, gfc_array_r4 *array, index_type *pdim)
 }
 
 
-extern void __mmaxloc1_8_r4 (gfc_array_i8 *, gfc_array_r4 *, index_type *,
-						gfc_array_l4 *);
-export_proto_np(__mmaxloc1_8_r4);
+extern void mmaxloc1_8_r4 (gfc_array_i8 *, gfc_array_r4 *, index_type *,
+					       gfc_array_l4 *);
+export_proto(mmaxloc1_8_r4);
 
 void
-__mmaxloc1_8_r4 (gfc_array_i8 * retarray, gfc_array_r4 * array, index_type *pdim, gfc_array_l4 * mask)
+mmaxloc1_8_r4 (gfc_array_i8 * retarray, gfc_array_r4 * 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/generated/maxloc1_8_r8.c b/libgfortran/generated/maxloc1_8_r8.c
index 82e754c36e4..53a3b6e3b9a 100644
--- a/libgfortran/generated/maxloc1_8_r8.c
+++ b/libgfortran/generated/maxloc1_8_r8.c
@@ -27,11 +27,11 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"
 
 
-extern void __maxloc1_8_r8 (gfc_array_i8 *, gfc_array_r8 *, index_type *);
-export_proto_np(__maxloc1_8_r8);
+extern void maxloc1_8_r8 (gfc_array_i8 *, gfc_array_r8 *, index_type *);
+export_proto(maxloc1_8_r8);
 
 void
-__maxloc1_8_r8 (gfc_array_i8 *retarray, gfc_array_r8 *array, index_type *pdim)
+maxloc1_8_r8 (gfc_array_i8 *retarray, gfc_array_r8 *array, index_type *pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS - 1];
   index_type extent[GFC_MAX_DIMENSIONS - 1];
@@ -157,12 +157,13 @@ __maxloc1_8_r8 (gfc_array_i8 *retarray, gfc_array_r8 *array, index_type *pdim)
 }
 
 
-extern void __mmaxloc1_8_r8 (gfc_array_i8 *, gfc_array_r8 *, index_type *,
-						gfc_array_l4 *);
-export_proto_np(__mmaxloc1_8_r8);
+extern void mmaxloc1_8_r8 (gfc_array_i8 *, gfc_array_r8 *, index_type *,
+					       gfc_array_l4 *);
+export_proto(mmaxloc1_8_r8);
 
 void
-__mmaxloc1_8_r8 (gfc_array_i8 * retarray, gfc_array_r8 * array, index_type *pdim, gfc_array_l4 * mask)
+mmaxloc1_8_r8 (gfc_array_i8 * retarray, gfc_array_r8 * 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/generated/maxval_i4.c b/libgfortran/generated/maxval_i4.c
index f24735c796b..b727f7de3a2 100644
--- a/libgfortran/generated/maxval_i4.c
+++ b/libgfortran/generated/maxval_i4.c
@@ -26,11 +26,11 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"
 
 
-extern void __maxval_i4 (gfc_array_i4 *, gfc_array_i4 *, index_type *);
-export_proto_np(__maxval_i4);
+extern void maxval_i4 (gfc_array_i4 *, gfc_array_i4 *, index_type *);
+export_proto(maxval_i4);
 
 void
-__maxval_i4 (gfc_array_i4 *retarray, gfc_array_i4 *array, index_type *pdim)
+maxval_i4 (gfc_array_i4 *retarray, gfc_array_i4 *array, index_type *pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS - 1];
   index_type extent[GFC_MAX_DIMENSIONS - 1];
@@ -151,12 +151,13 @@ __maxval_i4 (gfc_array_i4 *retarray, gfc_array_i4 *array, index_type *pdim)
 }
 
 
-extern void __mmaxval_i4 (gfc_array_i4 *, gfc_array_i4 *, index_type *,
-						gfc_array_l4 *);
-export_proto_np(__mmaxval_i4);
+extern void mmaxval_i4 (gfc_array_i4 *, gfc_array_i4 *, index_type *,
+					       gfc_array_l4 *);
+export_proto(mmaxval_i4);
 
 void
-__mmaxval_i4 (gfc_array_i4 * retarray, gfc_array_i4 * array, index_type *pdim, gfc_array_l4 * mask)
+mmaxval_i4 (gfc_array_i4 * retarray, gfc_array_i4 * 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/generated/maxval_i8.c b/libgfortran/generated/maxval_i8.c
index e9ef4ecb330..40565504db2 100644
--- a/libgfortran/generated/maxval_i8.c
+++ b/libgfortran/generated/maxval_i8.c
@@ -26,11 +26,11 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"
 
 
-extern void __maxval_i8 (gfc_array_i8 *, gfc_array_i8 *, index_type *);
-export_proto_np(__maxval_i8);
+extern void maxval_i8 (gfc_array_i8 *, gfc_array_i8 *, index_type *);
+export_proto(maxval_i8);
 
 void
-__maxval_i8 (gfc_array_i8 *retarray, gfc_array_i8 *array, index_type *pdim)
+maxval_i8 (gfc_array_i8 *retarray, gfc_array_i8 *array, index_type *pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS - 1];
   index_type extent[GFC_MAX_DIMENSIONS - 1];
@@ -151,12 +151,13 @@ __maxval_i8 (gfc_array_i8 *retarray, gfc_array_i8 *array, index_type *pdim)
 }
 
 
-extern void __mmaxval_i8 (gfc_array_i8 *, gfc_array_i8 *, index_type *,
-						gfc_array_l4 *);
-export_proto_np(__mmaxval_i8);
+extern void mmaxval_i8 (gfc_array_i8 *, gfc_array_i8 *, index_type *,
+					       gfc_array_l4 *);
+export_proto(mmaxval_i8);
 
 void
-__mmaxval_i8 (gfc_array_i8 * retarray, gfc_array_i8 * array, index_type *pdim, gfc_array_l4 * mask)
+mmaxval_i8 (gfc_array_i8 * retarray, gfc_array_i8 * 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/generated/maxval_r4.c b/libgfortran/generated/maxval_r4.c
index 7339490bc5a..13e00af369d 100644
--- a/libgfortran/generated/maxval_r4.c
+++ b/libgfortran/generated/maxval_r4.c
@@ -26,11 +26,11 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"
 
 
-extern void __maxval_r4 (gfc_array_r4 *, gfc_array_r4 *, index_type *);
-export_proto_np(__maxval_r4);
+extern void maxval_r4 (gfc_array_r4 *, gfc_array_r4 *, index_type *);
+export_proto(maxval_r4);
 
 void
-__maxval_r4 (gfc_array_r4 *retarray, gfc_array_r4 *array, index_type *pdim)
+maxval_r4 (gfc_array_r4 *retarray, gfc_array_r4 *array, index_type *pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS - 1];
   index_type extent[GFC_MAX_DIMENSIONS - 1];
@@ -151,12 +151,13 @@ __maxval_r4 (gfc_array_r4 *retarray, gfc_array_r4 *array, index_type *pdim)
 }
 
 
-extern void __mmaxval_r4 (gfc_array_r4 *, gfc_array_r4 *, index_type *,
-						gfc_array_l4 *);
-export_proto_np(__mmaxval_r4);
+extern void mmaxval_r4 (gfc_array_r4 *, gfc_array_r4 *, index_type *,
+					       gfc_array_l4 *);
+export_proto(mmaxval_r4);
 
 void
-__mmaxval_r4 (gfc_array_r4 * retarray, gfc_array_r4 * array, index_type *pdim, gfc_array_l4 * mask)
+mmaxval_r4 (gfc_array_r4 * retarray, gfc_array_r4 * 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/generated/maxval_r8.c b/libgfortran/generated/maxval_r8.c
index cbc1fc9ca61..fe65522dccf 100644
--- a/libgfortran/generated/maxval_r8.c
+++ b/libgfortran/generated/maxval_r8.c
@@ -26,11 +26,11 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"
 
 
-extern void __maxval_r8 (gfc_array_r8 *, gfc_array_r8 *, index_type *);
-export_proto_np(__maxval_r8);
+extern void maxval_r8 (gfc_array_r8 *, gfc_array_r8 *, index_type *);
+export_proto(maxval_r8);
 
 void
-__maxval_r8 (gfc_array_r8 *retarray, gfc_array_r8 *array, index_type *pdim)
+maxval_r8 (gfc_array_r8 *retarray, gfc_array_r8 *array, index_type *pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS - 1];
   index_type extent[GFC_MAX_DIMENSIONS - 1];
@@ -151,12 +151,13 @@ __maxval_r8 (gfc_array_r8 *retarray, gfc_array_r8 *array, index_type *pdim)
 }
 
 
-extern void __mmaxval_r8 (gfc_array_r8 *, gfc_array_r8 *, index_type *,
-						gfc_array_l4 *);
-export_proto_np(__mmaxval_r8);
+extern void mmaxval_r8 (gfc_array_r8 *, gfc_array_r8 *, index_type *,
+					       gfc_array_l4 *);
+export_proto(mmaxval_r8);
 
 void
-__mmaxval_r8 (gfc_array_r8 * retarray, gfc_array_r8 * array, index_type *pdim, gfc_array_l4 * mask)
+mmaxval_r8 (gfc_array_r8 * retarray, gfc_array_r8 * 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/generated/minloc0_4_i4.c b/libgfortran/generated/minloc0_4_i4.c
index c377498aeb8..4ed06b70280 100644
--- a/libgfortran/generated/minloc0_4_i4.c
+++ b/libgfortran/generated/minloc0_4_i4.c
@@ -28,11 +28,11 @@ Boston, MA 02111-1307, USA.  */
 
 
 
-extern void __minloc0_4_i4 (gfc_array_i4 * retarray, gfc_array_i4 *array);
-export_proto_np(__minloc0_4_i4);
+extern void minloc0_4_i4 (gfc_array_i4 * retarray, gfc_array_i4 *array);
+export_proto(minloc0_4_i4);
 
 void
-__minloc0_4_i4 (gfc_array_i4 * retarray, gfc_array_i4 *array)
+minloc0_4_i4 (gfc_array_i4 * retarray, gfc_array_i4 *array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -122,11 +122,12 @@ __minloc0_4_i4 (gfc_array_i4 * retarray, gfc_array_i4 *array)
 }
 
 
-extern void __mminloc0_4_i4 (gfc_array_i4 *, gfc_array_i4 *, gfc_array_l4 *);
-export_proto_np(__mminloc0_4_i4);
+extern void mminloc0_4_i4 (gfc_array_i4 *, gfc_array_i4 *, gfc_array_l4 *);
+export_proto(mminloc0_4_i4);
 
 void
-__mminloc0_4_i4 (gfc_array_i4 * retarray, gfc_array_i4 *array, gfc_array_l4 * mask)
+mminloc0_4_i4 (gfc_array_i4 * retarray, gfc_array_i4 *array,
+				  gfc_array_l4 * mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
diff --git a/libgfortran/generated/minloc0_4_i8.c b/libgfortran/generated/minloc0_4_i8.c
index 56fd2618109..0711a435ae2 100644
--- a/libgfortran/generated/minloc0_4_i8.c
+++ b/libgfortran/generated/minloc0_4_i8.c
@@ -28,11 +28,11 @@ Boston, MA 02111-1307, USA.  */
 
 
 
-extern void __minloc0_4_i8 (gfc_array_i4 * retarray, gfc_array_i8 *array);
-export_proto_np(__minloc0_4_i8);
+extern void minloc0_4_i8 (gfc_array_i4 * retarray, gfc_array_i8 *array);
+export_proto(minloc0_4_i8);
 
 void
-__minloc0_4_i8 (gfc_array_i4 * retarray, gfc_array_i8 *array)
+minloc0_4_i8 (gfc_array_i4 * retarray, gfc_array_i8 *array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -122,11 +122,12 @@ __minloc0_4_i8 (gfc_array_i4 * retarray, gfc_array_i8 *array)
 }
 
 
-extern void __mminloc0_4_i8 (gfc_array_i4 *, gfc_array_i8 *, gfc_array_l4 *);
-export_proto_np(__mminloc0_4_i8);
+extern void mminloc0_4_i8 (gfc_array_i4 *, gfc_array_i8 *, gfc_array_l4 *);
+export_proto(mminloc0_4_i8);
 
 void
-__mminloc0_4_i8 (gfc_array_i4 * retarray, gfc_array_i8 *array, gfc_array_l4 * mask)
+mminloc0_4_i8 (gfc_array_i4 * retarray, gfc_array_i8 *array,
+				  gfc_array_l4 * mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
diff --git a/libgfortran/generated/minloc0_4_r4.c b/libgfortran/generated/minloc0_4_r4.c
index 30b5b1ddde1..9733d28581a 100644
--- a/libgfortran/generated/minloc0_4_r4.c
+++ b/libgfortran/generated/minloc0_4_r4.c
@@ -28,11 +28,11 @@ Boston, MA 02111-1307, USA.  */
 
 
 
-extern void __minloc0_4_r4 (gfc_array_i4 * retarray, gfc_array_r4 *array);
-export_proto_np(__minloc0_4_r4);
+extern void minloc0_4_r4 (gfc_array_i4 * retarray, gfc_array_r4 *array);
+export_proto(minloc0_4_r4);
 
 void
-__minloc0_4_r4 (gfc_array_i4 * retarray, gfc_array_r4 *array)
+minloc0_4_r4 (gfc_array_i4 * retarray, gfc_array_r4 *array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -122,11 +122,12 @@ __minloc0_4_r4 (gfc_array_i4 * retarray, gfc_array_r4 *array)
 }
 
 
-extern void __mminloc0_4_r4 (gfc_array_i4 *, gfc_array_r4 *, gfc_array_l4 *);
-export_proto_np(__mminloc0_4_r4);
+extern void mminloc0_4_r4 (gfc_array_i4 *, gfc_array_r4 *, gfc_array_l4 *);
+export_proto(mminloc0_4_r4);
 
 void
-__mminloc0_4_r4 (gfc_array_i4 * retarray, gfc_array_r4 *array, gfc_array_l4 * mask)
+mminloc0_4_r4 (gfc_array_i4 * retarray, gfc_array_r4 *array,
+				  gfc_array_l4 * mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
diff --git a/libgfortran/generated/minloc0_4_r8.c b/libgfortran/generated/minloc0_4_r8.c
index 8a4267d653a..25b0e63e5c8 100644
--- a/libgfortran/generated/minloc0_4_r8.c
+++ b/libgfortran/generated/minloc0_4_r8.c
@@ -28,11 +28,11 @@ Boston, MA 02111-1307, USA.  */
 
 
 
-extern void __minloc0_4_r8 (gfc_array_i4 * retarray, gfc_array_r8 *array);
-export_proto_np(__minloc0_4_r8);
+extern void minloc0_4_r8 (gfc_array_i4 * retarray, gfc_array_r8 *array);
+export_proto(minloc0_4_r8);
 
 void
-__minloc0_4_r8 (gfc_array_i4 * retarray, gfc_array_r8 *array)
+minloc0_4_r8 (gfc_array_i4 * retarray, gfc_array_r8 *array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -122,11 +122,12 @@ __minloc0_4_r8 (gfc_array_i4 * retarray, gfc_array_r8 *array)
 }
 
 
-extern void __mminloc0_4_r8 (gfc_array_i4 *, gfc_array_r8 *, gfc_array_l4 *);
-export_proto_np(__mminloc0_4_r8);
+extern void mminloc0_4_r8 (gfc_array_i4 *, gfc_array_r8 *, gfc_array_l4 *);
+export_proto(mminloc0_4_r8);
 
 void
-__mminloc0_4_r8 (gfc_array_i4 * retarray, gfc_array_r8 *array, gfc_array_l4 * mask)
+mminloc0_4_r8 (gfc_array_i4 * retarray, gfc_array_r8 *array,
+				  gfc_array_l4 * mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
diff --git a/libgfortran/generated/minloc0_8_i4.c b/libgfortran/generated/minloc0_8_i4.c
index 6d7cb9c4d63..c857226bf9c 100644
--- a/libgfortran/generated/minloc0_8_i4.c
+++ b/libgfortran/generated/minloc0_8_i4.c
@@ -28,11 +28,11 @@ Boston, MA 02111-1307, USA.  */
 
 
 
-extern void __minloc0_8_i4 (gfc_array_i8 * retarray, gfc_array_i4 *array);
-export_proto_np(__minloc0_8_i4);
+extern void minloc0_8_i4 (gfc_array_i8 * retarray, gfc_array_i4 *array);
+export_proto(minloc0_8_i4);
 
 void
-__minloc0_8_i4 (gfc_array_i8 * retarray, gfc_array_i4 *array)
+minloc0_8_i4 (gfc_array_i8 * retarray, gfc_array_i4 *array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -122,11 +122,12 @@ __minloc0_8_i4 (gfc_array_i8 * retarray, gfc_array_i4 *array)
 }
 
 
-extern void __mminloc0_8_i4 (gfc_array_i8 *, gfc_array_i4 *, gfc_array_l4 *);
-export_proto_np(__mminloc0_8_i4);
+extern void mminloc0_8_i4 (gfc_array_i8 *, gfc_array_i4 *, gfc_array_l4 *);
+export_proto(mminloc0_8_i4);
 
 void
-__mminloc0_8_i4 (gfc_array_i8 * retarray, gfc_array_i4 *array, gfc_array_l4 * mask)
+mminloc0_8_i4 (gfc_array_i8 * retarray, gfc_array_i4 *array,
+				  gfc_array_l4 * mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
diff --git a/libgfortran/generated/minloc0_8_i8.c b/libgfortran/generated/minloc0_8_i8.c
index 87d6705ae4a..00a7dfe27b8 100644
--- a/libgfortran/generated/minloc0_8_i8.c
+++ b/libgfortran/generated/minloc0_8_i8.c
@@ -28,11 +28,11 @@ Boston, MA 02111-1307, USA.  */
 
 
 
-extern void __minloc0_8_i8 (gfc_array_i8 * retarray, gfc_array_i8 *array);
-export_proto_np(__minloc0_8_i8);
+extern void minloc0_8_i8 (gfc_array_i8 * retarray, gfc_array_i8 *array);
+export_proto(minloc0_8_i8);
 
 void
-__minloc0_8_i8 (gfc_array_i8 * retarray, gfc_array_i8 *array)
+minloc0_8_i8 (gfc_array_i8 * retarray, gfc_array_i8 *array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -122,11 +122,12 @@ __minloc0_8_i8 (gfc_array_i8 * retarray, gfc_array_i8 *array)
 }
 
 
-extern void __mminloc0_8_i8 (gfc_array_i8 *, gfc_array_i8 *, gfc_array_l4 *);
-export_proto_np(__mminloc0_8_i8);
+extern void mminloc0_8_i8 (gfc_array_i8 *, gfc_array_i8 *, gfc_array_l4 *);
+export_proto(mminloc0_8_i8);
 
 void
-__mminloc0_8_i8 (gfc_array_i8 * retarray, gfc_array_i8 *array, gfc_array_l4 * mask)
+mminloc0_8_i8 (gfc_array_i8 * retarray, gfc_array_i8 *array,
+				  gfc_array_l4 * mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
diff --git a/libgfortran/generated/minloc0_8_r4.c b/libgfortran/generated/minloc0_8_r4.c
index 660a7634779..d7c01b3a486 100644
--- a/libgfortran/generated/minloc0_8_r4.c
+++ b/libgfortran/generated/minloc0_8_r4.c
@@ -28,11 +28,11 @@ Boston, MA 02111-1307, USA.  */
 
 
 
-extern void __minloc0_8_r4 (gfc_array_i8 * retarray, gfc_array_r4 *array);
-export_proto_np(__minloc0_8_r4);
+extern void minloc0_8_r4 (gfc_array_i8 * retarray, gfc_array_r4 *array);
+export_proto(minloc0_8_r4);
 
 void
-__minloc0_8_r4 (gfc_array_i8 * retarray, gfc_array_r4 *array)
+minloc0_8_r4 (gfc_array_i8 * retarray, gfc_array_r4 *array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -122,11 +122,12 @@ __minloc0_8_r4 (gfc_array_i8 * retarray, gfc_array_r4 *array)
 }
 
 
-extern void __mminloc0_8_r4 (gfc_array_i8 *, gfc_array_r4 *, gfc_array_l4 *);
-export_proto_np(__mminloc0_8_r4);
+extern void mminloc0_8_r4 (gfc_array_i8 *, gfc_array_r4 *, gfc_array_l4 *);
+export_proto(mminloc0_8_r4);
 
 void
-__mminloc0_8_r4 (gfc_array_i8 * retarray, gfc_array_r4 *array, gfc_array_l4 * mask)
+mminloc0_8_r4 (gfc_array_i8 * retarray, gfc_array_r4 *array,
+				  gfc_array_l4 * mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
diff --git a/libgfortran/generated/minloc0_8_r8.c b/libgfortran/generated/minloc0_8_r8.c
index b8c83035ab5..020985a2596 100644
--- a/libgfortran/generated/minloc0_8_r8.c
+++ b/libgfortran/generated/minloc0_8_r8.c
@@ -28,11 +28,11 @@ Boston, MA 02111-1307, USA.  */
 
 
 
-extern void __minloc0_8_r8 (gfc_array_i8 * retarray, gfc_array_r8 *array);
-export_proto_np(__minloc0_8_r8);
+extern void minloc0_8_r8 (gfc_array_i8 * retarray, gfc_array_r8 *array);
+export_proto(minloc0_8_r8);
 
 void
-__minloc0_8_r8 (gfc_array_i8 * retarray, gfc_array_r8 *array)
+minloc0_8_r8 (gfc_array_i8 * retarray, gfc_array_r8 *array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -122,11 +122,12 @@ __minloc0_8_r8 (gfc_array_i8 * retarray, gfc_array_r8 *array)
 }
 
 
-extern void __mminloc0_8_r8 (gfc_array_i8 *, gfc_array_r8 *, gfc_array_l4 *);
-export_proto_np(__mminloc0_8_r8);
+extern void mminloc0_8_r8 (gfc_array_i8 *, gfc_array_r8 *, gfc_array_l4 *);
+export_proto(mminloc0_8_r8);
 
 void
-__mminloc0_8_r8 (gfc_array_i8 * retarray, gfc_array_r8 *array, gfc_array_l4 * mask)
+mminloc0_8_r8 (gfc_array_i8 * retarray, gfc_array_r8 *array,
+				  gfc_array_l4 * mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
diff --git a/libgfortran/generated/minloc1_4_i4.c b/libgfortran/generated/minloc1_4_i4.c
index eaf4212cd26..82f0cefbf59 100644
--- a/libgfortran/generated/minloc1_4_i4.c
+++ b/libgfortran/generated/minloc1_4_i4.c
@@ -27,11 +27,11 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"
 
 
-extern void __minloc1_4_i4 (gfc_array_i4 *, gfc_array_i4 *, index_type *);
-export_proto_np(__minloc1_4_i4);
+extern void minloc1_4_i4 (gfc_array_i4 *, gfc_array_i4 *, index_type *);
+export_proto(minloc1_4_i4);
 
 void
-__minloc1_4_i4 (gfc_array_i4 *retarray, gfc_array_i4 *array, index_type *pdim)
+minloc1_4_i4 (gfc_array_i4 *retarray, gfc_array_i4 *array, index_type *pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS - 1];
   index_type extent[GFC_MAX_DIMENSIONS - 1];
@@ -157,12 +157,13 @@ __minloc1_4_i4 (gfc_array_i4 *retarray, gfc_array_i4 *array, index_type *pdim)
 }
 
 
-extern void __mminloc1_4_i4 (gfc_array_i4 *, gfc_array_i4 *, index_type *,
-						gfc_array_l4 *);
-export_proto_np(__mminloc1_4_i4);
+extern void mminloc1_4_i4 (gfc_array_i4 *, gfc_array_i4 *, index_type *,
+					       gfc_array_l4 *);
+export_proto(mminloc1_4_i4);
 
 void
-__mminloc1_4_i4 (gfc_array_i4 * retarray, gfc_array_i4 * array, index_type *pdim, gfc_array_l4 * mask)
+mminloc1_4_i4 (gfc_array_i4 * retarray, gfc_array_i4 * 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/generated/minloc1_4_i8.c b/libgfortran/generated/minloc1_4_i8.c
index 0ea3802a5ab..a1b8c2c3a03 100644
--- a/libgfortran/generated/minloc1_4_i8.c
+++ b/libgfortran/generated/minloc1_4_i8.c
@@ -27,11 +27,11 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"
 
 
-extern void __minloc1_4_i8 (gfc_array_i4 *, gfc_array_i8 *, index_type *);
-export_proto_np(__minloc1_4_i8);
+extern void minloc1_4_i8 (gfc_array_i4 *, gfc_array_i8 *, index_type *);
+export_proto(minloc1_4_i8);
 
 void
-__minloc1_4_i8 (gfc_array_i4 *retarray, gfc_array_i8 *array, index_type *pdim)
+minloc1_4_i8 (gfc_array_i4 *retarray, gfc_array_i8 *array, index_type *pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS - 1];
   index_type extent[GFC_MAX_DIMENSIONS - 1];
@@ -157,12 +157,13 @@ __minloc1_4_i8 (gfc_array_i4 *retarray, gfc_array_i8 *array, index_type *pdim)
 }
 
 
-extern void __mminloc1_4_i8 (gfc_array_i4 *, gfc_array_i8 *, index_type *,
-						gfc_array_l4 *);
-export_proto_np(__mminloc1_4_i8);
+extern void mminloc1_4_i8 (gfc_array_i4 *, gfc_array_i8 *, index_type *,
+					       gfc_array_l4 *);
+export_proto(mminloc1_4_i8);
 
 void
-__mminloc1_4_i8 (gfc_array_i4 * retarray, gfc_array_i8 * array, index_type *pdim, gfc_array_l4 * mask)
+mminloc1_4_i8 (gfc_array_i4 * retarray, gfc_array_i8 * 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/generated/minloc1_4_r4.c b/libgfortran/generated/minloc1_4_r4.c
index 3336f0fbfb4..2bc453c07ff 100644
--- a/libgfortran/generated/minloc1_4_r4.c
+++ b/libgfortran/generated/minloc1_4_r4.c
@@ -27,11 +27,11 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"
 
 
-extern void __minloc1_4_r4 (gfc_array_i4 *, gfc_array_r4 *, index_type *);
-export_proto_np(__minloc1_4_r4);
+extern void minloc1_4_r4 (gfc_array_i4 *, gfc_array_r4 *, index_type *);
+export_proto(minloc1_4_r4);
 
 void
-__minloc1_4_r4 (gfc_array_i4 *retarray, gfc_array_r4 *array, index_type *pdim)
+minloc1_4_r4 (gfc_array_i4 *retarray, gfc_array_r4 *array, index_type *pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS - 1];
   index_type extent[GFC_MAX_DIMENSIONS - 1];
@@ -157,12 +157,13 @@ __minloc1_4_r4 (gfc_array_i4 *retarray, gfc_array_r4 *array, index_type *pdim)
 }
 
 
-extern void __mminloc1_4_r4 (gfc_array_i4 *, gfc_array_r4 *, index_type *,
-						gfc_array_l4 *);
-export_proto_np(__mminloc1_4_r4);
+extern void mminloc1_4_r4 (gfc_array_i4 *, gfc_array_r4 *, index_type *,
+					       gfc_array_l4 *);
+export_proto(mminloc1_4_r4);
 
 void
-__mminloc1_4_r4 (gfc_array_i4 * retarray, gfc_array_r4 * array, index_type *pdim, gfc_array_l4 * mask)
+mminloc1_4_r4 (gfc_array_i4 * retarray, gfc_array_r4 * 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/generated/minloc1_4_r8.c b/libgfortran/generated/minloc1_4_r8.c
index bb59dccd77d..73d1a455883 100644
--- a/libgfortran/generated/minloc1_4_r8.c
+++ b/libgfortran/generated/minloc1_4_r8.c
@@ -27,11 +27,11 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"
 
 
-extern void __minloc1_4_r8 (gfc_array_i4 *, gfc_array_r8 *, index_type *);
-export_proto_np(__minloc1_4_r8);
+extern void minloc1_4_r8 (gfc_array_i4 *, gfc_array_r8 *, index_type *);
+export_proto(minloc1_4_r8);
 
 void
-__minloc1_4_r8 (gfc_array_i4 *retarray, gfc_array_r8 *array, index_type *pdim)
+minloc1_4_r8 (gfc_array_i4 *retarray, gfc_array_r8 *array, index_type *pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS - 1];
   index_type extent[GFC_MAX_DIMENSIONS - 1];
@@ -157,12 +157,13 @@ __minloc1_4_r8 (gfc_array_i4 *retarray, gfc_array_r8 *array, index_type *pdim)
 }
 
 
-extern void __mminloc1_4_r8 (gfc_array_i4 *, gfc_array_r8 *, index_type *,
-						gfc_array_l4 *);
-export_proto_np(__mminloc1_4_r8);
+extern void mminloc1_4_r8 (gfc_array_i4 *, gfc_array_r8 *, index_type *,
+					       gfc_array_l4 *);
+export_proto(mminloc1_4_r8);
 
 void
-__mminloc1_4_r8 (gfc_array_i4 * retarray, gfc_array_r8 * array, index_type *pdim, gfc_array_l4 * mask)
+mminloc1_4_r8 (gfc_array_i4 * retarray, gfc_array_r8 * 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/generated/minloc1_8_i4.c b/libgfortran/generated/minloc1_8_i4.c
index c30f656a1ad..531600e91ba 100644
--- a/libgfortran/generated/minloc1_8_i4.c
+++ b/libgfortran/generated/minloc1_8_i4.c
@@ -27,11 +27,11 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"
 
 
-extern void __minloc1_8_i4 (gfc_array_i8 *, gfc_array_i4 *, index_type *);
-export_proto_np(__minloc1_8_i4);
+extern void minloc1_8_i4 (gfc_array_i8 *, gfc_array_i4 *, index_type *);
+export_proto(minloc1_8_i4);
 
 void
-__minloc1_8_i4 (gfc_array_i8 *retarray, gfc_array_i4 *array, index_type *pdim)
+minloc1_8_i4 (gfc_array_i8 *retarray, gfc_array_i4 *array, index_type *pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS - 1];
   index_type extent[GFC_MAX_DIMENSIONS - 1];
@@ -157,12 +157,13 @@ __minloc1_8_i4 (gfc_array_i8 *retarray, gfc_array_i4 *array, index_type *pdim)
 }
 
 
-extern void __mminloc1_8_i4 (gfc_array_i8 *, gfc_array_i4 *, index_type *,
-						gfc_array_l4 *);
-export_proto_np(__mminloc1_8_i4);
+extern void mminloc1_8_i4 (gfc_array_i8 *, gfc_array_i4 *, index_type *,
+					       gfc_array_l4 *);
+export_proto(mminloc1_8_i4);
 
 void
-__mminloc1_8_i4 (gfc_array_i8 * retarray, gfc_array_i4 * array, index_type *pdim, gfc_array_l4 * mask)
+mminloc1_8_i4 (gfc_array_i8 * retarray, gfc_array_i4 * 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/generated/minloc1_8_i8.c b/libgfortran/generated/minloc1_8_i8.c
index 4d3e34ad1a9..a11e738f60f 100644
--- a/libgfortran/generated/minloc1_8_i8.c
+++ b/libgfortran/generated/minloc1_8_i8.c
@@ -27,11 +27,11 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"
 
 
-extern void __minloc1_8_i8 (gfc_array_i8 *, gfc_array_i8 *, index_type *);
-export_proto_np(__minloc1_8_i8);
+extern void minloc1_8_i8 (gfc_array_i8 *, gfc_array_i8 *, index_type *);
+export_proto(minloc1_8_i8);
 
 void
-__minloc1_8_i8 (gfc_array_i8 *retarray, gfc_array_i8 *array, index_type *pdim)
+minloc1_8_i8 (gfc_array_i8 *retarray, gfc_array_i8 *array, index_type *pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS - 1];
   index_type extent[GFC_MAX_DIMENSIONS - 1];
@@ -157,12 +157,13 @@ __minloc1_8_i8 (gfc_array_i8 *retarray, gfc_array_i8 *array, index_type *pdim)
 }
 
 
-extern void __mminloc1_8_i8 (gfc_array_i8 *, gfc_array_i8 *, index_type *,
-						gfc_array_l4 *);
-export_proto_np(__mminloc1_8_i8);
+extern void mminloc1_8_i8 (gfc_array_i8 *, gfc_array_i8 *, index_type *,
+					       gfc_array_l4 *);
+export_proto(mminloc1_8_i8);
 
 void
-__mminloc1_8_i8 (gfc_array_i8 * retarray, gfc_array_i8 * array, index_type *pdim, gfc_array_l4 * mask)
+mminloc1_8_i8 (gfc_array_i8 * retarray, gfc_array_i8 * 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/generated/minloc1_8_r4.c b/libgfortran/generated/minloc1_8_r4.c
index e5c1a59bf10..aaf382212c6 100644
--- a/libgfortran/generated/minloc1_8_r4.c
+++ b/libgfortran/generated/minloc1_8_r4.c
@@ -27,11 +27,11 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"
 
 
-extern void __minloc1_8_r4 (gfc_array_i8 *, gfc_array_r4 *, index_type *);
-export_proto_np(__minloc1_8_r4);
+extern void minloc1_8_r4 (gfc_array_i8 *, gfc_array_r4 *, index_type *);
+export_proto(minloc1_8_r4);
 
 void
-__minloc1_8_r4 (gfc_array_i8 *retarray, gfc_array_r4 *array, index_type *pdim)
+minloc1_8_r4 (gfc_array_i8 *retarray, gfc_array_r4 *array, index_type *pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS - 1];
   index_type extent[GFC_MAX_DIMENSIONS - 1];
@@ -157,12 +157,13 @@ __minloc1_8_r4 (gfc_array_i8 *retarray, gfc_array_r4 *array, index_type *pdim)
 }
 
 
-extern void __mminloc1_8_r4 (gfc_array_i8 *, gfc_array_r4 *, index_type *,
-						gfc_array_l4 *);
-export_proto_np(__mminloc1_8_r4);
+extern void mminloc1_8_r4 (gfc_array_i8 *, gfc_array_r4 *, index_type *,
+					       gfc_array_l4 *);
+export_proto(mminloc1_8_r4);
 
 void
-__mminloc1_8_r4 (gfc_array_i8 * retarray, gfc_array_r4 * array, index_type *pdim, gfc_array_l4 * mask)
+mminloc1_8_r4 (gfc_array_i8 * retarray, gfc_array_r4 * 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/generated/minloc1_8_r8.c b/libgfortran/generated/minloc1_8_r8.c
index ff7ebb913f2..4cc16109717 100644
--- a/libgfortran/generated/minloc1_8_r8.c
+++ b/libgfortran/generated/minloc1_8_r8.c
@@ -27,11 +27,11 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"
 
 
-extern void __minloc1_8_r8 (gfc_array_i8 *, gfc_array_r8 *, index_type *);
-export_proto_np(__minloc1_8_r8);
+extern void minloc1_8_r8 (gfc_array_i8 *, gfc_array_r8 *, index_type *);
+export_proto(minloc1_8_r8);
 
 void
-__minloc1_8_r8 (gfc_array_i8 *retarray, gfc_array_r8 *array, index_type *pdim)
+minloc1_8_r8 (gfc_array_i8 *retarray, gfc_array_r8 *array, index_type *pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS - 1];
   index_type extent[GFC_MAX_DIMENSIONS - 1];
@@ -157,12 +157,13 @@ __minloc1_8_r8 (gfc_array_i8 *retarray, gfc_array_r8 *array, index_type *pdim)
 }
 
 
-extern void __mminloc1_8_r8 (gfc_array_i8 *, gfc_array_r8 *, index_type *,
-						gfc_array_l4 *);
-export_proto_np(__mminloc1_8_r8);
+extern void mminloc1_8_r8 (gfc_array_i8 *, gfc_array_r8 *, index_type *,
+					       gfc_array_l4 *);
+export_proto(mminloc1_8_r8);
 
 void
-__mminloc1_8_r8 (gfc_array_i8 * retarray, gfc_array_r8 * array, index_type *pdim, gfc_array_l4 * mask)
+mminloc1_8_r8 (gfc_array_i8 * retarray, gfc_array_r8 * 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/generated/minval_i4.c b/libgfortran/generated/minval_i4.c
index 23b83262157..b98004eda17 100644
--- a/libgfortran/generated/minval_i4.c
+++ b/libgfortran/generated/minval_i4.c
@@ -26,11 +26,11 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"
 
 
-extern void __minval_i4 (gfc_array_i4 *, gfc_array_i4 *, index_type *);
-export_proto_np(__minval_i4);
+extern void minval_i4 (gfc_array_i4 *, gfc_array_i4 *, index_type *);
+export_proto(minval_i4);
 
 void
-__minval_i4 (gfc_array_i4 *retarray, gfc_array_i4 *array, index_type *pdim)
+minval_i4 (gfc_array_i4 *retarray, gfc_array_i4 *array, index_type *pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS - 1];
   index_type extent[GFC_MAX_DIMENSIONS - 1];
@@ -151,12 +151,13 @@ __minval_i4 (gfc_array_i4 *retarray, gfc_array_i4 *array, index_type *pdim)
 }
 
 
-extern void __mminval_i4 (gfc_array_i4 *, gfc_array_i4 *, index_type *,
-						gfc_array_l4 *);
-export_proto_np(__mminval_i4);
+extern void mminval_i4 (gfc_array_i4 *, gfc_array_i4 *, index_type *,
+					       gfc_array_l4 *);
+export_proto(mminval_i4);
 
 void
-__mminval_i4 (gfc_array_i4 * retarray, gfc_array_i4 * array, index_type *pdim, gfc_array_l4 * mask)
+mminval_i4 (gfc_array_i4 * retarray, gfc_array_i4 * 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/generated/minval_i8.c b/libgfortran/generated/minval_i8.c
index 149ba7a1871..251283239f1 100644
--- a/libgfortran/generated/minval_i8.c
+++ b/libgfortran/generated/minval_i8.c
@@ -26,11 +26,11 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"
 
 
-extern void __minval_i8 (gfc_array_i8 *, gfc_array_i8 *, index_type *);
-export_proto_np(__minval_i8);
+extern void minval_i8 (gfc_array_i8 *, gfc_array_i8 *, index_type *);
+export_proto(minval_i8);
 
 void
-__minval_i8 (gfc_array_i8 *retarray, gfc_array_i8 *array, index_type *pdim)
+minval_i8 (gfc_array_i8 *retarray, gfc_array_i8 *array, index_type *pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS - 1];
   index_type extent[GFC_MAX_DIMENSIONS - 1];
@@ -151,12 +151,13 @@ __minval_i8 (gfc_array_i8 *retarray, gfc_array_i8 *array, index_type *pdim)
 }
 
 
-extern void __mminval_i8 (gfc_array_i8 *, gfc_array_i8 *, index_type *,
-						gfc_array_l4 *);
-export_proto_np(__mminval_i8);
+extern void mminval_i8 (gfc_array_i8 *, gfc_array_i8 *, index_type *,
+					       gfc_array_l4 *);
+export_proto(mminval_i8);
 
 void
-__mminval_i8 (gfc_array_i8 * retarray, gfc_array_i8 * array, index_type *pdim, gfc_array_l4 * mask)
+mminval_i8 (gfc_array_i8 * retarray, gfc_array_i8 * 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/generated/minval_r4.c b/libgfortran/generated/minval_r4.c
index 3a4b13df178..8846317bd6b 100644
--- a/libgfortran/generated/minval_r4.c
+++ b/libgfortran/generated/minval_r4.c
@@ -26,11 +26,11 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"
 
 
-extern void __minval_r4 (gfc_array_r4 *, gfc_array_r4 *, index_type *);
-export_proto_np(__minval_r4);
+extern void minval_r4 (gfc_array_r4 *, gfc_array_r4 *, index_type *);
+export_proto(minval_r4);
 
 void
-__minval_r4 (gfc_array_r4 *retarray, gfc_array_r4 *array, index_type *pdim)
+minval_r4 (gfc_array_r4 *retarray, gfc_array_r4 *array, index_type *pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS - 1];
   index_type extent[GFC_MAX_DIMENSIONS - 1];
@@ -151,12 +151,13 @@ __minval_r4 (gfc_array_r4 *retarray, gfc_array_r4 *array, index_type *pdim)
 }
 
 
-extern void __mminval_r4 (gfc_array_r4 *, gfc_array_r4 *, index_type *,
-						gfc_array_l4 *);
-export_proto_np(__mminval_r4);
+extern void mminval_r4 (gfc_array_r4 *, gfc_array_r4 *, index_type *,
+					       gfc_array_l4 *);
+export_proto(mminval_r4);
 
 void
-__mminval_r4 (gfc_array_r4 * retarray, gfc_array_r4 * array, index_type *pdim, gfc_array_l4 * mask)
+mminval_r4 (gfc_array_r4 * retarray, gfc_array_r4 * 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/generated/minval_r8.c b/libgfortran/generated/minval_r8.c
index e30c4314580..bd7b7e7f9e4 100644
--- a/libgfortran/generated/minval_r8.c
+++ b/libgfortran/generated/minval_r8.c
@@ -26,11 +26,11 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"
 
 
-extern void __minval_r8 (gfc_array_r8 *, gfc_array_r8 *, index_type *);
-export_proto_np(__minval_r8);
+extern void minval_r8 (gfc_array_r8 *, gfc_array_r8 *, index_type *);
+export_proto(minval_r8);
 
 void
-__minval_r8 (gfc_array_r8 *retarray, gfc_array_r8 *array, index_type *pdim)
+minval_r8 (gfc_array_r8 *retarray, gfc_array_r8 *array, index_type *pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS - 1];
   index_type extent[GFC_MAX_DIMENSIONS - 1];
@@ -151,12 +151,13 @@ __minval_r8 (gfc_array_r8 *retarray, gfc_array_r8 *array, index_type *pdim)
 }
 
 
-extern void __mminval_r8 (gfc_array_r8 *, gfc_array_r8 *, index_type *,
-						gfc_array_l4 *);
-export_proto_np(__mminval_r8);
+extern void mminval_r8 (gfc_array_r8 *, gfc_array_r8 *, index_type *,
+					       gfc_array_l4 *);
+export_proto(mminval_r8);
 
 void
-__mminval_r8 (gfc_array_r8 * retarray, gfc_array_r8 * array, index_type *pdim, gfc_array_l4 * mask)
+mminval_r8 (gfc_array_r8 * retarray, gfc_array_r8 * 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/generated/product_c4.c b/libgfortran/generated/product_c4.c
index f8fcdcb2da1..98f83c4f93e 100644
--- a/libgfortran/generated/product_c4.c
+++ b/libgfortran/generated/product_c4.c
@@ -25,11 +25,11 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"
 
 
-extern void __product_c4 (gfc_array_c4 *, gfc_array_c4 *, index_type *);
-export_proto_np(__product_c4);
+extern void product_c4 (gfc_array_c4 *, gfc_array_c4 *, index_type *);
+export_proto(product_c4);
 
 void
-__product_c4 (gfc_array_c4 *retarray, gfc_array_c4 *array, index_type *pdim)
+product_c4 (gfc_array_c4 *retarray, gfc_array_c4 *array, index_type *pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS - 1];
   index_type extent[GFC_MAX_DIMENSIONS - 1];
@@ -149,12 +149,13 @@ __product_c4 (gfc_array_c4 *retarray, gfc_array_c4 *array, index_type *pdim)
 }
 
 
-extern void __mproduct_c4 (gfc_array_c4 *, gfc_array_c4 *, index_type *,
-						gfc_array_l4 *);
-export_proto_np(__mproduct_c4);
+extern void mproduct_c4 (gfc_array_c4 *, gfc_array_c4 *, index_type *,
+					       gfc_array_l4 *);
+export_proto(mproduct_c4);
 
 void
-__mproduct_c4 (gfc_array_c4 * retarray, gfc_array_c4 * array, index_type *pdim, gfc_array_l4 * mask)
+mproduct_c4 (gfc_array_c4 * retarray, gfc_array_c4 * 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/generated/product_c8.c b/libgfortran/generated/product_c8.c
index 4e54c68fcf0..d41990ba96b 100644
--- a/libgfortran/generated/product_c8.c
+++ b/libgfortran/generated/product_c8.c
@@ -25,11 +25,11 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"
 
 
-extern void __product_c8 (gfc_array_c8 *, gfc_array_c8 *, index_type *);
-export_proto_np(__product_c8);
+extern void product_c8 (gfc_array_c8 *, gfc_array_c8 *, index_type *);
+export_proto(product_c8);
 
 void
-__product_c8 (gfc_array_c8 *retarray, gfc_array_c8 *array, index_type *pdim)
+product_c8 (gfc_array_c8 *retarray, gfc_array_c8 *array, index_type *pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS - 1];
   index_type extent[GFC_MAX_DIMENSIONS - 1];
@@ -149,12 +149,13 @@ __product_c8 (gfc_array_c8 *retarray, gfc_array_c8 *array, index_type *pdim)
 }
 
 
-extern void __mproduct_c8 (gfc_array_c8 *, gfc_array_c8 *, index_type *,
-						gfc_array_l4 *);
-export_proto_np(__mproduct_c8);
+extern void mproduct_c8 (gfc_array_c8 *, gfc_array_c8 *, index_type *,
+					       gfc_array_l4 *);
+export_proto(mproduct_c8);
 
 void
-__mproduct_c8 (gfc_array_c8 * retarray, gfc_array_c8 * array, index_type *pdim, gfc_array_l4 * mask)
+mproduct_c8 (gfc_array_c8 * retarray, gfc_array_c8 * 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/generated/product_i4.c b/libgfortran/generated/product_i4.c
index 386fbf9b02e..02b715ee182 100644
--- a/libgfortran/generated/product_i4.c
+++ b/libgfortran/generated/product_i4.c
@@ -25,11 +25,11 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"
 
 
-extern void __product_i4 (gfc_array_i4 *, gfc_array_i4 *, index_type *);
-export_proto_np(__product_i4);
+extern void product_i4 (gfc_array_i4 *, gfc_array_i4 *, index_type *);
+export_proto(product_i4);
 
 void
-__product_i4 (gfc_array_i4 *retarray, gfc_array_i4 *array, index_type *pdim)
+product_i4 (gfc_array_i4 *retarray, gfc_array_i4 *array, index_type *pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS - 1];
   index_type extent[GFC_MAX_DIMENSIONS - 1];
@@ -149,12 +149,13 @@ __product_i4 (gfc_array_i4 *retarray, gfc_array_i4 *array, index_type *pdim)
 }
 
 
-extern void __mproduct_i4 (gfc_array_i4 *, gfc_array_i4 *, index_type *,
-						gfc_array_l4 *);
-export_proto_np(__mproduct_i4);
+extern void mproduct_i4 (gfc_array_i4 *, gfc_array_i4 *, index_type *,
+					       gfc_array_l4 *);
+export_proto(mproduct_i4);
 
 void
-__mproduct_i4 (gfc_array_i4 * retarray, gfc_array_i4 * array, index_type *pdim, gfc_array_l4 * mask)
+mproduct_i4 (gfc_array_i4 * retarray, gfc_array_i4 * 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/generated/product_i8.c b/libgfortran/generated/product_i8.c
index 0e5ac66ca2d..16dab58ddf8 100644
--- a/libgfortran/generated/product_i8.c
+++ b/libgfortran/generated/product_i8.c
@@ -25,11 +25,11 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"
 
 
-extern void __product_i8 (gfc_array_i8 *, gfc_array_i8 *, index_type *);
-export_proto_np(__product_i8);
+extern void product_i8 (gfc_array_i8 *, gfc_array_i8 *, index_type *);
+export_proto(product_i8);
 
 void
-__product_i8 (gfc_array_i8 *retarray, gfc_array_i8 *array, index_type *pdim)
+product_i8 (gfc_array_i8 *retarray, gfc_array_i8 *array, index_type *pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS - 1];
   index_type extent[GFC_MAX_DIMENSIONS - 1];
@@ -149,12 +149,13 @@ __product_i8 (gfc_array_i8 *retarray, gfc_array_i8 *array, index_type *pdim)
 }
 
 
-extern void __mproduct_i8 (gfc_array_i8 *, gfc_array_i8 *, index_type *,
-						gfc_array_l4 *);
-export_proto_np(__mproduct_i8);
+extern void mproduct_i8 (gfc_array_i8 *, gfc_array_i8 *, index_type *,
+					       gfc_array_l4 *);
+export_proto(mproduct_i8);
 
 void
-__mproduct_i8 (gfc_array_i8 * retarray, gfc_array_i8 * array, index_type *pdim, gfc_array_l4 * mask)
+mproduct_i8 (gfc_array_i8 * retarray, gfc_array_i8 * 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/generated/product_r4.c b/libgfortran/generated/product_r4.c
index cf38879d3f2..c5b909663f1 100644
--- a/libgfortran/generated/product_r4.c
+++ b/libgfortran/generated/product_r4.c
@@ -25,11 +25,11 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"
 
 
-extern void __product_r4 (gfc_array_r4 *, gfc_array_r4 *, index_type *);
-export_proto_np(__product_r4);
+extern void product_r4 (gfc_array_r4 *, gfc_array_r4 *, index_type *);
+export_proto(product_r4);
 
 void
-__product_r4 (gfc_array_r4 *retarray, gfc_array_r4 *array, index_type *pdim)
+product_r4 (gfc_array_r4 *retarray, gfc_array_r4 *array, index_type *pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS - 1];
   index_type extent[GFC_MAX_DIMENSIONS - 1];
@@ -149,12 +149,13 @@ __product_r4 (gfc_array_r4 *retarray, gfc_array_r4 *array, index_type *pdim)
 }
 
 
-extern void __mproduct_r4 (gfc_array_r4 *, gfc_array_r4 *, index_type *,
-						gfc_array_l4 *);
-export_proto_np(__mproduct_r4);
+extern void mproduct_r4 (gfc_array_r4 *, gfc_array_r4 *, index_type *,
+					       gfc_array_l4 *);
+export_proto(mproduct_r4);
 
 void
-__mproduct_r4 (gfc_array_r4 * retarray, gfc_array_r4 * array, index_type *pdim, gfc_array_l4 * mask)
+mproduct_r4 (gfc_array_r4 * retarray, gfc_array_r4 * 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/generated/product_r8.c b/libgfortran/generated/product_r8.c
index adba0bc286b..21aaa6e853d 100644
--- a/libgfortran/generated/product_r8.c
+++ b/libgfortran/generated/product_r8.c
@@ -25,11 +25,11 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"
 
 
-extern void __product_r8 (gfc_array_r8 *, gfc_array_r8 *, index_type *);
-export_proto_np(__product_r8);
+extern void product_r8 (gfc_array_r8 *, gfc_array_r8 *, index_type *);
+export_proto(product_r8);
 
 void
-__product_r8 (gfc_array_r8 *retarray, gfc_array_r8 *array, index_type *pdim)
+product_r8 (gfc_array_r8 *retarray, gfc_array_r8 *array, index_type *pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS - 1];
   index_type extent[GFC_MAX_DIMENSIONS - 1];
@@ -149,12 +149,13 @@ __product_r8 (gfc_array_r8 *retarray, gfc_array_r8 *array, index_type *pdim)
 }
 
 
-extern void __mproduct_r8 (gfc_array_r8 *, gfc_array_r8 *, index_type *,
-						gfc_array_l4 *);
-export_proto_np(__mproduct_r8);
+extern void mproduct_r8 (gfc_array_r8 *, gfc_array_r8 *, index_type *,
+					       gfc_array_l4 *);
+export_proto(mproduct_r8);
 
 void
-__mproduct_r8 (gfc_array_r8 * retarray, gfc_array_r8 * array, index_type *pdim, gfc_array_l4 * mask)
+mproduct_r8 (gfc_array_r8 * retarray, gfc_array_r8 * 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/generated/reshape_i4.c b/libgfortran/generated/reshape_i4.c
index 70c32358b34..89b752d276e 100644
--- a/libgfortran/generated/reshape_i4.c
+++ b/libgfortran/generated/reshape_i4.c
@@ -29,12 +29,12 @@ typedef GFC_ARRAY_DESCRIPTOR(1, index_type) shape_type;
 /* The shape parameter is ignored. We can currently deduce the shape from the
    return array.  */
 
-extern void __reshape_4 (gfc_array_i4 *, gfc_array_i4 *, shape_type *,
+extern void reshape_4 (gfc_array_i4 *, gfc_array_i4 *, shape_type *,
 				    gfc_array_i4 *, shape_type *);
-extern_proto_np(__reshape_4);
+export_proto(reshape_4);
 
 void
-__reshape_4 (gfc_array_i4 * ret, gfc_array_i4 * source, shape_type * shape,
+reshape_4 (gfc_array_i4 * ret, gfc_array_i4 * source, shape_type * shape,
                       gfc_array_i4 * pad, shape_type * order)
 {
   /* r.* indicates the return array.  */
diff --git a/libgfortran/generated/reshape_i8.c b/libgfortran/generated/reshape_i8.c
index af76e254d7d..0434eef03ea 100644
--- a/libgfortran/generated/reshape_i8.c
+++ b/libgfortran/generated/reshape_i8.c
@@ -29,12 +29,12 @@ typedef GFC_ARRAY_DESCRIPTOR(1, index_type) shape_type;
 /* The shape parameter is ignored. We can currently deduce the shape from the
    return array.  */
 
-extern void __reshape_8 (gfc_array_i8 *, gfc_array_i8 *, shape_type *,
+extern void reshape_8 (gfc_array_i8 *, gfc_array_i8 *, shape_type *,
 				    gfc_array_i8 *, shape_type *);
-extern_proto_np(__reshape_8);
+export_proto(reshape_8);
 
 void
-__reshape_8 (gfc_array_i8 * ret, gfc_array_i8 * source, shape_type * shape,
+reshape_8 (gfc_array_i8 * ret, gfc_array_i8 * source, shape_type * shape,
                       gfc_array_i8 * pad, shape_type * order)
 {
   /* r.* indicates the return array.  */
diff --git a/libgfortran/generated/shape_i4.c b/libgfortran/generated/shape_i4.c
index 855ccc06b87..ee7c663c13c 100644
--- a/libgfortran/generated/shape_i4.c
+++ b/libgfortran/generated/shape_i4.c
@@ -24,11 +24,11 @@ Boston, MA 02111-1307, USA.  */
 #include <assert.h>
 #include "libgfortran.h"
 
-extern void __shape_4 (gfc_array_i4 * ret, const gfc_array_i4 * array);
-export_proto_np(__shape_4);
+extern void shape_4 (gfc_array_i4 * ret, const gfc_array_i4 * array);
+export_proto(shape_4);
 
 void
-__shape_4 (gfc_array_i4 * ret, const gfc_array_i4 * array)
+shape_4 (gfc_array_i4 * ret, const gfc_array_i4 * array)
 {
   int n;
   index_type stride;
diff --git a/libgfortran/generated/shape_i8.c b/libgfortran/generated/shape_i8.c
index 0dc92f03c35..1bc2d7a19ee 100644
--- a/libgfortran/generated/shape_i8.c
+++ b/libgfortran/generated/shape_i8.c
@@ -24,11 +24,11 @@ Boston, MA 02111-1307, USA.  */
 #include <assert.h>
 #include "libgfortran.h"
 
-extern void __shape_8 (gfc_array_i8 * ret, const gfc_array_i8 * array);
-export_proto_np(__shape_8);
+extern void shape_8 (gfc_array_i8 * ret, const gfc_array_i8 * array);
+export_proto(shape_8);
 
 void
-__shape_8 (gfc_array_i8 * ret, const gfc_array_i8 * array)
+shape_8 (gfc_array_i8 * ret, const gfc_array_i8 * array)
 {
   int n;
   index_type stride;
diff --git a/libgfortran/generated/sum_c4.c b/libgfortran/generated/sum_c4.c
index a4af04ada23..3a13f973ea7 100644
--- a/libgfortran/generated/sum_c4.c
+++ b/libgfortran/generated/sum_c4.c
@@ -25,11 +25,11 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"
 
 
-extern void __sum_c4 (gfc_array_c4 *, gfc_array_c4 *, index_type *);
-export_proto_np(__sum_c4);
+extern void sum_c4 (gfc_array_c4 *, gfc_array_c4 *, index_type *);
+export_proto(sum_c4);
 
 void
-__sum_c4 (gfc_array_c4 *retarray, gfc_array_c4 *array, index_type *pdim)
+sum_c4 (gfc_array_c4 *retarray, gfc_array_c4 *array, index_type *pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS - 1];
   index_type extent[GFC_MAX_DIMENSIONS - 1];
@@ -149,12 +149,13 @@ __sum_c4 (gfc_array_c4 *retarray, gfc_array_c4 *array, index_type *pdim)
 }
 
 
-extern void __msum_c4 (gfc_array_c4 *, gfc_array_c4 *, index_type *,
-						gfc_array_l4 *);
-export_proto_np(__msum_c4);
+extern void msum_c4 (gfc_array_c4 *, gfc_array_c4 *, index_type *,
+					       gfc_array_l4 *);
+export_proto(msum_c4);
 
 void
-__msum_c4 (gfc_array_c4 * retarray, gfc_array_c4 * array, index_type *pdim, gfc_array_l4 * mask)
+msum_c4 (gfc_array_c4 * retarray, gfc_array_c4 * 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/generated/sum_c8.c b/libgfortran/generated/sum_c8.c
index f421e80166e..2a7ff551832 100644
--- a/libgfortran/generated/sum_c8.c
+++ b/libgfortran/generated/sum_c8.c
@@ -25,11 +25,11 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"
 
 
-extern void __sum_c8 (gfc_array_c8 *, gfc_array_c8 *, index_type *);
-export_proto_np(__sum_c8);
+extern void sum_c8 (gfc_array_c8 *, gfc_array_c8 *, index_type *);
+export_proto(sum_c8);
 
 void
-__sum_c8 (gfc_array_c8 *retarray, gfc_array_c8 *array, index_type *pdim)
+sum_c8 (gfc_array_c8 *retarray, gfc_array_c8 *array, index_type *pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS - 1];
   index_type extent[GFC_MAX_DIMENSIONS - 1];
@@ -149,12 +149,13 @@ __sum_c8 (gfc_array_c8 *retarray, gfc_array_c8 *array, index_type *pdim)
 }
 
 
-extern void __msum_c8 (gfc_array_c8 *, gfc_array_c8 *, index_type *,
-						gfc_array_l4 *);
-export_proto_np(__msum_c8);
+extern void msum_c8 (gfc_array_c8 *, gfc_array_c8 *, index_type *,
+					       gfc_array_l4 *);
+export_proto(msum_c8);
 
 void
-__msum_c8 (gfc_array_c8 * retarray, gfc_array_c8 * array, index_type *pdim, gfc_array_l4 * mask)
+msum_c8 (gfc_array_c8 * retarray, gfc_array_c8 * 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/generated/sum_i4.c b/libgfortran/generated/sum_i4.c
index 55b000d83fc..648c59addd8 100644
--- a/libgfortran/generated/sum_i4.c
+++ b/libgfortran/generated/sum_i4.c
@@ -25,11 +25,11 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"
 
 
-extern void __sum_i4 (gfc_array_i4 *, gfc_array_i4 *, index_type *);
-export_proto_np(__sum_i4);
+extern void sum_i4 (gfc_array_i4 *, gfc_array_i4 *, index_type *);
+export_proto(sum_i4);
 
 void
-__sum_i4 (gfc_array_i4 *retarray, gfc_array_i4 *array, index_type *pdim)
+sum_i4 (gfc_array_i4 *retarray, gfc_array_i4 *array, index_type *pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS - 1];
   index_type extent[GFC_MAX_DIMENSIONS - 1];
@@ -149,12 +149,13 @@ __sum_i4 (gfc_array_i4 *retarray, gfc_array_i4 *array, index_type *pdim)
 }
 
 
-extern void __msum_i4 (gfc_array_i4 *, gfc_array_i4 *, index_type *,
-						gfc_array_l4 *);
-export_proto_np(__msum_i4);
+extern void msum_i4 (gfc_array_i4 *, gfc_array_i4 *, index_type *,
+					       gfc_array_l4 *);
+export_proto(msum_i4);
 
 void
-__msum_i4 (gfc_array_i4 * retarray, gfc_array_i4 * array, index_type *pdim, gfc_array_l4 * mask)
+msum_i4 (gfc_array_i4 * retarray, gfc_array_i4 * 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/generated/sum_i8.c b/libgfortran/generated/sum_i8.c
index d72bd128708..60fd32aa8c8 100644
--- a/libgfortran/generated/sum_i8.c
+++ b/libgfortran/generated/sum_i8.c
@@ -25,11 +25,11 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"
 
 
-extern void __sum_i8 (gfc_array_i8 *, gfc_array_i8 *, index_type *);
-export_proto_np(__sum_i8);
+extern void sum_i8 (gfc_array_i8 *, gfc_array_i8 *, index_type *);
+export_proto(sum_i8);
 
 void
-__sum_i8 (gfc_array_i8 *retarray, gfc_array_i8 *array, index_type *pdim)
+sum_i8 (gfc_array_i8 *retarray, gfc_array_i8 *array, index_type *pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS - 1];
   index_type extent[GFC_MAX_DIMENSIONS - 1];
@@ -149,12 +149,13 @@ __sum_i8 (gfc_array_i8 *retarray, gfc_array_i8 *array, index_type *pdim)
 }
 
 
-extern void __msum_i8 (gfc_array_i8 *, gfc_array_i8 *, index_type *,
-						gfc_array_l4 *);
-export_proto_np(__msum_i8);
+extern void msum_i8 (gfc_array_i8 *, gfc_array_i8 *, index_type *,
+					       gfc_array_l4 *);
+export_proto(msum_i8);
 
 void
-__msum_i8 (gfc_array_i8 * retarray, gfc_array_i8 * array, index_type *pdim, gfc_array_l4 * mask)
+msum_i8 (gfc_array_i8 * retarray, gfc_array_i8 * 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/generated/sum_r4.c b/libgfortran/generated/sum_r4.c
index dcb81554e0c..5705ce9f634 100644
--- a/libgfortran/generated/sum_r4.c
+++ b/libgfortran/generated/sum_r4.c
@@ -25,11 +25,11 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"
 
 
-extern void __sum_r4 (gfc_array_r4 *, gfc_array_r4 *, index_type *);
-export_proto_np(__sum_r4);
+extern void sum_r4 (gfc_array_r4 *, gfc_array_r4 *, index_type *);
+export_proto(sum_r4);
 
 void
-__sum_r4 (gfc_array_r4 *retarray, gfc_array_r4 *array, index_type *pdim)
+sum_r4 (gfc_array_r4 *retarray, gfc_array_r4 *array, index_type *pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS - 1];
   index_type extent[GFC_MAX_DIMENSIONS - 1];
@@ -149,12 +149,13 @@ __sum_r4 (gfc_array_r4 *retarray, gfc_array_r4 *array, index_type *pdim)
 }
 
 
-extern void __msum_r4 (gfc_array_r4 *, gfc_array_r4 *, index_type *,
-						gfc_array_l4 *);
-export_proto_np(__msum_r4);
+extern void msum_r4 (gfc_array_r4 *, gfc_array_r4 *, index_type *,
+					       gfc_array_l4 *);
+export_proto(msum_r4);
 
 void
-__msum_r4 (gfc_array_r4 * retarray, gfc_array_r4 * array, index_type *pdim, gfc_array_l4 * mask)
+msum_r4 (gfc_array_r4 * retarray, gfc_array_r4 * 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/generated/sum_r8.c b/libgfortran/generated/sum_r8.c
index 3a6ea96f2d5..df02d6c5f7d 100644
--- a/libgfortran/generated/sum_r8.c
+++ b/libgfortran/generated/sum_r8.c
@@ -25,11 +25,11 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"
 
 
-extern void __sum_r8 (gfc_array_r8 *, gfc_array_r8 *, index_type *);
-export_proto_np(__sum_r8);
+extern void sum_r8 (gfc_array_r8 *, gfc_array_r8 *, index_type *);
+export_proto(sum_r8);
 
 void
-__sum_r8 (gfc_array_r8 *retarray, gfc_array_r8 *array, index_type *pdim)
+sum_r8 (gfc_array_r8 *retarray, gfc_array_r8 *array, index_type *pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS - 1];
   index_type extent[GFC_MAX_DIMENSIONS - 1];
@@ -149,12 +149,13 @@ __sum_r8 (gfc_array_r8 *retarray, gfc_array_r8 *array, index_type *pdim)
 }
 
 
-extern void __msum_r8 (gfc_array_r8 *, gfc_array_r8 *, index_type *,
-						gfc_array_l4 *);
-export_proto_np(__msum_r8);
+extern void msum_r8 (gfc_array_r8 *, gfc_array_r8 *, index_type *,
+					       gfc_array_l4 *);
+export_proto(msum_r8);
 
 void
-__msum_r8 (gfc_array_r8 * retarray, gfc_array_r8 * array, index_type *pdim, gfc_array_l4 * mask)
+msum_r8 (gfc_array_r8 * retarray, gfc_array_r8 * 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/generated/transpose_i4.c b/libgfortran/generated/transpose_i4.c
index 24ae8a8878c..9f96e45d638 100644
--- a/libgfortran/generated/transpose_i4.c
+++ b/libgfortran/generated/transpose_i4.c
@@ -23,11 +23,11 @@ Boston, MA 02111-1307, USA.  */
 #include <assert.h>
 #include "libgfortran.h"
 
-extern void __transpose_4 (gfc_array_i4 * ret, gfc_array_i4 * source);
-export_proto_np(__transpose_4);
+extern void transpose_4 (gfc_array_i4 * ret, gfc_array_i4 * source);
+export_proto(transpose_4);
 
 void
-__transpose_4 (gfc_array_i4 * ret, gfc_array_i4 * source)
+transpose_4 (gfc_array_i4 * ret, gfc_array_i4 * source)
 {
   /* r.* indicates the return array.  */
   index_type rxstride, rystride;
diff --git a/libgfortran/generated/transpose_i8.c b/libgfortran/generated/transpose_i8.c
index 67ef0ddffaa..127110e0f09 100644
--- a/libgfortran/generated/transpose_i8.c
+++ b/libgfortran/generated/transpose_i8.c
@@ -23,11 +23,11 @@ Boston, MA 02111-1307, USA.  */
 #include <assert.h>
 #include "libgfortran.h"
 
-extern void __transpose_8 (gfc_array_i8 * ret, gfc_array_i8 * source);
-export_proto_np(__transpose_8);
+extern void transpose_8 (gfc_array_i8 * ret, gfc_array_i8 * source);
+export_proto(transpose_8);
 
 void
-__transpose_8 (gfc_array_i8 * ret, gfc_array_i8 * source)
+transpose_8 (gfc_array_i8 * ret, gfc_array_i8 * source)
 {
   /* r.* indicates the return array.  */
   index_type rxstride, rystride;