--- gcc/system.h.jj	2003-04-08 15:55:41.000000000 +0200

+++ gcc/system.h	2003-10-03 19:01:24.000000000 +0200

@@ -153,6 +153,10 @@ extern int errno;

 # endif

 #endif

+#ifndef ICE_EXIT_CODE

+# define ICE_EXIT_CODE 27

+#endif

+

 #ifdef HAVE_UNISTD_H

 # include <unistd.h>

 #endif

--- gcc/gcc.c.jj	2003-06-11 15:08:12.000000000 +0200

+++ gcc/gcc.c	2003-10-06 10:10:42.000000000 +0200

@@ -112,6 +112,10 @@ extern int getrusage PARAMS ((int, struc

 #define TARGET_OBJECT_SUFFIX ".o"

 #endif

+#if !(defined (__MSDOS__) || defined (OS2) || defined (VMS))

+static void retry_ice PARAMS ((const char *, const char **));

+#endif

+

 #ifndef VMS

 /* FIXME: the location independence code for VMS is hairier than this,

    and hasn't been written.  */

@@ -2857,7 +2861,7 @@ execute ()

       if (commands[i].pid == -1)

 	pfatal_pexecute (errmsg_fmt, errmsg_arg);

-      if (string != commands[i].prog)

+      if (i && string != commands[i].prog)

 	free ((PTR) string);

     }

@@ -2935,6 +2939,17 @@ See %s for instructions.",

 	      else if (WIFEXITED (status)

 		       && WEXITSTATUS (status) >= MIN_FATAL_STATUS)

 		{

+#if !(defined (__MSDOS__) || defined (OS2) || defined (VMS))

+		  /* For ICEs in cc1, cc1obj, cc1plus see if it is

+		     reproducible or not.  */

+		  char *p;

+		  if (WEXITSTATUS (status) == ICE_EXIT_CODE

+		      && j == 0

+		      && (p = strrchr (commands[j].argv[0], DIR_SEPARATOR))

+		      && ! strncmp (p + 1, "cc1", 3))

+		    retry_ice (commands[j].prog, commands[j].argv);

+#endif

+

 		  if (WEXITSTATUS (status) > greatest_status)

 		    greatest_status = WEXITSTATUS (status);

 		  ret_code = -1;

@@ -2946,6 +2961,10 @@ See %s for instructions.",

 	      break;

 	    }

       }

+

+    if (commands[0].argv[0] != commands[0].prog)

+      free ((PTR) commands[0].argv[0]);

+

     return ret_code;

   }

 }

@@ -5667,6 +5686,231 @@ give_switch (switchnum, omit_first_word,

   switches[switchnum].validated = 1;

 }

+#if !(defined (__MSDOS__) || defined (OS2) || defined (VMS))

+#define RETRY_ICE_ATTEMPTS 2

+

+static void

+retry_ice (prog, argv)

+     const char *prog;

+     const char **argv;

