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

112 files changed, 714 insertions, 714 deletions

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index d000e033279..db99a97703b 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,13 @@
+2004-12-12  Richard Henderson  <rth@redhat.com>
+
+	* 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.
+
 2004-12-12  Tobias Schlueter  <tobias.schlueter@physik.uni-muenchen.de>
 
 	PR fortran/18869
diff --git a/gcc/fortran/iresolve.c b/gcc/fortran/iresolve.c
index d942fdd36d4..5e0a61061a2 100644
--- a/gcc/fortran/iresolve.c
+++ b/gcc/fortran/iresolve.c
@@ -126,7 +126,6 @@ free_strings (void)
 void
 gfc_resolve_abs (gfc_expr * f, gfc_expr * a)
 {
-
   f->ts = a->ts;
   if (f->ts.type == BT_COMPLEX)
     f->ts.type = BT_REAL;
@@ -139,7 +138,6 @@ gfc_resolve_abs (gfc_expr * f, gfc_expr * a)
 void
 gfc_resolve_acos (gfc_expr * f, gfc_expr * x)
 {
-
   f->ts = x->ts;
   f->value.function.name =
     gfc_get_string ("__acos_%c%d", gfc_type_letter (x->ts.type), x->ts.kind);
@@ -149,7 +147,6 @@ gfc_resolve_acos (gfc_expr * f, gfc_expr * x)
 void
 gfc_resolve_aimag (gfc_expr * f, gfc_expr * x)
 {
-
   f->ts.type = BT_REAL;
   f->ts.kind = x->ts.kind;
   f->value.function.name =
@@ -160,7 +157,6 @@ gfc_resolve_aimag (gfc_expr * f, gfc_expr * x)
 void
 gfc_resolve_aint (gfc_expr * f, gfc_expr * a, gfc_expr * kind)
 {
-
   f->ts.type = a->ts.type;
   f->ts.kind = (kind == NULL) ? a->ts.kind : mpz_get_si (kind->value.integer);
 
@@ -181,7 +177,6 @@ gfc_resolve_dint (gfc_expr * f, gfc_expr * a)
 void
 gfc_resolve_all (gfc_expr * f, gfc_expr * mask, gfc_expr * dim)
 {
-
   f->ts = mask->ts;
 
   if (dim != NULL)
@@ -192,7 +187,7 @@ gfc_resolve_all (gfc_expr * f, gfc_expr * mask, gfc_expr * dim)
     }
 
   f->value.function.name =
-    gfc_get_string ("__all_%c%d", gfc_type_letter (mask->ts.type),
+    gfc_get_string (PREFIX("all_%c%d"), gfc_type_letter (mask->ts.type),
 		    mask->ts.kind);
 }
 
@@ -200,7 +195,6 @@ gfc_resolve_all (gfc_expr * f, gfc_expr * mask, gfc_expr * dim)
 void
 gfc_resolve_anint (gfc_expr * f, gfc_expr * a, gfc_expr * kind)
 {
-
   f->ts.type = a->ts.type;
   f->ts.kind = (kind == NULL) ? a->ts.kind : mpz_get_si (kind->value.integer);
 
@@ -221,7 +215,6 @@ gfc_resolve_dnint (gfc_expr * f, gfc_expr * a)
 void
 gfc_resolve_any (gfc_expr * f, gfc_expr * mask, gfc_expr * dim)
 {
-
   f->ts = mask->ts;
 
   if (dim != NULL)
@@ -232,7 +225,7 @@ gfc_resolve_any (gfc_expr * f, gfc_expr * mask, gfc_expr * dim)
     }
 
   f->value.function.name =
-    gfc_get_string ("__any_%c%d", gfc_type_letter (mask->ts.type),
+    gfc_get_string (PREFIX("any_%c%d"), gfc_type_letter (mask->ts.type),
 		    mask->ts.kind);
 }
 
@@ -240,7 +233,6 @@ gfc_resolve_any (gfc_expr * f, gfc_expr * mask, gfc_expr * dim)
 void
 gfc_resolve_asin (gfc_expr * f, gfc_expr * x)
 {
-
   f->ts = x->ts;
   f->value.function.name =
     gfc_get_string ("__asin_%c%d", gfc_type_letter (x->ts.type), x->ts.kind);
@@ -250,7 +242,6 @@ gfc_resolve_asin (gfc_expr * f, gfc_expr * x)
 void
 gfc_resolve_atan (gfc_expr * f, gfc_expr * x)
 {
-
   f->ts = x->ts;
   f->value.function.name =
     gfc_get_string ("__atan_%c%d", gfc_type_letter (x->ts.type), x->ts.kind);
@@ -261,7 +252,6 @@ void
 gfc_resolve_atan2 (gfc_expr * f, gfc_expr * x,
 		   gfc_expr * y ATTRIBUTE_UNUSED)
 {
-
   f->ts = x->ts;
   f->value.function.name =
     gfc_get_string ("__atan2_%c%d", gfc_type_letter (x->ts.type), x->ts.kind);
@@ -289,7 +279,6 @@ gfc_resolve_besn (gfc_expr * f, gfc_expr * n, gfc_expr * x)
 void
 gfc_resolve_btest (gfc_expr * f, gfc_expr * i, gfc_expr * pos)
 {
-
   f->ts.type = BT_LOGICAL;
   f->ts.kind = gfc_default_logical_kind;
 
@@ -301,7 +290,6 @@ gfc_resolve_btest (gfc_expr * f, gfc_expr * i, gfc_expr * pos)
 void
 gfc_resolve_ceiling (gfc_expr * f, gfc_expr * a, gfc_expr * kind)
 {
-
   f->ts.type = BT_INTEGER;
   f->ts.kind = (kind == NULL) ? gfc_default_integer_kind
     : mpz_get_si (kind->value.integer);
@@ -315,7 +303,6 @@ gfc_resolve_ceiling (gfc_expr * f, gfc_expr * a, gfc_expr * kind)
 void
 gfc_resolve_char (gfc_expr * f, gfc_expr * a, gfc_expr * kind)
 {
-
   f->ts.type = BT_CHARACTER;
   f->ts.kind = (kind == NULL) ? gfc_default_character_kind
     : mpz_get_si (kind->value.integer);
@@ -329,7 +316,6 @@ gfc_resolve_char (gfc_expr * f, gfc_expr * a, gfc_expr * kind)
 void
 gfc_resolve_cmplx (gfc_expr * f, gfc_expr * x, gfc_expr * y, gfc_expr * kind)
 {
-
   f->ts.type = BT_COMPLEX;
   f->ts.kind = (kind == NULL) ? gfc_default_real_kind
     : mpz_get_si (kind->value.integer);
@@ -354,7 +340,6 @@ gfc_resolve_dcmplx (gfc_expr * f, gfc_expr * x, gfc_expr * y)
 void
 gfc_resolve_conjg (gfc_expr * f, gfc_expr * x)
 {
-
   f->ts = x->ts;
   f->value.function.name = gfc_get_string ("__conjg_%d", x->ts.kind);
 }
@@ -363,7 +348,6 @@ gfc_resolve_conjg (gfc_expr * f, gfc_expr * x)
 void
 gfc_resolve_cos (gfc_expr * f, gfc_expr * x)
 {
-
   f->ts = x->ts;
   f->value.function.name =
     gfc_get_string ("__cos_%c%d", gfc_type_letter (x->ts.type), x->ts.kind);
@@ -373,7 +357,6 @@ gfc_resolve_cos (gfc_expr * f, gfc_expr * x)
 void
 gfc_resolve_cosh (gfc_expr * f, gfc_expr * x)
 {
-
   f->ts = x->ts;
   f->value.function.name =
     gfc_get_string ("__cosh_%c%d", gfc_type_letter (x->ts.type), x->ts.kind);
@@ -383,7 +366,6 @@ gfc_resolve_cosh (gfc_expr * f, gfc_expr * x)
 void
 gfc_resolve_count (gfc_expr * f, gfc_expr * mask, gfc_expr * dim)
 {
-
   f->ts.type = BT_INTEGER;
   f->ts.kind = gfc_default_integer_kind;
 
@@ -395,7 +377,7 @@ gfc_resolve_count (gfc_expr * f, gfc_expr * mask, gfc_expr * dim)
     }
 
   f->value.function.name =
-    gfc_get_string ("__count_%d_%c%d", f->ts.kind,
+    gfc_get_string (PREFIX("count_%d_%c%d"), f->ts.kind,
 		    gfc_type_letter (mask->ts.type), mask->ts.kind);
 }
 
@@ -424,14 +406,13 @@ gfc_resolve_cshift (gfc_expr * f, gfc_expr * array,
 	gfc_convert_type_warn (dim, &shift->ts, 2, 0);
     }
   f->value.function.name =
-    gfc_get_string ("__cshift%d_%d", n, shift->ts.kind);
+    gfc_get_string (PREFIX("cshift%d_%d"), n, shift->ts.kind);
 }
 
 
 void
 gfc_resolve_dble (gfc_expr * f, gfc_expr * a)
 {
-
   f->ts.type = BT_REAL;
   f->ts.kind = gfc_default_double_kind;
   f->value.function.name =
@@ -443,7 +424,6 @@ void
 gfc_resolve_dim (gfc_expr * f, gfc_expr * x,
 		 gfc_expr * y ATTRIBUTE_UNUSED)
 {
-
   f->ts = x->ts;
   f->value.function.name =
     gfc_get_string ("__dim_%c%d", gfc_type_letter (x->ts.type), x->ts.kind);
@@ -472,7 +452,7 @@ gfc_resolve_dot_product (gfc_expr * f, gfc_expr * a, gfc_expr * b)
     }
 
   f->value.function.name =
-    gfc_get_string ("__dot_product_%c%d", gfc_type_letter (f->ts.type),
+    gfc_get_string (PREFIX("dot_product_%c%d"), gfc_type_letter (f->ts.type),
 		    f->ts.kind);
 }
 
@@ -513,14 +493,13 @@ gfc_resolve_eoshift (gfc_expr * f, gfc_expr * array,
     gfc_convert_type_warn (dim, &shift->ts, 2, 0);
 
   f->value.function.name =
-    gfc_get_string ("__eoshift%d_%d", n, shift->ts.kind);
+    gfc_get_string (PREFIX("eoshift%d_%d"), n, shift->ts.kind);
 }
 
 
 void
 gfc_resolve_exp (gfc_expr * f, gfc_expr * x)
 {
-
   f->ts = x->ts;
   f->value.function.name =
     gfc_get_string ("__exp_%c%d", gfc_type_letter (x->ts.type), x->ts.kind);
@@ -530,7 +509,6 @@ gfc_resolve_exp (gfc_expr * f, gfc_expr * x)
 void
 gfc_resolve_exponent (gfc_expr * f, gfc_expr * x)
 {
-
   f->ts.type = BT_INTEGER;
   f->ts.kind = gfc_default_integer_kind;
 
@@ -541,7 +519,6 @@ gfc_resolve_exponent (gfc_expr * f, gfc_expr * x)
 void
 gfc_resolve_floor (gfc_expr * f, gfc_expr * a, gfc_expr * kind)
 {
-
   f->ts.type = BT_INTEGER;
   f->ts.kind = (kind == NULL) ? gfc_default_integer_kind
     : mpz_get_si (kind->value.integer);
@@ -555,7 +532,6 @@ gfc_resolve_floor (gfc_expr * f, gfc_expr * a, gfc_expr * kind)
 void
 gfc_resolve_fnum (gfc_expr * f, gfc_expr * n)
 {
-
   f->ts.type = BT_INTEGER;
   f->ts.kind = gfc_default_integer_kind;
   if (n->ts.kind != f->ts.kind)
@@ -567,7 +543,6 @@ gfc_resolve_fnum (gfc_expr * f, gfc_expr * n)
 void
 gfc_resolve_fraction (gfc_expr * f, gfc_expr * x)
 {
-
   f->ts = x->ts;
   f->value.function.name = gfc_get_string ("__fraction_%d", x->ts.kind);
 }
@@ -640,7 +615,6 @@ gfc_resolve_iand (gfc_expr * f, gfc_expr * i, gfc_expr * j)
 void
 gfc_resolve_ibclr (gfc_expr * f, gfc_expr * i, gfc_expr * pos ATTRIBUTE_UNUSED)
 {
-
   f->ts = i->ts;
   f->value.function.name = gfc_get_string ("__ibclr_%d", i->ts.kind);
 }
@@ -651,7 +625,6 @@ gfc_resolve_ibits (gfc_expr * f, gfc_expr * i,
 		   gfc_expr * pos ATTRIBUTE_UNUSED,
 		   gfc_expr * len ATTRIBUTE_UNUSED)
 {
-
   f->ts = i->ts;
   f->value.function.name = gfc_get_string ("__ibits_%d", i->ts.kind);
 }
@@ -661,7 +634,6 @@ void
 gfc_resolve_ibset (gfc_expr * f, gfc_expr * i,
 		   gfc_expr * pos ATTRIBUTE_UNUSED)
 {
-
   f->ts = i->ts;
   f->value.function.name = gfc_get_string ("__ibset_%d", i->ts.kind);
 }
@@ -670,7 +642,6 @@ gfc_resolve_ibset (gfc_expr * f, gfc_expr * i,
 void
 gfc_resolve_ichar (gfc_expr * f, gfc_expr * c)
 {
-
   f->ts.type = BT_INTEGER;
   f->ts.kind = gfc_default_integer_kind;
 
@@ -726,7 +697,6 @@ gfc_resolve_ior (gfc_expr * f, gfc_expr * i, gfc_expr * j)
 void
 gfc_resolve_int (gfc_expr * f, gfc_expr * a, gfc_expr * kind)
 {
-
   f->ts.type = BT_INTEGER;
   f->ts.kind = (kind == NULL) ? gfc_default_integer_kind
     : mpz_get_si (kind->value.integer);
@@ -740,7 +710,6 @@ gfc_resolve_int (gfc_expr * f, gfc_expr * a, gfc_expr * kind)
 void
 gfc_resolve_ishft (gfc_expr * f, gfc_expr * i, gfc_expr * shift)
 {
-
   f->ts = i->ts;
   f->value.function.name =
     gfc_get_string ("__ishft_%d_%d", i->ts.kind, shift->ts.kind);
@@ -784,7 +753,6 @@ gfc_resolve_lbound (gfc_expr * f, gfc_expr * array,
 void
 gfc_resolve_len (gfc_expr * f, gfc_expr * string)
 {
-
   f->ts.type = BT_INTEGER;
   f->ts.kind = gfc_default_integer_kind;
   f->value.function.name = gfc_get_string ("__len_%d", string->ts.kind);
@@ -794,7 +762,6 @@ gfc_resolve_len (gfc_expr * f, gfc_expr * string)
 void
 gfc_resolve_len_trim (gfc_expr * f, gfc_expr * string)
 {
-
   f->ts.type = BT_INTEGER;
   f->ts.kind = gfc_default_integer_kind;
   f->value.function.name = gfc_get_string ("__len_trim%d", string->ts.kind);
@@ -804,7 +771,6 @@ gfc_resolve_len_trim (gfc_expr * f, gfc_expr * string)
 void
 gfc_resolve_log (gfc_expr * f, gfc_expr * x)
 {
-
   f->ts = x->ts;
   f->value.function.name =
     gfc_get_string ("__log_%c%d", gfc_type_letter (x->ts.type), x->ts.kind);
@@ -814,7 +780,6 @@ gfc_resolve_log (gfc_expr * f, gfc_expr * x)
 void
 gfc_resolve_log10 (gfc_expr * f, gfc_expr * x)
 {
-
   f->ts = x->ts;
   f->value.function.name =
     gfc_get_string ("__log10_%c%d", gfc_type_letter (x->ts.type), x->ts.kind);
@@ -824,7 +789,6 @@ gfc_resolve_log10 (gfc_expr * f, gfc_expr * x)
 void
 gfc_resolve_logical (gfc_expr * f, gfc_expr * a, gfc_expr * kind)
 {
-
   f->ts.type = BT_LOGICAL;
   f->ts.kind = (kind == NULL) ? gfc_default_logical_kind
     : mpz_get_si (kind->value.integer);
@@ -860,7 +824,7 @@ gfc_resolve_matmul (gfc_expr * f, gfc_expr * a, gfc_expr * b)
   f->rank = (a->rank == 2 && b->rank == 2) ? 2 : 1;
 
   f->value.function.name =
-    gfc_get_string ("__matmul_%c%d", gfc_type_letter (f->ts.type),
+    gfc_get_string (PREFIX("matmul_%c%d"), gfc_type_letter (f->ts.type),
 		    f->ts.kind);
 }
 
@@ -917,7 +881,7 @@ gfc_resolve_maxloc (gfc_expr * f, gfc_expr * array, gfc_expr * dim,
 
   name = mask ? "mmaxloc" : "maxloc";
   f->value.function.name =
-    gfc_get_string ("__%s%d_%d_%c%d", name, dim != NULL, f->ts.kind,
+    gfc_get_string (PREFIX("%s%d_%d_%c%d"), name, dim != NULL, f->ts.kind,
                     gfc_type_letter (array->ts.type), array->ts.kind);
 }
 
@@ -926,7 +890,6 @@ void
 gfc_resolve_maxval (gfc_expr * f, gfc_expr * array, gfc_expr * dim,
 		    gfc_expr * mask)
 {
-
   f->ts = array->ts;
 
   if (dim != NULL)
@@ -936,7 +899,7 @@ gfc_resolve_maxval (gfc_expr * f, gfc_expr * array, gfc_expr * dim,
     }
 
   f->value.function.name =
-    gfc_get_string ("__%s_%c%d", mask ? "mmaxval" : "maxval",
+    gfc_get_string (PREFIX("%s_%c%d"), mask ? "mmaxval" : "maxval",
 		    gfc_type_letter (array->ts.type), array->ts.kind);
 }
 
@@ -946,7 +909,6 @@ gfc_resolve_merge (gfc_expr * f, gfc_expr * tsource,
 		   gfc_expr * fsource ATTRIBUTE_UNUSED,
 		   gfc_expr * mask ATTRIBUTE_UNUSED)
 {
-
   f->ts = tsource->ts;
   f->value.function.name =
     gfc_get_string ("__merge_%c%d", gfc_type_letter (tsource->ts.type),
@@ -980,7 +942,7 @@ gfc_resolve_minloc (gfc_expr * f, gfc_expr * array, gfc_expr * dim,
 
   name = mask ? "mminloc" : "minloc";
   f->value.function.name =
-    gfc_get_string ("__%s%d_%d_%c%d", name, dim != NULL, f->ts.kind,
+    gfc_get_string (PREFIX("%s%d_%d_%c%d"), name, dim != NULL, f->ts.kind,
                     gfc_type_letter (array->ts.type), array->ts.kind);
 }
 
@@ -989,7 +951,6 @@ void
 gfc_resolve_minval (gfc_expr * f, gfc_expr * array, gfc_expr * dim,
 		    gfc_expr * mask)
 {
-
   f->ts = array->ts;
 
   if (dim != NULL)
@@ -999,7 +960,7 @@ gfc_resolve_minval (gfc_expr * f, gfc_expr * array, gfc_expr * dim,
     }
 
   f->value.function.name =
-    gfc_get_string ("__%s_%c%d", mask ? "mminval" : "minval",
+    gfc_get_string (PREFIX("%s_%c%d"), mask ? "mminval" : "minval",
 		    gfc_type_letter (array->ts.type), array->ts.kind);
 }
 
@@ -1008,7 +969,6 @@ void
 gfc_resolve_mod (gfc_expr * f, gfc_expr * a,
 		 gfc_expr * p ATTRIBUTE_UNUSED)
 {
-
   f->ts = a->ts;
   f->value.function.name =
     gfc_get_string ("__mod_%c%d", gfc_type_letter (a->ts.type), a->ts.kind);
@@ -1019,7 +979,6 @@ void
 gfc_resolve_modulo (gfc_expr * f, gfc_expr * a,
 		    gfc_expr * p ATTRIBUTE_UNUSED)
 {
-
   f->ts = a->ts;
   f->value.function.name =
     gfc_get_string ("__modulo_%c%d", gfc_type_letter (a->ts.type),
@@ -1027,10 +986,8 @@ gfc_resolve_modulo (gfc_expr * f, gfc_expr * a,
 }
 
 void
-gfc_resolve_nearest (gfc_expr * f, gfc_expr * a,
-             gfc_expr *p ATTRIBUTE_UNUSED)
+gfc_resolve_nearest (gfc_expr * f, gfc_expr * a, gfc_expr *p ATTRIBUTE_UNUSED)
 {
-
   f->ts = a->ts;
   f->value.function.name =
     gfc_get_string ("__nearest_%c%d", gfc_type_letter (a->ts.type),
@@ -1040,7 +997,6 @@ gfc_resolve_nearest (gfc_expr * f, gfc_expr * a,
 void
 gfc_resolve_nint (gfc_expr * f, gfc_expr * a, gfc_expr * kind)
 {
-
   f->ts.type = BT_INTEGER;
   f->ts.kind = (kind == NULL) ? gfc_default_integer_kind
     : mpz_get_si (kind->value.integer);
@@ -1053,7 +1009,6 @@ gfc_resolve_nint (gfc_expr * f, gfc_expr * a, gfc_expr * kind)
 void
 gfc_resolve_not (gfc_expr * f, gfc_expr * i)
 {
-
   f->ts = i->ts;
   f->value.function.name = gfc_get_string ("__not_%d", i->ts.kind);
 }
@@ -1065,14 +1020,11 @@ gfc_resolve_pack (gfc_expr * f,
 		  gfc_expr * mask,
 		  gfc_expr * vector ATTRIBUTE_UNUSED)
 {
-  static char pack[] = "__pack",
-    pack_s[] = "__pack_s";
-
   f->ts = array->ts;
   f->rank = 1;
 
   if (mask->rank != 0)
-    f->value.function.name = pack;
+    f->value.function.name = PREFIX("pack");
   else
     {
       /* We convert mask to default logical only in the scalar case.
@@ -1087,7 +1039,7 @@ gfc_resolve_pack (gfc_expr * f,
 	  gfc_convert_type (mask, &ts, 2);
 	}
 
-      f->value.function.name = pack_s;
+      f->value.function.name = PREFIX("pack_s");
     }
 }
 
@@ -1096,7 +1048,6 @@ void
 gfc_resolve_product (gfc_expr * f, gfc_expr * array, gfc_expr * dim,
 		     gfc_expr * mask)
 {
-
   f->ts = array->ts;
 
   if (dim != NULL)
@@ -1106,7 +1057,7 @@ gfc_resolve_product (gfc_expr * f, gfc_expr * array, gfc_expr * dim,
     }
 
   f->value.function.name =
-    gfc_get_string ("__%s_%c%d", mask ? "mproduct" : "product",
+    gfc_get_string (PREFIX("%s_%c%d"), mask ? "mproduct" : "product",
 		    gfc_type_letter (array->ts.type), array->ts.kind);
 }
 
@@ -1114,7 +1065,6 @@ gfc_resolve_product (gfc_expr * f, gfc_expr * array, gfc_expr * dim,
 void
 gfc_resolve_real (gfc_expr * f, gfc_expr * a, gfc_expr * kind)
 {
-
   f->ts.type = BT_REAL;
 
   if (kind != NULL)
@@ -1131,9 +1081,8 @@ gfc_resolve_real (gfc_expr * f, gfc_expr * a, gfc_expr * kind)
 
 void
 gfc_resolve_repeat (gfc_expr * f, gfc_expr * string,
-		   gfc_expr * ncopies ATTRIBUTE_UNUSED)
+		    gfc_expr * ncopies ATTRIBUTE_UNUSED)
 {
-
   f->ts.type = BT_CHARACTER;
   f->ts.kind = string->ts.kind;
   f->value.function.name = gfc_get_string ("__repeat_%d", string->ts.kind);
@@ -1145,7 +1094,6 @@ gfc_resolve_reshape (gfc_expr * f, gfc_expr * source, gfc_expr * shape,
 		     gfc_expr * pad ATTRIBUTE_UNUSED,
 		     gfc_expr * order ATTRIBUTE_UNUSED)
 {
-  static char reshape0[] = "__reshape";
   mpz_t rank;
   int kind;
   int i;
@@ -1178,11 +1126,11 @@ gfc_resolve_reshape (gfc_expr * f, gfc_expr * source, gfc_expr * shape,
     case 8:
     /* case 16: */
       f->value.function.name =
-	gfc_get_string ("__reshape_%d", source->ts.kind);
+	gfc_get_string (PREFIX("reshape_%d"), source->ts.kind);
       break;
 
     default:
-      f->value.function.name = reshape0;
+      f->value.function.name = PREFIX("reshape");
       break;
     }
 
@@ -1217,7 +1165,6 @@ gfc_resolve_reshape (gfc_expr * f, gfc_expr * source, gfc_expr * shape,
 void
 gfc_resolve_rrspacing (gfc_expr * f, gfc_expr * x)
 {
-
   f->ts = x->ts;
   f->value.function.name = gfc_get_string ("__rrspacing_%d", x->ts.kind);
 }
@@ -1226,7 +1173,6 @@ gfc_resolve_rrspacing (gfc_expr * f, gfc_expr * x)
 void
 gfc_resolve_scale (gfc_expr * f, gfc_expr * x, gfc_expr * i)
 {
-
   f->ts = x->ts;
 
   /* The implementation calls scalbn which takes an int as the
@@ -1250,7 +1196,6 @@ gfc_resolve_scan (gfc_expr * f, gfc_expr * string,
 		  gfc_expr * set ATTRIBUTE_UNUSED,
 		  gfc_expr * back ATTRIBUTE_UNUSED)
 {
-
   f->ts.type = BT_INTEGER;
   f->ts.kind = gfc_default_integer_kind;
   f->value.function.name = gfc_get_string ("__scan_%d", string->ts.kind);
@@ -1260,7 +1205,6 @@ gfc_resolve_scan (gfc_expr * f, gfc_expr * string,
 void
 gfc_resolve_set_exponent (gfc_expr * f, gfc_expr * x, gfc_expr * i)
 {
-
   f->ts = x->ts;
 
   /* The library implementation uses GFC_INTEGER_4 unconditionally,
@@ -1283,11 +1227,10 @@ gfc_resolve_set_exponent (gfc_expr * f, gfc_expr * x, gfc_expr * i)
 void
 gfc_resolve_shape (gfc_expr * f, gfc_expr * array)
 {
-
   f->ts.type = BT_INTEGER;
   f->ts.kind = gfc_default_integer_kind;
   f->rank = 1;
-  f->value.function.name = gfc_get_string ("__shape_%d", f->ts.kind);
+  f->value.function.name = gfc_get_string (PREFIX("shape_%d"), f->ts.kind);
   f->shape = gfc_get_shape (1);
   mpz_init_set_ui (f->shape[0], array->rank);
 }
@@ -1296,7 +1239,6 @@ gfc_resolve_shape (gfc_expr * f, gfc_expr * array)
 void
 gfc_resolve_sign (gfc_expr * f, gfc_expr * a, gfc_expr * b ATTRIBUTE_UNUSED)
 {
-
   f->ts = a->ts;
   f->value.function.name =
     gfc_get_string ("__sign_%c%d", gfc_type_letter (a->ts.type), a->ts.kind);
@@ -1306,7 +1248,6 @@ gfc_resolve_sign (gfc_expr * f, gfc_expr * a, gfc_expr * b ATTRIBUTE_UNUSED)
 void
 gfc_resolve_sin (gfc_expr * f, gfc_expr * x)
 {
-
   f->ts = x->ts;
   f->value.function.name =
     gfc_get_string ("__sin_%c%d", gfc_type_letter (x->ts.type), x->ts.kind);
@@ -1316,7 +1257,6 @@ gfc_resolve_sin (gfc_expr * f, gfc_expr * x)
 void
 gfc_resolve_sinh (gfc_expr * f, gfc_expr * x)
 {
-
   f->ts = x->ts;
   f->value.function.name =
     gfc_get_string ("__sinh_%c%d", gfc_type_letter (x->ts.type), x->ts.kind);
@@ -1326,7 +1266,6 @@ gfc_resolve_sinh (gfc_expr * f, gfc_expr * x)
 void
 gfc_resolve_spacing (gfc_expr * f, gfc_expr * x)
 {
-
   f->ts = x->ts;
   f->value.function.name = gfc_get_string ("__spacing_%d", x->ts.kind);
 }
@@ -1337,11 +1276,9 @@ gfc_resolve_spread (gfc_expr * f, gfc_expr * source,
 		    gfc_expr * dim,
 		    gfc_expr * ncopies)
 {
-  static char spread[] = "__spread";
-
   f->ts = source->ts;
   f->rank = source->rank + 1;
-  f->value.function.name = spread;
+  f->value.function.name = PREFIX("spread");
 
   gfc_resolve_index (dim, 1);
   gfc_resolve_index (ncopies, 1);
@@ -1351,7 +1288,6 @@ gfc_resolve_spread (gfc_expr * f, gfc_expr * source,
 void
 gfc_resolve_sqrt (gfc_expr * f, gfc_expr * x)
 {
-
   f->ts = x->ts;
   f->value.function.name =
     gfc_get_string ("__sqrt_%c%d", gfc_type_letter (x->ts.type), x->ts.kind);
@@ -1364,7 +1300,6 @@ void
 gfc_resolve_stat (gfc_expr * f, gfc_expr * n ATTRIBUTE_UNUSED,
 		  gfc_expr * a ATTRIBUTE_UNUSED)
 {
-
   f->ts.type = BT_INTEGER;
   f->ts.kind = gfc_default_integer_kind;
   f->value.function.name = gfc_get_string (PREFIX("stat_i%d"), f->ts.kind);
@@ -1374,7 +1309,6 @@ gfc_resolve_stat (gfc_expr * f, gfc_expr * n ATTRIBUTE_UNUSED,
 void
 gfc_resolve_fstat (gfc_expr * f, gfc_expr * n, gfc_expr * a ATTRIBUTE_UNUSED)
 {
-
   f->ts.type = BT_INTEGER;
   f->ts.kind = gfc_default_integer_kind;
   if (n->ts.kind != f->ts.kind)
@@ -1388,7 +1322,6 @@ void
 gfc_resolve_sum (gfc_expr * f, gfc_expr * array, gfc_expr * dim,
 		 gfc_expr * mask)
 {
-
   f->ts = array->ts;
 
   if (dim != NULL)
@@ -1398,7 +1331,7 @@ gfc_resolve_sum (gfc_expr * f, gfc_expr * array, gfc_expr * dim,
     }
 
   f->value.function.name =
-    gfc_get_string ("__%s_%c%d", mask ? "msum" : "sum",
+    gfc_get_string (PREFIX("%s_%c%d"), mask ? "msum" : "sum",
 		    gfc_type_letter (array->ts.type), array->ts.kind);
 }
 
@@ -1417,7 +1350,6 @@ gfc_resolve_system (gfc_expr * f, gfc_expr * n ATTRIBUTE_UNUSED)
 void
 gfc_resolve_tan (gfc_expr * f, gfc_expr * x)
 {
-
   f->ts = x->ts;
   f->value.function.name =
     gfc_get_string ("__tan_%c%d", gfc_type_letter (x->ts.type), x->ts.kind);
@@ -1427,7 +1359,6 @@ gfc_resolve_tan (gfc_expr * f, gfc_expr * x)
 void
 gfc_resolve_tanh (gfc_expr * f, gfc_expr * x)
 {
-
   f->ts = x->ts;
   f->value.function.name =
     gfc_get_string ("__tanh_%c%d", gfc_type_letter (x->ts.type), x->ts.kind);
@@ -1459,7 +1390,6 @@ gfc_resolve_transfer (gfc_expr * f, gfc_expr * source ATTRIBUTE_UNUSED,
 void
 gfc_resolve_transpose (gfc_expr * f, gfc_expr * matrix)
 {
-  static char transpose0[] = "__transpose";
   int kind;
 
   f->ts = matrix->ts;
@@ -1495,11 +1425,11 @@ gfc_resolve_transpose (gfc_expr * f, gfc_expr * matrix)
     case 8:
     /* case 16: */
       f->value.function.name =
-        gfc_get_string ("__transpose_%d", kind);
+        gfc_get_string (PREFIX("transpose_%d"), kind);
       break;
 
     default:
-      f->value.function.name = transpose0;
+      f->value.function.name = PREFIX("transpose");
     }
 }
 
@@ -1507,7 +1437,6 @@ gfc_resolve_transpose (gfc_expr * f, gfc_expr * matrix)
 void
 gfc_resolve_trim (gfc_expr * f, gfc_expr * string)
 {
-
   f->ts.type = BT_CHARACTER;
   f->ts.kind = string->ts.kind;
   f->value.function.name = gfc_get_string ("__trim_%d", string->ts.kind);
@@ -1539,7 +1468,6 @@ gfc_resolve_ubound (gfc_expr * f, gfc_expr * array,
 void
 gfc_resolve_umask (gfc_expr * f, gfc_expr * n)
 {
-
   f->ts.type = BT_INTEGER;
   f->ts.kind = n->ts.kind;
   f->value.function.name = gfc_get_string (PREFIX("umask_i%d"), n->ts.kind);
@@ -1551,7 +1479,6 @@ gfc_resolve_umask (gfc_expr * f, gfc_expr * n)
 void
 gfc_resolve_unlink (gfc_expr * f, gfc_expr * n ATTRIBUTE_UNUSED)
 {
-
   f->ts.type = BT_INTEGER;
   f->ts.kind = 4;
   f->value.function.name = gfc_get_string (PREFIX("unlink"));
@@ -1561,13 +1488,12 @@ void
 gfc_resolve_unpack (gfc_expr * f, gfc_expr * vector, gfc_expr * mask,
 		    gfc_expr * field ATTRIBUTE_UNUSED)
 {
-
   f->ts.type = vector->ts.type;
   f->ts.kind = vector->ts.kind;
   f->rank = mask->rank;
 
   f->value.function.name =
-    gfc_get_string ("__unpack%d", field->rank > 0 ? 1 : 0);
+    gfc_get_string (PREFIX("unpack%d"), field->rank > 0 ? 1 : 0);
 }
 
 
@@ -1576,7 +1502,6 @@ gfc_resolve_verify (gfc_expr * f, gfc_expr * string,
 		    gfc_expr * set ATTRIBUTE_UNUSED,
 		    gfc_expr * back ATTRIBUTE_UNUSED)
 {
-
   f->ts.type = BT_INTEGER;
   f->ts.kind = gfc_default_integer_kind;
   f->value.function.name = gfc_get_string ("__verify_%d", string->ts.kind);
@@ -1875,6 +1800,5 @@ gfc_iresolve_init_1 (void)
 void
 gfc_iresolve_done_1 (void)
 {
-
   free_strings ();
 }
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 83084aad13a..9397aa9839d 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,5 +1,17 @@
 2004-12-12  Richard Henderson  <rth@redhat.com>
 
+	* 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.
+
+2004-12-12  Richard Henderson  <rth@redhat.com>
+
 	* acinclude.m4 (LIBGFOR_CHECK_ATTRIBUTE_VISIBILITY): New.
 	(LIBGFOR_CHECK_ATTRIBUTE_DLLEXPORT): New.
 	(LIBGFOR_CHECK_ATTRIBUTE_ALIAS): New.
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;
diff --git a/libgfortran/intrinsics/cshift0.c b/libgfortran/intrinsics/cshift0.c
index 9fd87855634..4783eda7c61 100644
--- a/libgfortran/intrinsics/cshift0.c
+++ b/libgfortran/intrinsics/cshift0.c
@@ -66,8 +66,8 @@ DEF_COPY_LOOP(ldouble, long double)
 
 
 static void
-__cshift0 (gfc_array_char * ret, const gfc_array_char * array,
-	   ssize_t shift, int which)
+cshift0 (gfc_array_char * ret, const gfc_array_char * array,
+	 ssize_t shift, int which)
 {
   /* r.* indicates the return array.  */
   index_type rstride[GFC_MAX_DIMENSIONS - 1];
@@ -238,24 +238,24 @@ __cshift0 (gfc_array_char * ret, const gfc_array_char * array,
 }
 
 
-extern void __cshift0_4 (gfc_array_char *, const gfc_array_char *,
-			 const GFC_INTEGER_4 *, const GFC_INTEGER_4 *);
-export_proto_np(__cshift0_4);
+extern void cshift0_4 (gfc_array_char *, const gfc_array_char *,
+		       const GFC_INTEGER_4 *, const GFC_INTEGER_4 *);
+export_proto(cshift0_4);
 
 void
-__cshift0_4 (gfc_array_char * ret, const gfc_array_char * array,
-    const GFC_INTEGER_4 * pshift, const GFC_INTEGER_4 * pdim)
+cshift0_4 (gfc_array_char *ret, const gfc_array_char *array,
+	   const GFC_INTEGER_4 *pshift, const GFC_INTEGER_4 *pdim)
 {
-  __cshift0 (ret, array, *pshift, pdim ? *pdim : 1);
+  cshift0 (ret, array, *pshift, pdim ? *pdim : 1);
 }
 
-extern void __cshift0_8 (gfc_array_char *, const gfc_array_char *,
-			 const GFC_INTEGER_8 *, const GFC_INTEGER_8 *);
-export_proto_np(__cshift0_8);
+extern void cshift0_8 (gfc_array_char *, const gfc_array_char *,
+		       const GFC_INTEGER_8 *, const GFC_INTEGER_8 *);
+export_proto(cshift0_8);
 
 void
-__cshift0_8 (gfc_array_char * ret, const gfc_array_char * array,
-    const GFC_INTEGER_8 * pshift, const GFC_INTEGER_8 * pdim)
+cshift0_8 (gfc_array_char *ret, const gfc_array_char *array,
+	   const GFC_INTEGER_8 *pshift, const GFC_INTEGER_8 *pdim)
 {
-  __cshift0 (ret, array, *pshift, pdim ? *pdim : 1);
+  cshift0 (ret, array, *pshift, pdim ? *pdim : 1);
 }
diff --git a/libgfortran/intrinsics/eoshift0.c b/libgfortran/intrinsics/eoshift0.c
index df749a4072c..66f0ab1f6ea 100644
--- a/libgfortran/intrinsics/eoshift0.c
+++ b/libgfortran/intrinsics/eoshift0.c
@@ -32,8 +32,8 @@ static const char zeros[16] =
    sizeof(int) < sizeof (index_type).  */
 
 static void
-__eoshift0 (gfc_array_char * ret, const gfc_array_char * array,
-    int shift, const char * pbound, int which)
+eoshift0 (gfc_array_char * ret, const gfc_array_char * array,
+	  int shift, const char * pbound, int which)
 {
   /* r.* indicates the return array.  */
   index_type rstride[GFC_MAX_DIMENSIONS - 1];
@@ -187,28 +187,28 @@ __eoshift0 (gfc_array_char * ret, const gfc_array_char * array,
     }
 }
 
-extern void __eoshift0_4 (gfc_array_char *, const gfc_array_char *,
-			  const GFC_INTEGER_4 *, const char *,
-			  const GFC_INTEGER_4 *);
-export_proto_np(__eoshift0_4);
+extern void eoshift0_4 (gfc_array_char *, const gfc_array_char *,
+			const GFC_INTEGER_4 *, const char *,
+			const GFC_INTEGER_4 *);
+export_proto(eoshift0_4);
 
 void
-__eoshift0_4 (gfc_array_char * ret, const gfc_array_char * array,
-    const GFC_INTEGER_4 * pshift, const char * pbound,
-    const GFC_INTEGER_4 * pdim)
+eoshift0_4 (gfc_array_char *ret, const gfc_array_char *array,
+	    const GFC_INTEGER_4 *pshift, const char *pbound,
+	    const GFC_INTEGER_4 *pdim)
 {
-  __eoshift0 (ret, array, *pshift, pbound, pdim ? *pdim : 1);
+  eoshift0 (ret, array, *pshift, pbound, pdim ? *pdim : 1);
 }
 
-extern void __eoshift0_8 (gfc_array_char *, const gfc_array_char *,
-			  const GFC_INTEGER_8 *, const char *,
-			  const GFC_INTEGER_8 *);
-export_proto_np(__eoshift0_8);
+extern void eoshift0_8 (gfc_array_char *, const gfc_array_char *,
+			const GFC_INTEGER_8 *, const char *,
+			const GFC_INTEGER_8 *);
+export_proto(eoshift0_8);
 
 void
-__eoshift0_8 (gfc_array_char * ret, const gfc_array_char * array,
-    const GFC_INTEGER_8 * pshift, const char * pbound,
-    const GFC_INTEGER_8 * pdim)
+eoshift0_8 (gfc_array_char *ret, const gfc_array_char *array,
+	    const GFC_INTEGER_8 *pshift, const char *pbound,
+	    const GFC_INTEGER_8 *pdim)
 {
-  __eoshift0 (ret, array, *pshift, pbound, pdim ? *pdim : 1);
+  eoshift0 (ret, array, *pshift, pbound, pdim ? *pdim : 1);
 }
diff --git a/libgfortran/intrinsics/eoshift2.c b/libgfortran/intrinsics/eoshift2.c
index 388486d203c..e7409e67049 100644
--- a/libgfortran/intrinsics/eoshift2.c
+++ b/libgfortran/intrinsics/eoshift2.c
@@ -32,8 +32,8 @@ static const char zeros[16] =
    sizeof(int) < sizeof (index_type).  */
 
 static void
-__eoshift2 (gfc_array_char * ret, const gfc_array_char * array,
-    int shift, const gfc_array_char * bound, int which)
+eoshift2 (gfc_array_char *ret, const gfc_array_char *array,
+	  int shift, const gfc_array_char *bound, int which)
 {
   /* r.* indicates the return array.  */
   index_type rstride[GFC_MAX_DIMENSIONS - 1];
@@ -203,28 +203,28 @@ __eoshift2 (gfc_array_char * ret, const gfc_array_char * array,
     }
 }
 
-extern void __eoshift2_4 (gfc_array_char *, const gfc_array_char *,
-			  const GFC_INTEGER_4 *, const gfc_array_char *,
-			  const GFC_INTEGER_4 *);
-export_proto_np(__eoshift2_4);
+extern void eoshift2_4 (gfc_array_char *, const gfc_array_char *,
+			const GFC_INTEGER_4 *, const gfc_array_char *,
+			const GFC_INTEGER_4 *);
+export_proto(eoshift2_4);
 
 void
-__eoshift2_4 (gfc_array_char * ret, const gfc_array_char * array,
-    const GFC_INTEGER_4 * pshift, const gfc_array_char * bound,
-    const GFC_INTEGER_4 * pdim)
+eoshift2_4 (gfc_array_char *ret, const gfc_array_char *array,
+	    const GFC_INTEGER_4 *pshift, const gfc_array_char *bound,
+	    const GFC_INTEGER_4 *pdim)
 {
-  __eoshift2 (ret, array, *pshift, bound, pdim ? *pdim : 1);
+  eoshift2 (ret, array, *pshift, bound, pdim ? *pdim : 1);
 }
 
-extern void __eoshift2_8 (gfc_array_char *, const gfc_array_char *,
-			  const GFC_INTEGER_8 *, const gfc_array_char *,
-			  const GFC_INTEGER_8 *);
-export_proto_np(__eoshift2_8);
+extern void eoshift2_8 (gfc_array_char *, const gfc_array_char *,
+			const GFC_INTEGER_8 *, const gfc_array_char *,
+			const GFC_INTEGER_8 *);
+export_proto(eoshift2_8);
 
 void
-__eoshift2_8 (gfc_array_char * ret, const gfc_array_char * array,
-    const GFC_INTEGER_8 * pshift, const gfc_array_char * bound,
-    const GFC_INTEGER_8 * pdim)
+eoshift2_8 (gfc_array_char *ret, const gfc_array_char *array,
+	    const GFC_INTEGER_8 *pshift, const gfc_array_char *bound,
+	    const GFC_INTEGER_8 *pdim)
 {
-  __eoshift2 (ret, array, *pshift, bound, pdim ? *pdim : 1);
+  eoshift2 (ret, array, *pshift, bound, pdim ? *pdim : 1);
 }
diff --git a/libgfortran/intrinsics/pack_generic.c b/libgfortran/intrinsics/pack_generic.c
index 0332b7957a8..6180135949f 100644
--- a/libgfortran/intrinsics/pack_generic.c
+++ b/libgfortran/intrinsics/pack_generic.c
@@ -65,13 +65,13 @@ Boston, MA 02111-1307, USA.  */
 There are two variants of the PACK intrinsic: one, where MASK is
 array valued, and the other one where MASK is scalar.  */
 
-extern void __pack (gfc_array_char *, const gfc_array_char *,
-		    const gfc_array_l4 *, const gfc_array_char *);
-export_proto_np(__pack);
+extern void pack (gfc_array_char *, const gfc_array_char *,
+		  const gfc_array_l4 *, const gfc_array_char *);
+export_proto(pack);
 
 void
-__pack (gfc_array_char * ret, const gfc_array_char * array,
-	const gfc_array_l4 * mask, const gfc_array_char * vector)
+pack (gfc_array_char *ret, const gfc_array_char *array,
+      const gfc_array_l4 *mask, const gfc_array_char *vector)
 {
   /* r.* indicates the return array.  */
   index_type rstride0;
@@ -269,13 +269,13 @@ __pack (gfc_array_char * ret, const gfc_array_char * array,
     }
 }
 
-extern void __pack_s (gfc_array_char *ret, const gfc_array_char *array,
-		      const GFC_LOGICAL_4 *, const gfc_array_char *);
-export_proto_np(__pack_s);
+extern void pack_s (gfc_array_char *ret, const gfc_array_char *array,
+		    const GFC_LOGICAL_4 *, const gfc_array_char *);
+export_proto(pack_s);
 
 void
-__pack_s (gfc_array_char * ret, const gfc_array_char * array,
-	  const GFC_LOGICAL_4 * mask, const gfc_array_char * vector)
+pack_s (gfc_array_char *ret, const gfc_array_char *array,
+	const GFC_LOGICAL_4 *mask, const gfc_array_char *vector)
 {
   /* r.* indicates the return array.  */
   index_type rstride0;
diff --git a/libgfortran/intrinsics/reshape_generic.c b/libgfortran/intrinsics/reshape_generic.c
index aecc6b6469d..18568af0830 100644
--- a/libgfortran/intrinsics/reshape_generic.c
+++ b/libgfortran/intrinsics/reshape_generic.c
@@ -28,16 +28,15 @@ Boston, MA 02111-1307, USA.  */
 typedef GFC_ARRAY_DESCRIPTOR(1, index_type) shape_type;
 typedef GFC_ARRAY_DESCRIPTOR(GFC_MAX_DIMENSIONS, char) parray;
 
-extern void __reshape (parray *, parray *, shape_type *,
-		       parray *, shape_type *);
-export_proto_np(__reshape);
+extern void reshape (parray *, parray *, shape_type *, parray *, shape_type *);
+export_proto(reshape);
 
 /* The shape parameter is ignored. We can currently deduce the shape from the
    return array.  */
 
 void
-__reshape (parray * ret, parray * source, shape_type * shape,
-           parray * pad, shape_type * order)
+reshape (parray *ret, parray *source, shape_type *shape,
+	 parray *pad, shape_type *order)
 {
   /* r.* indicates the return array.  */
   index_type rcount[GFC_MAX_DIMENSIONS - 1];
diff --git a/libgfortran/intrinsics/spread_generic.c b/libgfortran/intrinsics/spread_generic.c
index 0cada54c99f..44c402798ae 100644
--- a/libgfortran/intrinsics/spread_generic.c
+++ b/libgfortran/intrinsics/spread_generic.c
@@ -1,4 +1,4 @@
-/* Generic implementation of the RESHAPE intrinsic
+/* Generic implementation of the SPREAD intrinsic
    Copyright 2002 Free Software Foundation, Inc.
    Contributed by Paul Brook <paul@nowt.org>
 
@@ -25,13 +25,13 @@ Boston, MA 02111-1307, USA.  */
 #include <string.h>
 #include "libgfortran.h"
 
-extern void __spread (const gfc_array_char *, const gfc_array_char *,
-		      const index_type *, const index_type *);
-export_proto_np(__spread);
+extern void spread (const gfc_array_char *, const gfc_array_char *,
+		    const index_type *, const index_type *);
+export_proto(spread);
 
 void
-__spread (const gfc_array_char * ret, const gfc_array_char * source,
-    const index_type * along, const index_type * pncopies)
+spread (const gfc_array_char *ret, const gfc_array_char *source,
+	const index_type *along, const index_type *pncopies)
 {
   /* r.* indicates the return array.  */
   index_type rstride[GFC_MAX_DIMENSIONS - 1];
diff --git a/libgfortran/intrinsics/transpose_generic.c b/libgfortran/intrinsics/transpose_generic.c
index ba3014f07aa..af66be51c41 100644
--- a/libgfortran/intrinsics/transpose_generic.c
+++ b/libgfortran/intrinsics/transpose_generic.c
@@ -25,11 +25,11 @@ Boston, MA 02111-1307, USA.  */
 #include <assert.h>
 #include "libgfortran.h"
 
-extern void __transpose (gfc_array_char *, gfc_array_char *);
-export_proto_np(__transpose);
+extern void transpose (gfc_array_char *, gfc_array_char *);
+export_proto(transpose);
 
 void
-__transpose (gfc_array_char * ret, gfc_array_char * source)
+transpose (gfc_array_char *ret, gfc_array_char *source)
 {
   /* r.* indicates the return array.  */
   index_type rxstride, rystride;
diff --git a/libgfortran/intrinsics/unpack_generic.c b/libgfortran/intrinsics/unpack_generic.c
index 16deea4d48d..1add5c8d90d 100644
--- a/libgfortran/intrinsics/unpack_generic.c
+++ b/libgfortran/intrinsics/unpack_generic.c
@@ -25,13 +25,13 @@ Boston, MA 02111-1307, USA.  */
 #include <string.h>
 #include "libgfortran.h"
 
-extern void __unpack1 (const gfc_array_char *, const gfc_array_char *,
-		       const gfc_array_l4 *, const gfc_array_char *);
-export_proto_np(__unpack1);
+extern void unpack1 (const gfc_array_char *, const gfc_array_char *,
+		     const gfc_array_l4 *, const gfc_array_char *);
+iexport_proto(unpack1);
 
 void
-__unpack1 (const gfc_array_char * ret, const gfc_array_char * vector,
-    const gfc_array_l4 * mask, const gfc_array_char * field)
+unpack1 (const gfc_array_char *ret, const gfc_array_char *vector,
+	 const gfc_array_l4 *mask, const gfc_array_char *field)
 {
   /* r.* indicates the return array.  */
   index_type rstride[GFC_MAX_DIMENSIONS];
@@ -143,18 +143,19 @@ __unpack1 (const gfc_array_char * ret, const gfc_array_char * vector,
         }
     }
 }
+iexport(unpack1);
 
-extern void __unpack0 (const gfc_array_char *, const gfc_array_char *,
-		       const gfc_array_l4 *, char *);
-export_proto_np(__unpack0);
+extern void unpack0 (const gfc_array_char *, const gfc_array_char *,
+		     const gfc_array_l4 *, char *);
+export_proto(unpack0);
 
 void
-__unpack0 (const gfc_array_char * ret, const gfc_array_char * vector,
-    const gfc_array_l4 * mask, char * field)
+unpack0 (const gfc_array_char *ret, const gfc_array_char *vector,
+	 const gfc_array_l4 *mask, char *field)
 {
   gfc_array_char tmp;
 
   tmp.dtype = 0;
   tmp.data = field;
-  __unpack1 (ret, vector, mask, &tmp);
+  unpack1 (ret, vector, mask, &tmp);
 }
diff --git a/libgfortran/m4/cshift1.m4 b/libgfortran/m4/cshift1.m4
index 989f91cfdb6..aad17497088 100644
--- a/libgfortran/m4/cshift1.m4
+++ b/libgfortran/m4/cshift1.m4
@@ -26,15 +26,15 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"'
 include(iparm.m4)dnl
 
-void __cshift1_`'atype_kind (const gfc_array_char * ret,
-			     const gfc_array_char * array,
-			     const atype * h, const atype_name * pwhich);
-export_proto_np(__cshift1_`'atype_kind);
+void cshift1_`'atype_kind (const gfc_array_char * ret,
+			   const gfc_array_char * array,
+			   const atype * h, const atype_name * pwhich);
+export_proto(cshift1_`'atype_kind);
 
 void
-__cshift1_`'atype_kind (const gfc_array_char * ret,
-			const gfc_array_char * array,
-			const atype * h, const atype_name * pwhich)
+cshift1_`'atype_kind (const gfc_array_char * ret,
+		      const gfc_array_char * array,
+		      const atype * h, const atype_name * pwhich)
 {
   /* r.* indicates the return array.  */
   index_type rstride[GFC_MAX_DIMENSIONS - 1];
diff --git a/libgfortran/m4/dotprod.m4 b/libgfortran/m4/dotprod.m4
index 3e3245c0aac..99ed53f934a 100644
--- a/libgfortran/m4/dotprod.m4
+++ b/libgfortran/m4/dotprod.m4
@@ -27,12 +27,12 @@ include(iparm.m4)dnl
 
 typedef GFC_ARRAY_DESCRIPTOR(GFC_MAX_DIMENSIONS, char) char_array;
 
-extern rtype_name __dot_product_`'rtype_code (rtype * a, rtype * b);
-export_proto_np(__dot_product_`'rtype_code);
+extern rtype_name dot_product_`'rtype_code (rtype * a, rtype * b);
+export_proto(dot_product_`'rtype_code);
 
 /* Both parameters will already have been converted to the result type.  */
 rtype_name
-__dot_product_`'rtype_code (rtype * a, rtype * b)
+dot_product_`'rtype_code (rtype * a, rtype * b)
 {
   rtype_name *pa;
   rtype_name *pb;
diff --git a/libgfortran/m4/dotprodc.m4 b/libgfortran/m4/dotprodc.m4
index 38ef7fc0849..d16b99218a7 100644
--- a/libgfortran/m4/dotprodc.m4
+++ b/libgfortran/m4/dotprodc.m4
@@ -28,12 +28,12 @@ include(iparm.m4)dnl
 
 typedef GFC_ARRAY_DESCRIPTOR(GFC_MAX_DIMENSIONS, char) char_array;
 
-extern rtype_name __dot_product_`'rtype_code (rtype * a, rtype * b);
-export_proto_np(__dot_product_`'rtype_code);
+extern rtype_name dot_product_`'rtype_code (rtype * a, rtype * b);
+export_proto(dot_product_`'rtype_code);
 
 /* Both parameters will already have been converted to the result type.  */
 rtype_name
-__dot_product_`'rtype_code (rtype * a, rtype * b)
+dot_product_`'rtype_code (rtype * a, rtype * b)
 {
   rtype_name *pa;
   rtype_name *pb;
diff --git a/libgfortran/m4/dotprodl.m4 b/libgfortran/m4/dotprodl.m4
index dc196e0bb1b..779ca01378a 100644
--- a/libgfortran/m4/dotprodl.m4
+++ b/libgfortran/m4/dotprodl.m4
@@ -25,11 +25,11 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"'
 include(iparm.m4)dnl
 
-extern rtype_name __dot_product_`'rtype_code (gfc_array_l4 *, gfc_array_l4 *);
-export_proto_np(__dot_product_`'rtype_code);
+extern rtype_name dot_product_`'rtype_code (gfc_array_l4 *, gfc_array_l4 *);
+export_proto(dot_product_`'rtype_code);
 
 rtype_name
-__dot_product_`'rtype_code (gfc_array_l4 * a, gfc_array_l4 * b)
+dot_product_`'rtype_code (gfc_array_l4 * a, gfc_array_l4 * b)
 {
   GFC_LOGICAL_4 *pa;
   GFC_LOGICAL_4 *pb;
diff --git a/libgfortran/m4/eoshift1.m4 b/libgfortran/m4/eoshift1.m4
index f8ae460b78c..603901d79ed 100644
--- a/libgfortran/m4/eoshift1.m4
+++ b/libgfortran/m4/eoshift1.m4
@@ -29,17 +29,17 @@ include(iparm.m4)dnl
 static const char zeros[16] =
   {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 
-extern void __eoshift1_`'atype_kind (const gfc_array_char *,
+extern void eoshift1_`'atype_kind (const gfc_array_char *,
 				     const gfc_array_char *,
 				     const atype *, const char *,
 				     const atype_name *);
-export_proto_np(__eoshift1_`'atype_kind);
+export_proto(eoshift1_`'atype_kind);
 
 void
-__eoshift1_`'atype_kind (const gfc_array_char *ret,
-			 const gfc_array_char *array,
-			 const atype *h, const char *pbound,
-			 const atype_name *pwhich)
+eoshift1_`'atype_kind (const gfc_array_char *ret,
+		       const gfc_array_char *array,
+		       const atype *h, const char *pbound,
+		       const atype_name *pwhich)
 {
   /* r.* indicates the return array.  */
   index_type rstride[GFC_MAX_DIMENSIONS - 1];
diff --git a/libgfortran/m4/eoshift3.m4 b/libgfortran/m4/eoshift3.m4
index 4e706dc8aa3..0ded29ee3f6 100644
--- a/libgfortran/m4/eoshift3.m4
+++ b/libgfortran/m4/eoshift3.m4
@@ -29,15 +29,15 @@ include(iparm.m4)dnl
 static const char zeros[16] =
   {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 
-extern void __eoshift3_`'atype_kind (gfc_array_char *, gfc_array_char *,
+extern void eoshift3_`'atype_kind (gfc_array_char *, gfc_array_char *,
 				     atype *, const gfc_array_char *,
 				     atype_name *);
-export_proto_np(__eoshift3_`'atype_kind);
+export_proto(eoshift3_`'atype_kind);
 
 void
-__eoshift3_`'atype_kind (gfc_array_char *ret, gfc_array_char *array,
-			 atype *h, const gfc_array_char *bound,
-			 atype_name *pwhich)
+eoshift3_`'atype_kind (gfc_array_char *ret, gfc_array_char *array,
+		       atype *h, const gfc_array_char *bound,
+		       atype_name *pwhich)
 {
   /* r.* indicates the return array.  */
   index_type rstride[GFC_MAX_DIMENSIONS - 1];
diff --git a/libgfortran/m4/iforeach.m4 b/libgfortran/m4/iforeach.m4
index b67770b4843..e6c9a09ac3b 100644
--- a/libgfortran/m4/iforeach.m4
+++ b/libgfortran/m4/iforeach.m4
@@ -4,11 +4,11 @@ dnl This file is part of the GNU Fortran 95 Runtime Library (libgfortran)
 dnl Distributed under the GNU LGPL.  See COPYING for details.
 define(START_FOREACH_FUNCTION,
 `
-extern void `__'name`'rtype_qual`_'atype_code (rtype * retarray, atype *array);
-export_proto_np(`__'name`'rtype_qual`_'atype_code);
+extern void name`'rtype_qual`_'atype_code (rtype * retarray, atype *array);
+export_proto(name`'rtype_qual`_'atype_code);
 
 void
-`__'name`'rtype_qual`_'atype_code (rtype * retarray, atype *array)
+name`'rtype_qual`_'atype_code (rtype * retarray, atype *array)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
@@ -90,11 +90,12 @@ define(FINISH_FOREACH_FUNCTION,
 }')dnl
 define(START_MASKED_FOREACH_FUNCTION,
 `
-extern void `__m'name`'rtype_qual`_'atype_code (rtype *, atype *, gfc_array_l4 *);
-export_proto_np(`__m'name`'rtype_qual`_'atype_code);
+extern void `m'name`'rtype_qual`_'atype_code (rtype *, atype *, gfc_array_l4 *);
+export_proto(`m'name`'rtype_qual`_'atype_code);
 
 void
-`__m'name`'rtype_qual`_'atype_code (rtype * retarray, atype *array, gfc_array_l4 * mask)
+`m'name`'rtype_qual`_'atype_code (rtype * retarray, atype *array,
+				  gfc_array_l4 * mask)
 {
   index_type count[GFC_MAX_DIMENSIONS];
   index_type extent[GFC_MAX_DIMENSIONS];
diff --git a/libgfortran/m4/ifunction.m4 b/libgfortran/m4/ifunction.m4
index 0a377a58e9f..ee63838e421 100644
--- a/libgfortran/m4/ifunction.m4
+++ b/libgfortran/m4/ifunction.m4
@@ -19,11 +19,11 @@ dnl You should not return or break from the inner loop of the implementation.
 dnl Care should also be taken to avoid using the names defined in iparm.m4
 define(START_ARRAY_FUNCTION,
 `
-extern void `__'name`'rtype_qual`_'atype_code (rtype *, atype *, index_type *);
-export_proto_np(`__'name`'rtype_qual`_'atype_code);
+extern void name`'rtype_qual`_'atype_code (rtype *, atype *, index_type *);
+export_proto(name`'rtype_qual`_'atype_code);
 
 void
-`__'name`'rtype_qual`_'atype_code (rtype *retarray, atype *array, index_type *pdim)
+name`'rtype_qual`_'atype_code (rtype *retarray, atype *array, index_type *pdim)
 {
   index_type count[GFC_MAX_DIMENSIONS - 1];
   index_type extent[GFC_MAX_DIMENSIONS - 1];
@@ -143,12 +143,13 @@ define(FINISH_ARRAY_FUNCTION,
 }')dnl
 define(START_MASKED_ARRAY_FUNCTION,
 `
-extern void `__m'name`'rtype_qual`_'atype_code (rtype *, atype *, index_type *,
-						gfc_array_l4 *);
-export_proto_np(`__m'name`'rtype_qual`_'atype_code);
+extern void `m'name`'rtype_qual`_'atype_code (rtype *, atype *, index_type *,
+					       gfc_array_l4 *);
+export_proto(`m'name`'rtype_qual`_'atype_code);
 
 void
-`__m'name`'rtype_qual`_'atype_code (rtype * retarray, atype * array, index_type *pdim, gfc_array_l4 * mask)
+`m'name`'rtype_qual`_'atype_code (rtype * retarray, atype * array,
+				  index_type *pdim, gfc_array_l4 * mask)
 {
   index_type count[GFC_MAX_DIMENSIONS - 1];
   index_type extent[GFC_MAX_DIMENSIONS - 1];
diff --git a/libgfortran/m4/matmul.m4 b/libgfortran/m4/matmul.m4
index ef631d3e5f8..3bab232c177 100644
--- a/libgfortran/m4/matmul.m4
+++ b/libgfortran/m4/matmul.m4
@@ -38,11 +38,11 @@ include(iparm.m4)dnl
          C(I,J) = C(I,J)+A(I,K)*B(K,J)
 */
 
-extern void `__matmul_'rtype_code (rtype * retarray, rtype * a, rtype * b);
-export_proto_np(`__matmul_'rtype_code);
+extern void matmul_`'rtype_code (rtype * retarray, rtype * a, rtype * b);
+export_proto(matmul_`'rtype_code);
 
 void
-`__matmul_'rtype_code (rtype * retarray, rtype * a, rtype * b)
+matmul_`'rtype_code (rtype * retarray, rtype * a, rtype * b)
 {
   rtype_name *abase;
   rtype_name *bbase;
diff --git a/libgfortran/m4/matmull.m4 b/libgfortran/m4/matmull.m4
index 4091ef65f2e..131de03e0c3 100644
--- a/libgfortran/m4/matmull.m4
+++ b/libgfortran/m4/matmull.m4
@@ -28,11 +28,11 @@ include(iparm.m4)dnl
 /* Dimensions: retarray(x,y) a(x, count) b(count,y).
    Either a or b can be rank 1.  In this case x or y is 1.  */
 
-extern void `__matmul_'rtype_code (rtype *, gfc_array_l4 *, gfc_array_l4 *);
-export_proto_np(`__matmul_'rtype_code);
+extern void matmul_`'rtype_code (rtype *, gfc_array_l4 *, gfc_array_l4 *);
+export_proto(matmul_`'rtype_code);
 
 void
-`__matmul_'rtype_code (rtype * retarray, gfc_array_l4 * a, gfc_array_l4 * b)
+matmul_`'rtype_code (rtype * retarray, gfc_array_l4 * a, gfc_array_l4 * b)
 {
   GFC_INTEGER_4 *abase;
   GFC_INTEGER_4 *bbase;
diff --git a/libgfortran/m4/reshape.m4 b/libgfortran/m4/reshape.m4
index 7355a7a172b..119154aa885 100644
--- a/libgfortran/m4/reshape.m4
+++ b/libgfortran/m4/reshape.m4
@@ -31,12 +31,12 @@ typedef GFC_ARRAY_DESCRIPTOR(1, index_type) shape_type;
    return array.  */
 dnl Only the kind (ie size) is used to name the function.
 
-extern void `__reshape_'rtype_kind (rtype *, rtype *, shape_type *,
+extern void reshape_`'rtype_kind (rtype *, rtype *, shape_type *,
 				    rtype *, shape_type *);
-extern_proto_np(`__reshape_'rtype_kind);
+export_proto(reshape_`'rtype_kind);
 
 void
-`__reshape_'rtype_kind (rtype * ret, rtype * source, shape_type * shape,
+reshape_`'rtype_kind (rtype * ret, rtype * source, shape_type * shape,
                       rtype * pad, shape_type * order)
 {
   /* r.* indicates the return array.  */
diff --git a/libgfortran/m4/shape.m4 b/libgfortran/m4/shape.m4
index e10fe0c0986..296611fd5e3 100644
--- a/libgfortran/m4/shape.m4
+++ b/libgfortran/m4/shape.m4
@@ -25,11 +25,11 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"'
 include(iparm.m4)dnl
 
-extern void `__shape_'rtype_kind (rtype * ret, const rtype * array);
-export_proto_np(`__shape_'rtype_kind);
+extern void shape_`'rtype_kind (rtype * ret, const rtype * array);
+export_proto(shape_`'rtype_kind);
 
 void
-`__shape_'rtype_kind (rtype * ret, const rtype * array)
+shape_`'rtype_kind (rtype * ret, const rtype * array)
 {
   int n;
   index_type stride;
diff --git a/libgfortran/m4/transpose.m4 b/libgfortran/m4/transpose.m4
index e519b2965ad..1e14225b0ee 100644
--- a/libgfortran/m4/transpose.m4
+++ b/libgfortran/m4/transpose.m4
@@ -24,11 +24,11 @@ Boston, MA 02111-1307, USA.  */
 #include "libgfortran.h"'
 include(iparm.m4)dnl
 
-extern void `__transpose_'rtype_kind (rtype * ret, rtype * source);
-export_proto_np(`__transpose_'rtype_kind);
+extern void transpose_`'rtype_kind (rtype * ret, rtype * source);
+export_proto(transpose_`'rtype_kind);
 
 void
-`__transpose_'rtype_kind (rtype * ret, rtype * source)
+transpose_`'rtype_kind (rtype * ret, rtype * source)
 {
   /* r.* indicates the return array.  */
   index_type rxstride, rystride;