2 files changed, 38 insertions, 27 deletions

diff --git a/libgfortran/runtime/pause.c b/libgfortran/runtime/pause.c
index 25690d8319e..37672d4a02c 100644
--- a/libgfortran/runtime/pause.c
+++ b/libgfortran/runtime/pause.c
@@ -40,29 +40,29 @@ do_pause (void)
 
   fgets(buff, 4, stdin);
   if (strncmp(buff, "go\n", 3) != 0)
-    stop_string ('\0', 0);
+    stop_string ('\0', 0, false);
   estr_write ("RESUMED\n");
 }
 
 /* A numeric PAUSE statement.  */
 
-extern void pause_numeric (GFC_INTEGER_4);
+extern void pause_numeric (GFC_INTEGER_8);
 export_proto(pause_numeric);
 
 void
-pause_numeric (GFC_INTEGER_4 code)
+pause_numeric (GFC_INTEGER_8 code)
 {
-  st_printf ("PAUSE %d\n", (int) code);
+  st_printf ("PAUSE %ld\n", (long) code);
   do_pause ();
 }
 
 /* A character string or blank PAUSE statement.  */
 
-extern void pause_string (char *string, GFC_INTEGER_4 len);
+extern void pause_string (char *string, size_t len);
 export_proto(pause_string);
 
 void
-pause_string (char *string, GFC_INTEGER_4 len)
+pause_string (char *string, size_t len)
 {
   estr_write ("PAUSE ");
   ssize_t w = write (STDERR_FILENO, string, len);
diff --git a/libgfortran/runtime/stop.c b/libgfortran/runtime/stop.c
index 6f8b62f8385..1e6dd8c28d0 100644
--- a/libgfortran/runtime/stop.c
+++ b/libgfortran/runtime/stop.c
@@ -81,14 +81,17 @@ report_exception (void)
 
 /* A numeric STOP statement.  */
 
-extern _Noreturn void stop_numeric (GFC_INTEGER_4);
+extern _Noreturn void stop_numeric (int, bool);
 export_proto(stop_numeric);
 
 void
-stop_numeric (GFC_INTEGER_4 code)
+stop_numeric (int code, bool quiet)
 {
-  report_exception ();
-  st_printf ("STOP %d\n", (int)code);
+  if (!quiet)
+    {
+      report_exception ();
+      st_printf ("STOP %d\n", code);
+    }
   exit (code);
 }
 
@@ -96,14 +99,17 @@ stop_numeric (GFC_INTEGER_4 code)
 /* A character string or blank STOP statement.  */
 
 void
-stop_string (const char *string, GFC_INTEGER_4 len)
+stop_string (const char *string, size_t len, bool quiet)
 {
-  report_exception ();
-  if (string)
+  if (!quiet)
     {
-      estr_write ("STOP ");
-      (void) write (STDERR_FILENO, string, len);
-      estr_write ("\n");
+      report_exception ();
+      if (string)
+	{
+	  estr_write ("STOP ");
+	  (void) write (STDERR_FILENO, string, len);
+	  estr_write ("\n");
+	}
     }
   exit (0);
 }
@@ -114,30 +120,35 @@ stop_string (const char *string, GFC_INTEGER_4 len)
    initiates error termination of execution."  Thus, error_stop_string returns
    a nonzero exit status code.  */
 
-extern _Noreturn void error_stop_string (const char *, GFC_INTEGER_4);
+extern _Noreturn void error_stop_string (const char *, size_t, bool);
 export_proto(error_stop_string);
 
 void
-error_stop_string (const char *string, GFC_INTEGER_4 len)
+error_stop_string (const char *string, size_t len, bool quiet)
 {
-  report_exception ();
-  estr_write ("ERROR STOP ");
-  (void) write (STDERR_FILENO, string, len);
-  estr_write ("\n");
-
+  if (!quiet)
+    {
+      report_exception ();
+      estr_write ("ERROR STOP ");
+      (void) write (STDERR_FILENO, string, len);
+      estr_write ("\n");
+    }
   exit_error (1);
 }
 
 
 /* A numeric ERROR STOP statement.  */
 
-extern _Noreturn void error_stop_numeric (GFC_INTEGER_4);
+extern _Noreturn void error_stop_numeric (int, bool);
 export_proto(error_stop_numeric);
 
 void
-error_stop_numeric (GFC_INTEGER_4 code)
+error_stop_numeric (int code, bool quiet)
 {
-  report_exception ();
-  st_printf ("ERROR STOP %d\n", (int) code);
+  if (!quiet)
+    {
+      report_exception ();
+      st_printf ("ERROR STOP %d\n", code);
+    }
   exit_error (code);
 }