+{

+  int nargs, out_arg = -1, quiet = 0, attempt;

+  int pid, retries, sleep_interval;

+  const char **new_argv;

+  char *temp_filenames[RETRY_ICE_ATTEMPTS * 2 + 2];

+

+  if (input_filename == NULL || ! strcmp (input_filename, "-"))

+    return;

+

+  for (nargs = 0; argv[nargs] != NULL; ++nargs)

+    /* Only retry compiler ICEs, not preprocessor ones.  */

+    if (! strcmp (argv[nargs], "-E"))

+      return;

+    else if (argv[nargs][0] == '-' && argv[nargs][1] == 'o')

+      {

+	if (out_arg == -1)

+	  out_arg = nargs;

+	else

+	  return;

+      }

+    /* If the compiler is going to output any time information,

+       it might varry between invocations.  */

+    else if (! strcmp (argv[nargs], "-quiet"))

+      quiet = 1;

+    else if (! strcmp (argv[nargs], "-ftime-report"))

+      return;

+

+  if (out_arg == -1 || !quiet)

+    return;

+

+  memset (temp_filenames, '\0', sizeof (temp_filenames));

+  new_argv = alloca ((nargs + 2) * sizeof (const char *));

+  memcpy (new_argv, argv, (nargs + 1) * sizeof (const char *));

+  if (new_argv[out_arg][2] == '\0')

+    new_argv[out_arg + 1] = "-";

+  else

+    new_argv[out_arg] = "-o-";

+

+  for (attempt = 0; attempt < RETRY_ICE_ATTEMPTS + 1; ++attempt)

+    {

+      int fd;

+      int status;

+

+      temp_filenames[attempt * 2] = make_temp_file (".out");

+      temp_filenames[attempt * 2 + 1] = make_temp_file (".err");

+

+      if (attempt == RETRY_ICE_ATTEMPTS)

+        {

+	  int i;

+	  int fd1, fd2;

+	  struct stat st1, st2;

+	  size_t n, len;

+	  char *buf;

+	  char *cpp0;

+

+	  buf = xmalloc (8192);

+

+	  for (i = 0; i < 2; ++i)

+	    {

+	      fd1 = open (temp_filenames[i], O_RDONLY);

+	      fd2 = open (temp_filenames[2 + i], O_RDONLY);

+

+	      if (fd1 < 0 || fd2 < 0)

+		{

+		  i = -1;

+		  close (fd1);

+		  close (fd2);

+		  break;

+		}

+

+	      if (fstat (fd1, &st1) < 0 || fstat (fd2, &st2) < 0)

+		{

+		  i = -1;

+		  close (fd1);

+		  close (fd2);

+		  break;

+		}

+

+	      if (st1.st_size != st2.st_size)

+		{

+		  close (fd1);

+		  close (fd2);

+		  break;

+		}

+

+	      len = 0;

+	      for (n = st1.st_size; n; n -= len)

+		{

+		  len = n;

+		  if (len > 4096)

+		    len = 4096;

+

+		  if (read (fd1, buf, len) != (int) len

+		      || read (fd2, buf + 4096, len) != (int) len)

+		    {

+		      i = -1;

+		      break;

+		    }

+

+		  if (memcmp (buf, buf + 4096, len) != 0)

+		    break;

+		}

+

+	      close (fd1);

+	      close (fd2);

+

+	      if (n)

+		break;

+	    }

+

+	  free (buf);

+	  if (i == -1)

+	    break;

+

+	  if (i != 2)

+	    {

+	      notice ("The bug is not reproducible, so it is likely a hardware or OS problem.\n");

+	      break;

+	    }

+

+          fd = open (temp_filenames[attempt * 2], O_RDWR);

+	  if (fd < 0)

+	    break;

+	  write (fd, "//", 2);

+	  for (i = 0; i < nargs; i++)

+	    {

+	      write (fd, " ", 1);

+	      write (fd, new_argv[i], strlen (new_argv[i]));

+	    }

+	  write (fd, "\n", 1);

+	  cpp0 = alloca (strlen (new_argv[0]) + sizeof "cpp0");

+	  strcpy (cpp0, new_argv[0]);

+	  new_argv[0] = cpp0;

+	  cpp0 = strrchr (new_argv[0], DIR_SEPARATOR);

+	  if (cpp0 != NULL)

+	    strcpy (cpp0 + 1, "cpp0");

+	  new_argv[nargs] = "--ice-hack";

+	  new_argv[nargs + 1] = NULL;

+        }

+

+      /* Fork a subprocess; wait and retry if it fails.  */

+      sleep_interval = 1;

+      pid = -1;

+      for (retries = 0; retries < 4; retries++)

+	{

+	  pid = fork ();

+	  if (pid >= 0)

+	    break;

+	  sleep (sleep_interval);

+	  sleep_interval *= 2;

+	}

+

+      if (pid < 0)

+	break;

+      else if (pid == 0)

+	{

+	  if (attempt != RETRY_ICE_ATTEMPTS)

+	    fd = open (temp_filenames[attempt * 2], O_RDWR);

+	  if (fd < 0)

+	    exit (-1);

+	  if (fd != 1)

+	    {

+	      close (1);

+	      dup (fd);

+	      close (fd);

+	    }

+

+	  fd = open (temp_filenames[attempt * 2 + 1], O_RDWR);

+	  if (fd < 0)

+	    exit (-1);

+	  if (fd != 2)

+	    {

+	      close (2);

+	      dup (fd);

+	      close (fd);

+	    }

+

+	  if (prog == new_argv[0])

+	    execvp (prog, (char *const *) new_argv);

+	  else

+	    execv (new_argv[0], (char *const *) new_argv);

+	  exit (-1);

+	}

+

+      if (waitpid (pid, &status, 0) < 0)

+	break;

+

+      if (attempt < RETRY_ICE_ATTEMPTS

+	  && (! WIFEXITED (status) || WEXITSTATUS (status) != ICE_EXIT_CODE))

+	{

+	  notice ("The bug is not reproducible, so it is likely a hardware or OS problem.\n");

+	  break;

+	}

+      else if (attempt == RETRY_ICE_ATTEMPTS)

+	{

+	  close (fd);

+	  if (WIFEXITED (status)

+	      && WEXITSTATUS (status) == SUCCESS_EXIT_CODE)

+	    {

+	      notice ("Preprocessed source stored into %s file, please attach this to your bugreport.\n",

+		      temp_filenames[attempt * 2]);

+	      /* Make sure it is not deleted.  */

+	      free (temp_filenames[attempt * 2]);

+	      temp_filenames[attempt * 2] = NULL;

+	      break;

+	    }

+	}

+    }

+

+  for (attempt = 0; attempt < RETRY_ICE_ATTEMPTS * 2 + 2; attempt++)

+    if (temp_filenames[attempt])

+      {

+	unlink (temp_filenames[attempt]);

+	free (temp_filenames[attempt]);

+      }

+}

+#endif

+

 /* Search for a file named NAME trying various prefixes including the

    user's -B prefix and some standard ones.

    Return the absolute file name found.  If nothing is found, return NAME.  */

--- gcc/diagnostic.c.jj	2002-01-24 23:37:04.000000000 +0100

+++ gcc/diagnostic.c	2003-10-03 19:01:24.000000000 +0200

@@ -1242,7 +1242,7 @@ internal_error VPARAMS ((const char *msg

 "Please submit a full bug report,\n\

 with preprocessed source if appropriate.\n\

 See %s for instructions.\n", GCCBUGURL);

-  exit (FATAL_EXIT_CODE);

+  exit (ICE_EXIT_CODE);

 }

 void

@@ -1392,7 +1392,7 @@ error_recursion ()

 "Please submit a full bug report,\n\

 with preprocessed source if appropriate.\n\

 See %s for instructions.\n", GCCBUGURL);

-  exit (FATAL_EXIT_CODE);

+  exit (ICE_EXIT_CODE);

 }

 /* Given a partial pathname as input, return another pathname that

--- gcc/cppmain.c.jj	2002-05-03 20:19:22.000000000 +0200

+++ gcc/cppmain.c	2003-10-06 10:35:15.000000000 +0200

@@ -111,10 +111,33 @@ do_preprocessing (argc, argv)

      char **argv;

 {

   int argi = 1;  /* Next argument to handle.  */

+  int ice_hack = 0;

-  argi += cpp_handle_options (pfile, argc - argi , argv + argi);

-  if (CPP_FATAL_ERRORS (pfile))

-    return;

+  if (argc >= 1 && strcmp (argv[argc - 1], "--ice-hack") == 0)

+    {

+      ice_hack = 1;

+      for (argi = 1; argi + 1 < argc; argi++)

+	if (strcmp (argv[argi], "-dumpbase") == 0)

+	  {

+	    argv[argi] = "-quiet";

+	    argv[argi + 1] = "-quiet";

+	    break;

+	  }

+      argi = 1;

+    }

+

+  do

+    {

+      argi += cpp_handle_options (pfile, argc - argi, argv + argi);

+      if (CPP_FATAL_ERRORS (pfile))

+        return;

+

+      if (argi >= argc || !ice_hack)

+	break;

+

+      argi++;

+    }

+  while (argi < argc);

   if (argi < argc)

     {