Update to 990608 snapshot.

Highlights:
- official fix for an alpha bug,
- cpp changes semantic slightly,
- valarray in libstdc++.

13 files changed, 650 insertions, 659 deletions

diff --git a/gnu/egcs/gcc/fixinc/Makefile.in b/gnu/egcs/gcc/fixinc/Makefile.in
index 2ba932f8c6f..8976c783e72 100644
--- a/gnu/egcs/gcc/fixinc/Makefile.in
+++ b/gnu/egcs/gcc/fixinc/Makefile.in
@@ -81,8 +81,8 @@ fixincl: $(OBJ)
 	chmod 777 $@ ; fi
 
 gnu-regex.o: gnu-regex.c
-	-$(CC) $(CFLAGS) $(FIXINC_DEFS) -DREGEX_MALLOC -DSTDC_HEADERS=1 \
-		-c $(srcdir)/gnu-regex.c
+	-$(CC) $(CFLAGS) $(FIXINC_DEFS) $(INCLUDES) -DREGEX_MALLOC \
+		-DSTDC_HEADERS=1 -c $(srcdir)/gnu-regex.c
 
 fixincl.o : fixincl.x fixincl.c
 server.o : server.c server.h
diff --git a/gnu/egcs/gcc/fixinc/fixincl.c b/gnu/egcs/gcc/fixinc/fixincl.c
index 47c9ef1344a..c1dfcbc580f 100644
--- a/gnu/egcs/gcc/fixinc/fixincl.c
+++ b/gnu/egcs/gcc/fixinc/fixincl.c
@@ -23,25 +23,9 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 #include "auto-host.h"
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/stat.h>
-#ifdef HAVE_SYS_WAIT_H
-#include <sys/wait.h>
-#endif
+#include "gansidecl.h"
+#include "system.h"
 #include <signal.h>
-#include <stdio.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <stdlib.h>
-#include <errno.h>
-#include <string.h>
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#include <ctype.h>
 
 #include "gnu-regex.h"
 #include "server.h"
@@ -58,6 +42,13 @@ static const char program_id[] = "fixincl version 1.0";
 #endif
 #define NAME_TABLE_SIZE (MINIMUM_MAXIMUM_LINES * MAXPATHLEN)
 
+#ifndef EXIT_SUCCESS
+# define EXIT_SUCCESS 0
+#endif
+#ifndef EXIT_FAILURE
+# define EXIT_FAILURE 1
+#endif
+
 char *file_name_buf;
 
 #define tSCC static const char
@@ -112,6 +103,7 @@ typedef struct patch_desc tPatchDesc;
     */
 #define FD_MACH_ONLY      0x0000
 #define FD_MACH_IFNOT     0x0001
+#define FD_SHELL_SCRIPT   0x0002
 #define FD_SKIP_TEST      0x8000
 
 typedef struct fix_desc tFixDesc;
@@ -269,16 +261,9 @@ main (argc, argv)
       }
     }
 #else
-#error "NON-BOGUS LIMITS NOT SUPPORTED?!?!"
+ /*#*/ error "NON-BOGUS LIMITS NOT SUPPORTED?!?!"
 #endif
 
-  /*
-     Here we are the child of the grandparent process.  The parent
-     of all the little fixup processes.  We ignore the deaths of
-     our children.  */
-
-  signal (SIGCLD,  SIG_IGN);
-
   /*  For every file specified in stdandard in
       (except as throttled for bogus reasons)...
       */
@@ -382,7 +367,9 @@ initialize()
    `waitpid(2)'.  We also ensure that the children exit with success. */
 
 void
-wait_for_pid( pid_t child, int file_name_ct )
+wait_for_pid(child, file_name_ct)
+     pid_t child;
+     int file_name_ct;
 {
   for (;;) {
     int status;
@@ -923,6 +910,70 @@ extract_quoted_files (pz_data, pz_file_name, p_re_match)
 }
 
 
+
+/* * * * * * * * * * * * *
+
+    This loop should only cycle for 1/2 of one loop.
+    "chain_open" starts a process that uses "read_fd" as
+    its stdin and returns the new fd this process will use
+    for stdout.  */
+
+int
+start_fixer (read_fd, p_fixd, pz_file_name)
+  int read_fd;
+  tFixDesc* p_fixd;
+  char* pz_file_name;
+{
+  tSCC z_err[] = "Error %d (%s) starting filter process for %s\n";
+  tCC* pz_cmd_save;
+  char* pz_cmd;
+
+  if ((p_fixd->fd_flags & FD_SHELL_SCRIPT) == 0)
+    pz_cmd = (char*)NULL;
+  else
+    {
+      tSCC z_cmd_fmt[] = "file='%s'\n%s";
+      pz_cmd = (char*)xmalloc (strlen (p_fixd->patch_args[2])
+                               + sizeof( z_cmd_fmt )
+                               + strlen( pz_file_name ));
+      sprintf (pz_cmd, z_cmd_fmt, pz_file_name, p_fixd->patch_args[2]);
+      pz_cmd_save = p_fixd->patch_args[2];
+      p_fixd->patch_args[2] = pz_cmd;
+    }
+
+  for (;;)
+    {
+      static int failCt = 0;
+      int fd;
+
+      fd = chain_open (read_fd,
+                       (t_pchar *) p_fixd->patch_args,
+                       (process_chain_head == -1)
+                       ? &process_chain_head : (pid_t *) NULL);
+
+      if (fd != -1)
+        {
+          read_fd = fd;
+          break;
+        }
+
+      fprintf (stderr, z_err, errno, strerror (errno),
+               p_fixd->fix_name);
+
+      if ((errno != EAGAIN) || (++failCt > 10))
+        exit (EXIT_FAILURE);
+      sleep (1);
+    }
+
+  if (pz_cmd != (char*)NULL)
+    {
+      free ((void*)pz_cmd);
+      p_fixd->patch_args[2] = pz_cmd_save;
+    }
+
+  return read_fd;
+}
+
 /* * * * * * * * * * * * *
 
    Process the potential fixes for a particular include file.
@@ -934,33 +985,12 @@ process (pz_data, pz_file_name)
      char *pz_data;
      const char *pz_file_name;
 {
-  static char env_current_file[1024] = { "file=" };
+  static char env_current_file[1024];
   tFixDesc *p_fixd = fixDescList;
   int todo_ct = FIX_COUNT;
-  t_fd_pair fdp = { -1, -1 };
-
-  /*  IF this is the first time through,
-      THEN put the 'file' environment variable into the environment.
-           This is used by some of the subject shell scripts and tests.   */
+  int read_fd = -1;
+  int num_children = 0;
 
-  if (env_current_file[5] == NUL)
-    putenv (env_current_file);
-
-  /*
-     Ghastly as it is, this actually updates the value of the variable:
-   
-       putenv(3C)             C Library Functions             putenv(3C)
-   
-       DESCRIPTION
-            putenv() makes the value of the  environment  variable  name
-            equal  to value by altering an existing variable or creating
-            a new one.  In either case, the string pointed to by  string
-            becomes part of the environment, so altering the string will
-            change the environment.  string points to a  string  of  the
-            form  ``name=value.''  The space used by string is no longer
-            used once a new string-defining name is passed to putenv().
-   */
-  strcpy (env_current_file + 5, pz_file_name);
   process_chain_head = NOPROCESS;
   fprintf (stderr, "%-50s   \r", pz_file_name );
   /* For every fix in our fix list, ...  */
@@ -1058,10 +1088,10 @@ process (pz_data, pz_file_name)
           the first fix.  Any subsequent fixes will use the
           stdout descriptor of the previous fix as its stdin.  */
 
-      if (fdp.read_fd == -1)
+      if (read_fd == -1)
         {
-          fdp.read_fd = open (pz_file_name, O_RDONLY);
-          if (fdp.read_fd < 0)
+          read_fd = open (pz_file_name, O_RDONLY);
+          if (read_fd < 0)
             {
               fprintf (stderr, "Error %d (%s) opening %s\n", errno,
                        strerror (errno), pz_file_name);
@@ -1069,33 +1099,8 @@ process (pz_data, pz_file_name)
             }
         }
 
-      /*  This loop should only cycle for 1/2 of one loop.
-          "chain_open" starts a process that uses "fdp.read_fd" as
-          its stdin and returns the new fd this process will use
-          for stdout.  */
-
-      for (;;)
-        {
-          tSCC z_err[] = "Error %d (%s) starting filter process for %s\n";
-          static int failCt = 0;
-          int fd = chain_open (fdp.read_fd,
-                               (t_pchar *) p_fixd->patch_args,
-                               (process_chain_head == -1)
-                               ? &process_chain_head : (pid_t *) NULL);
-
-          if (fd != -1)
-            {
-              fdp.read_fd = fd;
-              break;
-            }
-
-          fprintf (stderr, z_err, errno, strerror (errno),
-                   p_fixd->fix_name);
-
-          if ((errno != EAGAIN) || (++failCt > 10))
-            exit (EXIT_FAILURE);
-          sleep (1);
-        }
+      read_fd = start_fixer (read_fd, p_fixd, pz_file_name);
+      num_children++;
 
     next_fix:
       ;
@@ -1104,7 +1109,7 @@ process (pz_data, pz_file_name)
   /*  IF after all the tests we did not start any patch programs,
       THEN quit now.   */
 
-  if (fdp.read_fd < 0)
+  if (read_fd < 0)
     return;
 
   /*  OK.  We have work to do.  Read back in the output
@@ -1115,7 +1120,7 @@ process (pz_data, pz_file_name)
       output of the filter chain.
       */
   {
-    FILE *in_fp = fdopen (fdp.read_fd, "r");
+    FILE *in_fp = fdopen (read_fd, "r");
     FILE *out_fp = (FILE *) NULL;
     char *pz_cmp = pz_data;
 
@@ -1171,5 +1176,10 @@ process (pz_data, pz_file_name)
       }
     fclose (in_fp);
   }
-  close (fdp.read_fd);  /* probably redundant, but I'm paranoid */
+  close (read_fd);  /* probably redundant, but I'm paranoid */
+
+  /* Wait for child processes created by chain_open()
+     to avoid creating zombies.  */
+  while (--num_children >= 0)
+    wait ((int *) NULL);
 }
diff --git a/gnu/egcs/gcc/fixinc/fixincl.sh b/gnu/egcs/gcc/fixinc/fixincl.sh
index 74aafe378d4..f6517187ab5 100644
--- a/gnu/egcs/gcc/fixinc/fixincl.sh
+++ b/gnu/egcs/gcc/fixinc/fixincl.sh
@@ -395,7 +395,7 @@ echo 'Removing unneeded directories:'
 cd $LIB
 all_dirs=`find . -type d -print | sort -r`
 for file in $all_dirs; do
-  rmdir $LIB/$file > /dev/null 2>&1 | :
+  rmdir $LIB/$file > /dev/null 2>&1
 done
 
 # # # # # # # # # # # # # # # # # # # # #
diff --git a/gnu/egcs/gcc/fixinc/fixincl.tpl b/gnu/egcs/gcc/fixinc/fixincl.tpl
index d5d6b6448a7..afdd131c66e 100644
--- a/gnu/egcs/gcc/fixinc/fixincl.tpl
+++ b/gnu/egcs/gcc/fixinc/fixincl.tpl
@@ -22,16 +22,14 @@ _FOR fix =]
  *  Description [=_eval _index 1 + "#%3d -" _printf=] [=hackname _Cap=] fix
  */
 tSCC z[=hackname _cap=]Name[] =
-     [=hackname _cap _str=];
+     [=hackname _cap _krstr=];
 /*
  *  File name selection pattern
  */[=
 
   _IF files _exist=]
-tSCC z[=hackname _cap=]List[] =[=
-    _FOR files=]
-        "|" [=files _str=][=
-    /files=] "|";[=
+tSCC z[=hackname _cap=]List[] =
+  "[=_FOR files =]|[=files=][=/files=]|";[=
 
   _ELSE =]
 #define z[=hackname _cap=]List (char*)NULL[=
@@ -43,7 +41,7 @@ tSCC z[=hackname _cap=]List[] =[=
   _IF mach _exist=]
 tSCC* apz[=hackname _cap=]Machs[] = {[=
     _FOR mach =]
-        [=mach _str=],[=
+        [=mach _krstr=],[=
     /mach=]
         (const char*)NULL };[=
 
@@ -60,7 +58,7 @@ tSCC* apz[=hackname _cap=]Machs[] = {[=
  */[=
     _FOR exesel =]
 tSCC z[=hackname _cap=]Select[=_eval _index=][] =
-       [=exesel _str=];[=
+       [=exesel _krstr=];[=
     /exesel =][=
 
   _ELIF select _exist=]
@@ -70,7 +68,7 @@ tSCC z[=hackname _cap=]Select[=_eval _index=][] =
  */[=
     _FOR select =]
 tSCC z[=hackname _cap=]Select[=_eval _index=][] =
-       [=select _str=];[=
+       [=select _krstr=];[=
     /select =][=
   _ENDIF =][=
 
@@ -81,7 +79,7 @@ tSCC z[=hackname _cap=]Select[=_eval _index=][] =
  */[=
     _FOR bypass =]
 tSCC z[=hackname _cap=]Bypass[=_eval _index=][] =
-       [=bypass _str=];[=
+       [=bypass _krstr=];[=
     /bypass =][=
   _ENDIF =][=
 
@@ -92,7 +90,7 @@ tSCC z[=hackname _cap=]Bypass[=_eval _index=][] =
  */[=
     _FOR test =]
 tSCC z[=hackname _cap=]Test[=_eval _index=][] =
-       [=test _str=];[=
+       [=test _krstr=];[=
     /test =][=
   _ENDIF =][=
 
@@ -159,9 +157,9 @@ tTestDesc a[=hackname _cap=]Tests[] = {[=
  */
 const char* apz[=hackname _cap=]Patch[] = {[=
     _IF   sed         _exist =] "sed"[=_FOR sed=],
-    "-e", [=sed _str=][=/sed=][=
+    "-e", [=sed _krstr=][=/sed=][=
     _ELIF shell       _exist =] "sh", "-c",
-    [=shell _str=][=
+    [=shell _krstr=][=
     _ENDIF=],
     (char*)NULL };
 
@@ -181,6 +179,8 @@ _FOR fix ",\n" =]
      [=hackname  _up=]_TEST_CT, [=
        _IF not_machine _exist =]FD_MACH_IFNOT[=
        _ELSE                  =]FD_MACH_ONLY[=
+       _ENDIF =][=
+       _IF shell       _exist =] | FD_SHELL_SCRIPT[=
        _ENDIF =],
      a[=hackname _cap=]Tests,   apz[=hackname _cap=]Patch }[=
 
diff --git a/gnu/egcs/gcc/fixinc/fixincl.x b/gnu/egcs/gcc/fixinc/fixincl.x
index 736943bbd1b..9b8ddec0ddf 100644
--- a/gnu/egcs/gcc/fixinc/fixincl.x
+++ b/gnu/egcs/gcc/fixinc/fixincl.x
@@ -37,7 +37,7 @@ tSCC zAix_SyswaitName[] =
  *  File name selection pattern
  */
 tSCC zAix_SyswaitList[] =
-        "|" "sys/wait.h" "|";
+  "|sys/wait.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -58,8 +58,8 @@ tTestDesc aAix_SyswaitTests[] = {
  *  Fix Command Arguments for Aix_Syswait
  */
 const char* apzAix_SyswaitPatch[] = { "sed",
-    "-e", "/^extern pid_t wait3();$/i\\\n"
-       "struct rusage;\n",
+    "-e", "/^extern pid_t wait3();$/i\\\n\
+struct rusage;\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -72,7 +72,7 @@ tSCC zAix_VolatileName[] =
  *  File name selection pattern
  */
 tSCC zAix_VolatileList[] =
-        "|" "sys/signal.h" "|";
+  "|sys/signal.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -106,8 +106,7 @@ tSCC zAlpha_GetoptName[] =
  *  File name selection pattern
  */
 tSCC zAlpha_GetoptList[] =
-        "|" "stdio.h"
-        "|" "stdlib.h" "|";
+  "|stdio.h|stdlib.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -141,7 +140,7 @@ tSCC zAlpha_ParensName[] =
  *  File name selection pattern
  */
 tSCC zAlpha_ParensList[] =
-        "|" "sym.h" "|";
+  "|sym.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -175,7 +174,7 @@ tSCC zAlpha_SbrkName[] =
  *  File name selection pattern
  */
 tSCC zAlpha_SbrkList[] =
-        "|" "unistd.h" "|";
+  "|unistd.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -209,7 +208,7 @@ tSCC zArm_Norcroft_HintName[] =
  *  File name selection pattern
  */
 tSCC zArm_Norcroft_HintList[] =
-        "|" "X11/Intrinsic.h" "|";
+  "|X11/Intrinsic.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -243,7 +242,7 @@ tSCC zArm_WcharName[] =
  *  File name selection pattern
  */
 tSCC zArm_WcharList[] =
-        "|" "stdlib.h" "|";
+  "|stdlib.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -278,7 +277,7 @@ tSCC zAux_AsmName[] =
  *  File name selection pattern
  */
 tSCC zAux_AsmList[] =
-        "|" "sys/param.h" "|";
+  "|sys/param.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -312,10 +311,7 @@ tSCC zAvoid_BoolName[] =
  *  File name selection pattern
  */
 tSCC zAvoid_BoolList[] =
-        "|" "curses.h"
-        "|" "curses_colr/curses.h"
-        "|" "term.h"
-        "|" "tinfo.h" "|";
+  "|curses.h|curses_colr/curses.h|term.h|tinfo.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -328,18 +324,26 @@ tSCC zAvoid_BoolList[] =
  *  Fix Command Arguments for Avoid_Bool
  */
 const char* apzAvoid_BoolPatch[] = { "sed",
-    "-e", "/^#[ \t]*define[ \t][ \t]*bool[ \t][ \t]*char[ \t]*$/i\\\n"
-       "#ifndef __cplusplus\n",
-    "-e", "/^#[ \t]*define[ \t][ \t]*bool[ \t][ \t]*char[ \t]*$/a\\\n"
-       "#endif\n",
-    "-e", "/^typedef[ \t][ \t]*char[ \t][ \t]*bool[ \t]*;/i\\\n"
-       "#ifndef __cplusplus\n",
-    "-e", "/^typedef[ \t][ \t]*char[ \t][ \t]*bool[ \t]*;/a\\\n"
-       "#endif\n",
-    "-e", "/^[ ]*typedef[ \t][ \t]*unsigned char[ \t][ \t]*bool[ \t]*;/i\\\n"
-       "#ifndef __cplusplus\n",
-    "-e", "/^[ ]*typedef[ \t][ \t]*unsigned char[ \t][ \t]*bool[ \t]*;/a\\\n"
-       "#endif\n",
+    "-e", "/^#[ \t]*define[ \t][ \t]*bool[ \t][ \t]*char[ \t]*$/i\\\n\
+#ifndef __cplusplus\n",
+    "-e", "/^#[ \t]*define[ \t][ \t]*bool[ \t][ \t]*char[ \t]*$/a\\\n\
+#endif\n",
+    "-e", "/^typedef[ \t][ \t]*char[ \t][ \t]*bool[ \t]*;/i\\\n\
+#ifndef __cplusplus\n",
+    "-e", "/^typedef[ \t][ \t]*char[ \t][ \t]*bool[ \t]*;/a\\\n\
+#endif\n",
+    "-e", "/^[ ]*typedef[ \t][ \t]*unsigned char[ \t][ \t]*bool[ \t]*;/i\\\n\
+#ifndef __cplusplus\n",
+    "-e", "/^[ ]*typedef[ \t][ \t]*unsigned char[ \t][ \t]*bool[ \t]*;/a\\\n\
+#endif\n",
+    "-e", "/^typedef[ \t][ \t]*int[ \t][ \t]*bool[ \t]*;/i\\\n\
+#ifndef __cplusplus\n",
+    "-e", "/^typedef[ \t][ \t]*int[ \t][ \t]*bool[ \t]*;/a\\\n\
+#endif\n",
+    "-e", "/^[ ]*typedef[ \t][ \t]*unsigned int[ \t][ \t]*bool[ \t]*;/i\\\n\
+#ifndef __cplusplus\n",
+    "-e", "/^[ ]*typedef[ \t][ \t]*unsigned int[ \t][ \t]*bool[ \t]*;/a\\\n\
+#endif\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -352,7 +356,7 @@ tSCC zBad_Struct_TermName[] =
  *  File name selection pattern
  */
 tSCC zBad_Struct_TermList[] =
-        "|" "curses.h" "|";
+  "|curses.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -386,7 +390,7 @@ tSCC zBadquoteName[] =
  *  File name selection pattern
  */
 tSCC zBadquoteList[] =
-        "|" "sundev/vuid_event.h" "|";
+  "|sundev/vuid_event.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -412,20 +416,7 @@ tSCC zBad_LvalName[] =
  *  File name selection pattern
  */
 tSCC zBad_LvalList[] =
-        "|" "libgen.h"
-        "|" "dirent.h"
-        "|" "ftw.h"
-        "|" "grp.h"
-        "|" "ndbm.h"
-        "|" "pthread.h"
-        "|" "pwd.h"
-        "|" "signal.h"
-        "|" "standards.h"
-        "|" "stdlib.h"
-        "|" "string.h"
-        "|" "stropts.h"
-        "|" "time.h"
-        "|" "unistd.h" "|";
+  "|libgen.h|dirent.h|ftw.h|grp.h|ndbm.h|pthread.h|pwd.h|signal.h|standards.h|stdlib.h|string.h|stropts.h|time.h|unistd.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -459,7 +450,7 @@ tSCC zBroken_Assert_StdioName[] =
  *  File name selection pattern
  */
 tSCC zBroken_Assert_StdioList[] =
-        "|" "assert.h" "|";
+  "|assert.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -487,8 +478,8 @@ tTestDesc aBroken_Assert_StdioTests[] = {
  *  Fix Command Arguments for Broken_Assert_Stdio
  */
 const char* apzBroken_Assert_StdioPatch[] = { "sed",
-    "-e", "1i\\\n"
-       "#include <stdio.h>\n",
+    "-e", "1i\\\n\
+#include <stdio.h>\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -501,7 +492,7 @@ tSCC zBroken_Assert_StdlibName[] =
  *  File name selection pattern
  */
 tSCC zBroken_Assert_StdlibList[] =
-        "|" "assert.h" "|";
+  "|assert.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -529,10 +520,10 @@ tTestDesc aBroken_Assert_StdlibTests[] = {
  *  Fix Command Arguments for Broken_Assert_Stdlib
  */
 const char* apzBroken_Assert_StdlibPatch[] = { "sed",
-    "-e", "1i\\\n"
-       "#ifdef __cplusplus\\\n"
-       "#include <stdlib.h>\\\n"
-       "#endif\n",
+    "-e", "1i\\\n\
+#ifdef __cplusplus\\\n\
+#include <stdlib.h>\\\n\
+#endif\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -579,7 +570,7 @@ tSCC zDec_Intern_AsmName[] =
  *  File name selection pattern
  */
 tSCC zDec_Intern_AsmList[] =
-        "|" "c_asm.h" "|";
+  "|c_asm.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -592,10 +583,10 @@ tSCC zDec_Intern_AsmList[] =
  *  Fix Command Arguments for Dec_Intern_Asm
  */
 const char* apzDec_Intern_AsmPatch[] = { "sed",
-    "-e", "/^[ \t]*float[ \t]*fasm/i\\\n"
-       "#ifdef __DECC\n",
-    "-e", "/^[ \t]*#[ \t]*pragma[ \t]*intrinsic([ \t]*dasm/a\\\n"
-       "#endif\n",
+    "-e", "/^[ \t]*float[ \t]*fasm/i\\\n\
+#ifdef __DECC\n",
+    "-e", "/^[ \t]*#[ \t]*pragma[ \t]*intrinsic([ \t]*dasm/a\\\n\
+#endif\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -649,8 +640,7 @@ tSCC zEcd_CursorName[] =
  *  File name selection pattern
  */
 tSCC zEcd_CursorList[] =
-        "|" "sunwindow/win_lock.h"
-        "|" "sunwindow/win_cursor.h" "|";
+  "|sunwindow/win_lock.h|sunwindow/win_cursor.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -676,7 +666,7 @@ tSCC zSco5_Stat_WrappersName[] =
  *  File name selection pattern
  */
 tSCC zSco5_Stat_WrappersList[] =
-        "|" "sys/stat.h" "|";
+  "|sys/stat.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -691,15 +681,15 @@ tSCC* apzSco5_Stat_WrappersMachs[] = {
  *  Fix Command Arguments for Sco5_Stat_Wrappers
  */
 const char* apzSco5_Stat_WrappersPatch[] = { "sed",
-    "-e", "/^static int[ \t]*[a-z]*stat(/i\\\n"
-       "#ifdef __cplusplus\\\n"
-       "extern \"C\"\\\n"
-       "{\\\n"
-       "#endif\\\n",
-    "-e", "/^}$/a\\\n"
-       "#ifdef __cplusplus\\\n"
-       "}\\\n"
-       "#endif /* __cplusplus */\\\n",
+    "-e", "/^static int[ \t]*[a-z]*stat(/i\\\n\
+#ifdef __cplusplus\\\n\
+extern \"C\"\\\n\
+{\\\n\
+#endif\\\n",
+    "-e", "/^}$/a\\\n\
+#ifdef __cplusplus\\\n\
+}\\\n\
+#endif /* __cplusplus */\\\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -732,13 +722,13 @@ tTestDesc aElse_LabelTests[] = {
  *  Fix Command Arguments for Else_Label
  */
 const char* apzElse_LabelPatch[] = { "sed",
-    "-e", ":loop\n"
-       "/\\\\$/N\n"
-       "s/\\\\$/\\\\+++fixinc_eol+++/\n"
-       "/\\\\$/b loop\n"
-       "s/\\\\+++fixinc_eol+++/\\\\/g\n"
-       "s%^\\([ \t]*#[ \t]*else\\)[ \t]*/[^*].*%\\1%\n"
-       "s%^\\([ \t]*#[ \t]*else\\)[ \t]*[^/ \t].*%\\1%",
+    "-e", ":loop\n\
+/\\\\$/N\n\
+s/\\\\$/\\\\+++fixinc_eol+++/\n\
+/\\\\$/b loop\n\
+s/\\\\+++fixinc_eol+++/\\\\/g\n\
+s%^\\([ \t]*#[ \t]*else\\)[ \t]*/[^*].*%\\1%\n\
+s%^\\([ \t]*#[ \t]*else\\)[ \t]*[^/ \t].*%\\1%",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -771,14 +761,14 @@ tTestDesc aEndif_LabelTests[] = {
  *  Fix Command Arguments for Endif_Label
  */
 const char* apzEndif_LabelPatch[] = { "sed",
-    "-e", ":loop\n"
-       "/\\\\$/N\n"
-       "s/\\\\$/\\\\+++fixinc_eol+++/\n"
-       "/\\\\$/b loop\n"
-       "s/\\\\+++fixinc_eol+++/\\\\/g\n"
-       "s%^\\([ \t]*#[ \t]*endif\\)[ \t]*/[^*].*%\\1%\n"
-       "s%^\\([ \t]*#[ \t]*endif\\)[ \t]*\\*[^/].*%\\1%\n"
-       "s%^\\([ \t]*#[ \t]*endif\\)[ \t]*[^/* \t].*%\\1%",
+    "-e", ":loop\n\
+/\\\\$/N\n\
+s/\\\\$/\\\\+++fixinc_eol+++/\n\
+/\\\\$/b loop\n\
+s/\\\\+++fixinc_eol+++/\\\\/g\n\
+s%^\\([ \t]*#[ \t]*endif\\)[ \t]*/[^*].*%\\1%\n\
+s%^\\([ \t]*#[ \t]*endif\\)[ \t]*\\*[^/].*%\\1%\n\
+s%^\\([ \t]*#[ \t]*endif\\)[ \t]*[^/* \t].*%\\1%",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -791,7 +781,7 @@ tSCC zHp_InlineName[] =
  *  File name selection pattern
  */
 tSCC zHp_InlineList[] =
-        "|" "sys/spinlock.h" "|";
+  "|sys/spinlock.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -826,7 +816,7 @@ tSCC zHp_SysfileName[] =
  *  File name selection pattern
  */
 tSCC zHp_SysfileList[] =
-        "|" "sys/file.h" "|";
+  "|sys/file.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -860,8 +850,7 @@ tSCC zCxx_UnreadyName[] =
  *  File name selection pattern
  */
 tSCC zCxx_UnreadyList[] =
-        "|" "sys/mman.h"
-        "|" "rpc/types.h" "|";
+  "|sys/mman.h|rpc/types.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -882,15 +871,15 @@ tTestDesc aCxx_UnreadyTests[] = {
  *  Fix Command Arguments for Cxx_Unready
  */
 const char* apzCxx_UnreadyPatch[] = { "sed",
-    "-e", "1i\\\n"
-       "#ifdef __cplusplus\\\n"
-       "extern \"C\" {\\\n"
-       "#endif\\\n"
-       "\n",
-    "-e", "$a\\\n"
-       "#ifdef __cplusplus\\\n"
-       "}\\\n"
-       "#endif\n",
+    "-e", "1i\\\n\
+#ifdef __cplusplus\\\n\
+extern \"C\" {\\\n\
+#endif\\\n\
+\n",
+    "-e", "$a\\\n\
+#ifdef __cplusplus\\\n\
+}\\\n\
+#endif\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -903,7 +892,7 @@ tSCC zHpux_MaxintName[] =
  *  File name selection pattern
  */
 tSCC zHpux_MaxintList[] =
-        "|" "sys/param.h" "|";
+  "|sys/param.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -916,10 +905,10 @@ tSCC zHpux_MaxintList[] =
  *  Fix Command Arguments for Hpux_Maxint
  */
 const char* apzHpux_MaxintPatch[] = { "sed",
-    "-e", "/^#[ \t]*define[ \t]*MAXINT[ \t]/i\\\n"
-       "#ifndef MAXINT\n",
-    "-e", "/^#[ \t]*define[ \t]*MAXINT[ \t]/a\\\n"
-       "#endif\n",
+    "-e", "/^#[ \t]*define[ \t]*MAXINT[ \t]/i\\\n\
+#ifndef MAXINT\n",
+    "-e", "/^#[ \t]*define[ \t]*MAXINT[ \t]/a\\\n\
+#endif\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -932,7 +921,7 @@ tSCC zHpux_SystimeName[] =
  *  File name selection pattern
  */
 tSCC zHpux_SystimeList[] =
-        "|" "sys/time.h" "|";
+  "|sys/time.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -966,12 +955,7 @@ tSCC zInteractv_Add1Name[] =
  *  File name selection pattern
  */
 tSCC zInteractv_Add1List[] =
-        "|" "stdio.h"
-        "|" "math.h"
-        "|" "ctype.h"
-        "|" "sys/limits.h"
-        "|" "sys/fcntl.h"
-        "|" "sys/dirent.h" "|";
+  "|stdio.h|math.h|ctype.h|sys/limits.h|sys/fcntl.h|sys/dirent.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -1008,7 +992,7 @@ tSCC zInteractv_Add2Name[] =
  *  File name selection pattern
  */
 tSCC zInteractv_Add2List[] =
-        "|" "math.h" "|";
+  "|math.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -1045,7 +1029,7 @@ tSCC zInteractv_Add3Name[] =
  *  File name selection pattern
  */
 tSCC zInteractv_Add3List[] =
-        "|" "sys/limits.h" "|";
+  "|sys/limits.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -1103,7 +1087,8 @@ tTestDesc aIo_Def_QuotesTests[] = {
  *  Fix Command Arguments for Io_Def_Quotes
  */
 const char* apzIo_Def_QuotesPatch[] = { "sed",
-    "-e", "s/\\([ \t]*[ \t](_|DES)IO[A-Z]*[ \t]*(\\)\\([^,']\\),/\\1'\\2',/",
+    "-e", "s/\\([ \t]*[ \t]_IO[A-Z]*[ \t]*(\\)\\([^,']\\),/\\1'\\2',/",
+    "-e", "s/\\([ \t]*[ \t]DESIO[A-Z]*[ \t]*(\\)\\([^,']\\),/\\1'\\2',/",
     "-e", "/#[ \t]*define[ \t]*[ \t]_IO/s/'\\([cgxtf]\\)'/\\1/g",
     "-e", "/#[ \t]*define[ \t]*[ \t]DESIOC/s/'\\([cdgx]\\)'/\\1/g",
     (char*)NULL };
@@ -1155,7 +1140,7 @@ tSCC zIp_Missing_SemiName[] =
  *  File name selection pattern
  */
 tSCC zIp_Missing_SemiList[] =
-        "|" "netinet/ip.h" "|";
+  "|netinet/ip.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -1181,7 +1166,7 @@ tSCC zIrix_Multiline_CmntName[] =
  *  File name selection pattern
  */
 tSCC zIrix_Multiline_CmntList[] =
-        "|" "sys/types.h" "|";
+  "|sys/types.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -1208,7 +1193,7 @@ tSCC zIrix_SockaddrName[] =
  *  File name selection pattern
  */
 tSCC zIrix_SockaddrList[] =
-        "|" "rpc/auth.h" "|";
+  "|rpc/auth.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -1229,8 +1214,8 @@ tTestDesc aIrix_SockaddrTests[] = {
  *  Fix Command Arguments for Irix_Sockaddr
  */
 const char* apzIrix_SockaddrPatch[] = { "sed",
-    "-e", "/authdes_create.*struct sockaddr/i\\\n"
-       "struct sockaddr;\n",
+    "-e", "/authdes_create.*struct sockaddr/i\\\n\
+struct sockaddr;\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -1243,7 +1228,7 @@ tSCC zIrix_Struct__FileName[] =
  *  File name selection pattern
  */
 tSCC zIrix_Struct__FileList[] =
-        "|" "rpc/xdr.h" "|";
+  "|rpc/xdr.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -1256,8 +1241,8 @@ tSCC zIrix_Struct__FileList[] =
  *  Fix Command Arguments for Irix_Struct__File
  */
 const char* apzIrix_Struct__FilePatch[] = { "sed",
-    "-e", "/xdrstdio_create.*struct __file_s/i\\\n"
-       "struct __file_s;\n",
+    "-e", "/xdrstdio_create.*struct __file_s/i\\\n\
+struct __file_s;\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -1270,7 +1255,7 @@ tSCC zIsc_FmodName[] =
  *  File name selection pattern
  */
 tSCC zIsc_FmodList[] =
-        "|" "math.h" "|";
+  "|math.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -1304,8 +1289,7 @@ tSCC zMotorola_NestedName[] =
  *  File name selection pattern
  */
 tSCC zMotorola_NestedList[] =
-        "|" "limits.h"
-        "|" "sys/limits.h" "|";
+  "|limits.h|sys/limits.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -1334,7 +1318,7 @@ tSCC zIsc_Sys_LimitsName[] =
  *  File name selection pattern
  */
 tSCC zIsc_Sys_LimitsList[] =
-        "|" "sys/limits.h" "|";
+  "|sys/limits.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -1369,24 +1353,7 @@ tSCC zKandr_ConcatName[] =
  *  File name selection pattern
  */
 tSCC zKandr_ConcatList[] =
-        "|" "sparc/asm_linkage.h"
-        "|" "sun3/asm_linkage.h"
-        "|" "sun3x/asm_linkage.h"
-        "|" "sun4/asm_linkage.h"
-        "|" "sun4c/asm_linkage.h"
-        "|" "sun4m/asm_linkage.h"
-        "|" "sun4c/debug/asm_linkage.h"
-        "|" "sun4m/debug/asm_linkage.h"
-        "|" "arm/as_support.h"
-        "|" "arm/mc_type.h"
-        "|" "arm/xcb.h"
-        "|" "dev/chardefmac.h"
-        "|" "dev/ps_irq.h"
-        "|" "dev/screen.h"
-        "|" "dev/scsi.h"
-        "|" "sys/tty.h"
-        "|" "Xm.acorn/XmP.h"
-        "|" "bsd43/bsd43_.h" "|";
+  "|sparc/asm_linkage.h|sun3/asm_linkage.h|sun3x/asm_linkage.h|sun4/asm_linkage.h|sun4c/asm_linkage.h|sun4m/asm_linkage.h|sun4c/debug/asm_linkage.h|sun4m/debug/asm_linkage.h|arm/as_support.h|arm/mc_type.h|arm/xcb.h|dev/chardefmac.h|dev/ps_irq.h|dev/screen.h|dev/scsi.h|sys/tty.h|Xm.acorn/XmP.h|bsd43/bsd43_.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -1420,7 +1387,7 @@ tSCC zLimits_IfndefsName[] =
  *  File name selection pattern
  */
 tSCC zLimits_IfndefsList[] =
-        "|" "limits.h" "|";
+  "|limits.h|sys/limits.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -1441,30 +1408,30 @@ tTestDesc aLimits_IfndefsTests[] = {
  *  Fix Command Arguments for Limits_Ifndefs
  */
 const char* apzLimits_IfndefsPatch[] = { "sed",
-    "-e", "/[ \t]FLT_MIN[ \t]/i\\\n"
-       "#ifndef FLT_MIN\n",
-    "-e", "/[ \t]FLT_MIN[ \t]/a\\\n"
-       "#endif\n",
-    "-e", "/[ \t]FLT_MAX[ \t]/i\\\n"
-       "#ifndef FLT_MAX\n",
-    "-e", "/[ \t]FLT_MAX[ \t]/a\\\n"
-       "#endif\n",
-    "-e", "/[ \t]FLT_DIG[ \t]/i\\\n"
-       "#ifndef FLT_DIG\n",
-    "-e", "/[ \t]FLT_DIG[ \t]/a\\\n"
-       "#endif\n",
-    "-e", "/[ \t]DBL_MIN[ \t]/i\\\n"
-       "#ifndef DBL_MIN\n",
-    "-e", "/[ \t]DBL_MIN[ \t]/a\\\n"
-       "#endif\n",
-    "-e", "/[ \t]DBL_MAX[ \t]/i\\\n"
-       "#ifndef DBL_MAX\n",
-    "-e", "/[ \t]DBL_MAX[ \t]/a\\\n"
-       "#endif\n",
-    "-e", "/[ \t]DBL_DIG[ \t]/i\\\n"
-       "#ifndef DBL_DIG\n",
-    "-e", "/[ \t]DBL_DIG[ \t]/a\\\n"
-       "#endif\n",
+    "-e", "/[ \t]FLT_MIN[ \t]/i\\\n\
+#ifndef FLT_MIN\n",
+    "-e", "/[ \t]FLT_MIN[ \t]/a\\\n\
+#endif\n",
+    "-e", "/[ \t]FLT_MAX[ \t]/i\\\n\
+#ifndef FLT_MAX\n",
+    "-e", "/[ \t]FLT_MAX[ \t]/a\\\n\
+#endif\n",
+    "-e", "/[ \t]FLT_DIG[ \t]/i\\\n\
+#ifndef FLT_DIG\n",
+    "-e", "/[ \t]FLT_DIG[ \t]/a\\\n\
+#endif\n",
+    "-e", "/[ \t]DBL_MIN[ \t]/i\\\n\
+#ifndef DBL_MIN\n",
+    "-e", "/[ \t]DBL_MIN[ \t]/a\\\n\
+#endif\n",
+    "-e", "/[ \t]DBL_MAX[ \t]/i\\\n\
+#ifndef DBL_MAX\n",
+    "-e", "/[ \t]DBL_MAX[ \t]/a\\\n\
+#endif\n",
+    "-e", "/[ \t]DBL_DIG[ \t]/i\\\n\
+#ifndef DBL_DIG\n",
+    "-e", "/[ \t]DBL_DIG[ \t]/a\\\n\
+#endif\n",
     "-e", "/^\\(\\/\\*#define\tHUGE_VAL\t3\\.[0-9e+]* *\\)\\/\\*/s//\\1/",
     (char*)NULL };
 
@@ -1478,7 +1445,7 @@ tSCC zLynx_Void_IntName[] =
  *  File name selection pattern
  */
 tSCC zLynx_Void_IntList[] =
-        "|" "curses.h" "|";
+  "|curses.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -1512,7 +1479,7 @@ tSCC zLynxos_Fcntl_ProtoName[] =
  *  File name selection pattern
  */
 tSCC zLynxos_Fcntl_ProtoList[] =
-        "|" "fcntl.h" "|";
+  "|fcntl.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -1546,7 +1513,7 @@ tSCC zM88k_Bad_Hypot_OptName[] =
  *  File name selection pattern
  */
 tSCC zM88k_Bad_Hypot_OptList[] =
-        "|" "math.h" "|";
+  "|math.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -1562,19 +1529,19 @@ tSCC* apzM88k_Bad_Hypot_OptMachs[] = {
  */
 const char* apzM88k_Bad_Hypot_OptPatch[] = { "sed",
     "-e", "s/extern double floor(), ceil(), fmod(), fabs();/extern double floor(), ceil(), fmod(), fabs _PARAMS((double));/",
-    "-e", "/^extern double hypot();$/a\\\n"
-       "\\/* Workaround a stupid Motorola optimization if one\\\n"
-       "   of x or y is 0.0 and the other is negative!  *\\/\\\n"
-       "#ifdef __STDC__\\\n"
-       "static __inline__ double fake_hypot (double x, double y)\\\n"
-       "#else\\\n"
-       "static __inline__ double fake_hypot (x, y)\\\n"
-       "\tdouble x, y;\\\n"
-       "#endif\\\n"
-       "{\\\n"
-       "\treturn fabs (hypot (x, y));\\\n"
-       "}\\\n"
-       "#define hypot\tfake_hypot\n",
+    "-e", "/^extern double hypot();$/a\\\n\
+\\/* Workaround a stupid Motorola optimization if one\\\n\
+   of x or y is 0.0 and the other is negative!  *\\/\\\n\
+#ifdef __STDC__\\\n\
+static __inline__ double fake_hypot (double x, double y)\\\n\
+#else\\\n\
+static __inline__ double fake_hypot (x, y)\\\n\
+\tdouble x, y;\\\n\
+#endif\\\n\
+{\\\n\
+\treturn fabs (hypot (x, y));\\\n\
+}\\\n\
+#define hypot\tfake_hypot\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -1587,7 +1554,7 @@ tSCC zM88k_Bad_S_IfName[] =
  *  File name selection pattern
  */
 tSCC zM88k_Bad_S_IfList[] =
-        "|" "sys/stat.h" "|";
+  "|sys/stat.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -1624,7 +1591,7 @@ tSCC zM88k_Multi_InclName[] =
  *  File name selection pattern
  */
 tSCC zM88k_Multi_InclList[] =
-        "|" "time.h" "|";
+  "|time.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -1647,12 +1614,12 @@ tTestDesc aM88k_Multi_InclTests[] = {
  *  Fix Command Arguments for M88k_Multi_Incl
  */
 const char* apzM88k_Multi_InclPatch[] = { "sh", "-c",
-    "echo Fixing $file, to protect against multiple inclusion. >&2\n"
-       "      cpp_wrapper=`echo $file | sed -e 's,\\.,_,g' -e 's,/,_,g'`\n"
-       "      echo \"#ifndef __GCC_GOT_${cpp_wrapper}_\"\n"
-       "      echo \"#define __GCC_GOT_${cpp_wrapper}_\"\n"
-       "      cat\n"
-       "      echo \"#endif /* ! __GCC_GOT_${cpp_wrapper}_ */\"",
+    "echo Fixing $file, to protect against multiple inclusion. >&2\n\
+      cpp_wrapper=`echo $file | sed -e 's,\\.,_,g' -e 's,/,_,g'`\n\
+      echo \"#ifndef __GCC_GOT_${cpp_wrapper}_\"\n\
+      echo \"#define __GCC_GOT_${cpp_wrapper}_\"\n\
+      cat\n\
+      echo \"#endif /* ! __GCC_GOT_${cpp_wrapper}_ */\"",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -1687,41 +1654,41 @@ tTestDesc aMachine_NameTests[] = {
  *  Fix Command Arguments for Machine_Name
  */
 const char* apzMachine_NamePatch[] = { "sed",
-    "-e", ":loop\n"
-       "/\\\\$/N\n"
-       "s/\\\\$/\\\\+++fixinc_eol+++/\n"
-       "/\\\\$/b loop\n"
-       "s/\\\\+++fixinc_eol+++/\\\\/g\n"
-       "/#[\t ]*[el]*if/ {\n"
-       "\ts/[a-zA-Z0-9_][a-zA-Z0-9_]*/ & /g\n"
-       "\ts/ M32 / __M32__ /g\n"
-       "\ts/ _*MIPSE\\([LB]\\) / __MIPSE\\1__ /g\n"
-       "\ts/ _*SYSTYPE_\\([A-Z0-9]*\\) / __SYSTYPE_\\1__ /g\n"
-       "\ts/ _*\\([Rr][34]\\)000 / __\\1000__ /g\n"
-       "\ts/ _*host_mips / __host_mips__ /g\n"
-       "\ts/ _*i386 / __i386__ /g\n"
-       "\ts/ _*mips / __mips__ /g\n"
-       "\ts/ bsd4\\([0-9]\\) / __bsd4\\1__ /g\n"
-       "\ts/ is68k / __is68k__ /g\n"
-       "\ts/ m68k / __m68k__ /g\n"
-       "\ts/ m88k / __m88k__ /g\n"
-       "\ts/ mc680\\([0-9]\\)0 / __mc680\\10__ /g\n"
-       "\ts/ news\\([0-9]*\\) / __news\\1__ /g\n"
-       "\ts/ ns32000 / __ns32000__ /g\n"
-       "\ts/ pdp11 / __pdp11__ /g\n"
-       "\ts/ pyr / __pyr__ /g\n"
-       "\ts/ sel / __sel__ /g\n"
-       "\ts/ sony_news / __sony_news__ /g\n"
-       "\ts/ sparc / __sparc__ /g\n"
-       "\ts/ sun\\([a-z0-9]*\\) / __sun\\1__ /g\n"
-       "\ts/ tahoe / __tahoe__ /g\n"
-       "\ts/ tower\\([_0-9]*\\) / __tower\\1__ /g\n"
-       "\ts/ u370 / __u370__ /g\n"
-       "\ts/ u3b\\([0-9]*\\) / __u3b\\1__ /g\n"
-       "\ts/ unix / __unix__ /g\n"
-       "\ts/ vax / __vax__ /g\n"
-       "\ts/ \\([a-zA-Z0-9_][a-zA-Z0-9_]*\\) /\\1/g\n"
-       "\t}",
+    "-e", ":loop\n\
+/\\\\$/N\n\
+s/\\\\$/\\\\+++fixinc_eol+++/\n\
+/\\\\$/b loop\n\
+s/\\\\+++fixinc_eol+++/\\\\/g\n\
+/#[\t ]*[el]*if/ {\n\
+\ts/[a-zA-Z0-9_][a-zA-Z0-9_]*/ & /g\n\
+\ts/ M32 / __M32__ /g\n\
+\ts/ _*MIPSE\\([LB]\\) / __MIPSE\\1__ /g\n\
+\ts/ _*SYSTYPE_\\([A-Z0-9]*\\) / __SYSTYPE_\\1__ /g\n\
+\ts/ _*\\([Rr][34]\\)000 / __\\1000__ /g\n\
+\ts/ _*host_mips / __host_mips__ /g\n\
+\ts/ _*i386 / __i386__ /g\n\
+\ts/ _*mips / __mips__ /g\n\
+\ts/ bsd4\\([0-9]\\) / __bsd4\\1__ /g\n\
+\ts/ is68k / __is68k__ /g\n\
+\ts/ m68k / __m68k__ /g\n\
+\ts/ m88k / __m88k__ /g\n\
+\ts/ mc680\\([0-9]\\)0 / __mc680\\10__ /g\n\
+\ts/ news\\([0-9]*\\) / __news\\1__ /g\n\
+\ts/ ns32000 / __ns32000__ /g\n\
+\ts/ pdp11 / __pdp11__ /g\n\
+\ts/ pyr / __pyr__ /g\n\
+\ts/ sel / __sel__ /g\n\
+\ts/ sony_news / __sony_news__ /g\n\
+\ts/ sparc / __sparc__ /g\n\
+\ts/ sun\\([a-z0-9]*\\) / __sun\\1__ /g\n\
+\ts/ tahoe / __tahoe__ /g\n\
+\ts/ tower\\([_0-9]*\\) / __tower\\1__ /g\n\
+\ts/ u370 / __u370__ /g\n\
+\ts/ u3b\\([0-9]*\\) / __u3b\\1__ /g\n\
+\ts/ unix / __unix__ /g\n\
+\ts/ vax / __vax__ /g\n\
+\ts/ \\([a-zA-Z0-9_][a-zA-Z0-9_]*\\) /\\1/g\n\
+\t}",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -1734,7 +1701,7 @@ tSCC zMath_ExceptionName[] =
  *  File name selection pattern
  */
 tSCC zMath_ExceptionList[] =
-        "|" "math.h" "|";
+  "|math.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -1755,22 +1722,22 @@ tTestDesc aMath_ExceptionTests[] = {
  *  Fix Command Arguments for Math_Exception
  */
 const char* apzMath_ExceptionPatch[] = { "sed",
-    "-e", "/struct exception/i\\\n"
-       "#ifdef __cplusplus\\\n"
-       "#define exception __math_exception\\\n"
-       "#endif\n",
-    "-e", "/struct exception/a\\\n"
-       "#ifdef __cplusplus\\\n"
-       "#undef exception\\\n"
-       "#endif\n",
-    "-e", "/matherr/i\\\n"
-       "#ifdef __cplusplus\\\n"
-       "#define exception __math_exception\\\n"
-       "#endif\n",
-    "-e", "/matherr/a\\\n"
-       "#ifdef __cplusplus\\\n"
-       "#undef exception\\\n"
-       "#endif\n",
+    "-e", "/struct exception/i\\\n\
+#ifdef __cplusplus\\\n\
+#define exception __math_exception\\\n\
+#endif\n",
+    "-e", "/struct exception/a\\\n\
+#ifdef __cplusplus\\\n\
+#undef exception\\\n\
+#endif\n",
+    "-e", "/matherr/i\\\n\
+#ifdef __cplusplus\\\n\
+#define exception __math_exception\\\n\
+#endif\n",
+    "-e", "/matherr/a\\\n\
+#ifdef __cplusplus\\\n\
+#undef exception\\\n\
+#endif\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -1783,7 +1750,7 @@ tSCC zMath_Gcc_IfndefsName[] =
  *  File name selection pattern
  */
 tSCC zMath_Gcc_IfndefsList[] =
-        "|" "math.h" "|";
+  "|math.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -1796,19 +1763,19 @@ tSCC zMath_Gcc_IfndefsList[] =
  *  Fix Command Arguments for Math_Gcc_Ifndefs
  */
 const char* apzMath_Gcc_IfndefsPatch[] = { "sh", "-c",
-    "\tdbl_max_def=`egrep 'define[ \t]+DBL_MAX[ \t]+.*' float.h 2>/dev/null`\n"
-       "\n"
-       "\tif ( test -n \"${dbl_max_def}\" \\\n"
-       "\t\t-a -n \"`egrep '#define[ \t]*HUGE_VAL[ \t]+DBL_MAX' $file`\" \\\n"
-       "\t\t-a -z \"`egrep '#define[ \t]+DBL_MAX[ \t]+' $file`\"\n"
-       "\t   ) > /dev/null 2>&1\n"
-       "\tthen sed -e '/define[ \t]HUGE_VAL[ \t]DBL_MAX/s/DBL_MAX/$dbl_max_def/'\n"
-       "\telse cat ; fi |\n"
-       "\tsed -e'/define[ \t]HUGE_VAL[ \t]/i\\\n"
-       "#ifndef HUGE_VAL\n"
-       "' -e'/define[ \t]HUGE_VAL[ \t]/a\\\n"
-       "#endif\n"
-       "'",
+    "\tdbl_max_def=`egrep 'define[ \t]+DBL_MAX[ \t]+.*' float.h 2>/dev/null`\n\
+\n\
+\tif ( test -n \"${dbl_max_def}\" \\\n\
+\t\t-a -n \"`egrep '#define[ \t]*HUGE_VAL[ \t]+DBL_MAX' $file`\" \\\n\
+\t\t-a -z \"`egrep '#define[ \t]+DBL_MAX[ \t]+' $file`\"\n\
+\t   ) > /dev/null 2>&1\n\
+\tthen sed -e '/define[ \t]HUGE_VAL[ \t]DBL_MAX/s/DBL_MAX/$dbl_max_def/'\n\
+\telse cat ; fi |\n\
+\tsed -e '/define[ \t]HUGE_VAL[ \t]/i\\\n\
+#ifndef HUGE_VAL\n\
+' -e '/define[ \t]HUGE_VAL[ \t]/a\\\n\
+#endif\n\
+'",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -1821,7 +1788,7 @@ tSCC zNested_CommentName[] =
  *  File name selection pattern
  */
 tSCC zNested_CommentList[] =
-        "|" "rpc/rpc.h" "|";
+  "|rpc/rpc.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -1847,7 +1814,7 @@ tSCC zNews_Os_RecursionName[] =
  *  File name selection pattern
  */
 tSCC zNews_Os_RecursionList[] =
-        "|" "stdlib.h" "|";
+  "|stdlib.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -1868,10 +1835,10 @@ tTestDesc aNews_Os_RecursionTests[] = {
  *  Fix Command Arguments for News_Os_Recursion
  */
 const char* apzNews_Os_RecursionPatch[] = { "sed",
-    "-e", "/^#include <stdlib.h>/i\\\n"
-       "#ifdef BOGUS_RECURSION\n",
-    "-e", "/^#include <stdlib.h>/a\\\n"
-       "#endif\n",
+    "-e", "/^#include <stdlib.h>/i\\\n\
+#ifdef BOGUS_RECURSION\n",
+    "-e", "/^#include <stdlib.h>/a\\\n\
+#endif\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -1884,7 +1851,7 @@ tSCC zNext_Math_PrefixName[] =
  *  File name selection pattern
  */
 tSCC zNext_Math_PrefixList[] =
-        "|" "ansi/math.h" "|";
+  "|ansi/math.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -1922,7 +1889,7 @@ tSCC zNext_TemplateName[] =
  *  File name selection pattern
  */
 tSCC zNext_TemplateList[] =
-        "|" "bsd/libc.h" "|";
+  "|bsd/libc.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -1957,7 +1924,7 @@ tSCC zNext_VolitileName[] =
  *  File name selection pattern
  */
 tSCC zNext_VolitileList[] =
-        "|" "ansi/stdlib.h" "|";
+  "|ansi/stdlib.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -1992,7 +1959,7 @@ tSCC zNext_Wait_UnionName[] =
  *  File name selection pattern
  */
 tSCC zNext_Wait_UnionList[] =
-        "|" "sys/wait.h" "|";
+  "|sys/wait.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -2026,7 +1993,7 @@ tSCC zNodeent_SyntaxName[] =
  *  File name selection pattern
  */
 tSCC zNodeent_SyntaxList[] =
-        "|" "netdnet/dnetdb.h" "|";
+  "|netdnet/dnetdb.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -2052,8 +2019,7 @@ tSCC zOsf_Namespace_AName[] =
  *  File name selection pattern
  */
 tSCC zOsf_Namespace_AList[] =
-        "|" "reg_types.h"
-        "|" "sys/lc_core.h" "|";
+  "|reg_types.h|sys/lc_core.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -2098,7 +2064,7 @@ tSCC zOsf_Namespace_BName[] =
  *  File name selection pattern
  */
 tSCC zOsf_Namespace_BList[] =
-        "|" "regex.h" "|";
+  "|regex.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -2128,10 +2094,10 @@ tTestDesc aOsf_Namespace_BTests[] = {
  *  Fix Command Arguments for Osf_Namespace_B
  */
 const char* apzOsf_Namespace_BPatch[] = { "sed",
-    "-e", "/#include <reg_types.h>/a\\\n"
-       "typedef __regex_t\tregex_t;\\\n"
-       "typedef __regoff_t\tregoff_t;\\\n"
-       "typedef __regmatch_t\tregmatch_t;\n",
+    "-e", "/#include <reg_types.h>/a\\\n\
+typedef __regex_t\tregex_t;\\\n\
+typedef __regoff_t\tregoff_t;\\\n\
+typedef __regmatch_t\tregmatch_t;\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -2144,7 +2110,7 @@ tSCC zPthread_Page_SizeName[] =
  *  File name selection pattern
  */
 tSCC zPthread_Page_SizeList[] =
-        "|" "pthread.h" "|";
+  "|pthread.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -2178,7 +2144,7 @@ tSCC zRs6000_DoubleName[] =
  *  File name selection pattern
  */
 tSCC zRs6000_DoubleList[] =
-        "|" "math.h" "|";
+  "|math.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -2199,10 +2165,10 @@ tTestDesc aRs6000_DoubleTests[] = {
  *  Fix Command Arguments for Rs6000_Double
  */
 const char* apzRs6000_DoublePatch[] = { "sed",
-    "-e", "/class[(]/i\\\n"
-       "#ifndef __cplusplus\n",
-    "-e", "/class[(]/a\\\n"
-       "#endif\n",
+    "-e", "/class[(]/i\\\n\
+#ifndef __cplusplus\n",
+    "-e", "/class[(]/a\\\n\
+#endif\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -2215,7 +2181,7 @@ tSCC zRs6000_FchmodName[] =
  *  File name selection pattern
  */
 tSCC zRs6000_FchmodList[] =
-        "|" "sys/stat.h" "|";
+  "|sys/stat.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -2249,8 +2215,7 @@ tSCC zRs6000_ParamName[] =
  *  File name selection pattern
  */
 tSCC zRs6000_ParamList[] =
-        "|" "stdio.h"
-        "|" "unistd.h" "|";
+  "|stdio.h|unistd.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -2276,7 +2241,7 @@ tSCC zSony_IncludeName[] =
  *  File name selection pattern
  */
 tSCC zSony_IncludeList[] =
-        "|" "machine/machparam.h" "|";
+  "|machine/machparam.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -2310,7 +2275,7 @@ tSCC zStatsswtchName[] =
  *  File name selection pattern
  */
 tSCC zStatsswtchList[] =
-        "|" "rpcsvc/rstat.h" "|";
+  "|rpcsvc/rstat.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -2344,7 +2309,7 @@ tSCC zStdio_Va_ListName[] =
  *  File name selection pattern
  */
 tSCC zStdio_Va_ListList[] =
-        "|" "stdio.h" "|";
+  "|stdio.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -2357,24 +2322,24 @@ tSCC zStdio_Va_ListList[] =
  *  Fix Command Arguments for Stdio_Va_List
  */
 const char* apzStdio_Va_ListPatch[] = { "sh", "-c",
-    "if ( egrep \"__need___va_list\" $file ) > /dev/null 2>&1 ; then\n"
-       "    :\n"
-       "  else\n"
-       "    echo \"#define __need___va_list\"\n"
-       "    echo \"#include <stdarg.h>\"\n"
-       "  fi\n"
-       "\n"
-       "  sed -e 's@ va_list @ __gnuc_va_list @' \\\n"
-       "      -e 's@ va_list)@ __gnuc_va_list)@' \\\n"
-       "      -e 's@ _BSD_VA_LIST_));@ __gnuc_va_list));@' \\\n"
-       "      -e 's@ _VA_LIST_));@ __gnuc_va_list));@' \\\n"
-       "      -e 's@ va_list@ __va_list__@' \\\n"
-       "      -e 's@\\*va_list@*__va_list__@' \\\n"
-       "      -e 's@ __va_list)@ __gnuc_va_list)@' \\\n"
-       "      -e 's@GNUC_VA_LIST@GNUC_Va_LIST@' \\\n"
-       "      -e 's@_NEED___VA_LIST@_NEED___Va_LIST@' \\\n"
-       "      -e 's@VA_LIST@DUMMY_VA_LIST@' \\\n"
-       "      -e 's@_Va_LIST@_VA_LIST@'",
+    "if ( egrep \"__need___va_list\" $file ) > /dev/null 2>&1 ; then\n\
+    :\n\
+  else\n\
+    echo \"#define __need___va_list\"\n\
+    echo \"#include <stdarg.h>\"\n\
+  fi\n\
+\n\
+  sed -e 's@ va_list @ __gnuc_va_list @' \\\n\
+      -e 's@ va_list)@ __gnuc_va_list)@' \\\n\
+      -e 's@ _BSD_VA_LIST_));@ __gnuc_va_list));@' \\\n\
+      -e 's@ _VA_LIST_));@ __gnuc_va_list));@' \\\n\
+      -e 's@ va_list@ __va_list__@' \\\n\
+      -e 's@\\*va_list@*__va_list__@' \\\n\
+      -e 's@ __va_list)@ __gnuc_va_list)@' \\\n\
+      -e 's@GNUC_VA_LIST@GNUC_Va_LIST@' \\\n\
+      -e 's@_NEED___VA_LIST@_NEED___Va_LIST@' \\\n\
+      -e 's@VA_LIST@DUMMY_VA_LIST@' \\\n\
+      -e 's@_Va_LIST@_VA_LIST@'",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -2387,8 +2352,7 @@ tSCC zSun_Bogus_IfdefName[] =
  *  File name selection pattern
  */
 tSCC zSun_Bogus_IfdefList[] =
-        "|" "hsfs/hsfs_spec.h"
-        "|" "hsfs/iso_spec.h" "|";
+  "|hsfs/hsfs_spec.h|hsfs/iso_spec.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -2422,7 +2386,7 @@ tSCC zSun_Bogus_Ifdef_Sun4cName[] =
  *  File name selection pattern
  */
 tSCC zSun_Bogus_Ifdef_Sun4cList[] =
-        "|" "hsfs/hsnode.h" "|";
+  "|hsfs/hsnode.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -2456,7 +2420,7 @@ tSCC zSun_CatmacroName[] =
  *  File name selection pattern
  */
 tSCC zSun_CatmacroList[] =
-        "|" "pixrect/memvar.h" "|";
+  "|pixrect/memvar.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -2477,12 +2441,12 @@ tTestDesc aSun_CatmacroTests[] = {
  *  Fix Command Arguments for Sun_Catmacro
  */
 const char* apzSun_CatmacroPatch[] = { "sed",
-    "-e", "/^#define[ \t]CAT(a,b)/ i\\\n"
-       "#ifdef __STDC__ \\\n"
-       "#define CAT(a,b) a##b\\\n"
-       "#else\n",
-    "-e", "/^#define[ \t]CAT(a,b)/ a\\\n"
-       "#endif\n",
+    "-e", "/^#define[ \t]CAT(a,b)/ i\\\n\
+#ifdef __STDC__ \\\n\
+#define CAT(a,b) a##b\\\n\
+#else\n",
+    "-e", "/^#define[ \t]CAT(a,b)/ a\\\n\
+#endif\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -2495,7 +2459,7 @@ tSCC zSun_MallocName[] =
  *  File name selection pattern
  */
 tSCC zSun_MallocList[] =
-        "|" "malloc.h" "|";
+  "|malloc.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -2524,7 +2488,7 @@ tSCC zSun_MemcpyName[] =
  *  File name selection pattern
  */
 tSCC zSun_MemcpyList[] =
-        "|" "memory.h" "|";
+  "|memory.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -2545,26 +2509,26 @@ tTestDesc aSun_MemcpyTests[] = {
  *  Fix Command Arguments for Sun_Memcpy
  */
 const char* apzSun_MemcpyPatch[] = { "sed",
-    "-e", "1i\\\n"
-       "/* This file was generated by fixincludes */\\\n"
-       "#ifndef __memory_h__\\\n"
-       "#define __memory_h__\\\n"
-       "\\\n"
-       "#ifdef __STDC__\\\n"
-       "extern void *memccpy();\\\n"
-       "extern void *memchr();\\\n"
-       "extern void *memcpy();\\\n"
-       "extern void *memset();\\\n"
-       "#else\\\n"
-       "extern char *memccpy();\\\n"
-       "extern char *memchr();\\\n"
-       "extern char *memcpy();\\\n"
-       "extern char *memset();\\\n"
-       "#endif /* __STDC__ */\\\n"
-       "\\\n"
-       "extern int memcmp();\\\n"
-       "\\\n"
-       "#endif /* __memory_h__ */\n",
+    "-e", "1i\\\n\
+/* This file was generated by fixincludes */\\\n\
+#ifndef __memory_h__\\\n\
+#define __memory_h__\\\n\
+\\\n\
+#ifdef __STDC__\\\n\
+extern void *memccpy();\\\n\
+extern void *memchr();\\\n\
+extern void *memcpy();\\\n\
+extern void *memset();\\\n\
+#else\\\n\
+extern char *memccpy();\\\n\
+extern char *memchr();\\\n\
+extern char *memcpy();\\\n\
+extern char *memset();\\\n\
+#endif /* __STDC__ */\\\n\
+\\\n\
+extern int memcmp();\\\n\
+\\\n\
+#endif /* __memory_h__ */\n",
     "-e", "1,$d",
     (char*)NULL };
 
@@ -2578,7 +2542,7 @@ tSCC zSun_Rusers_SemiName[] =
  *  File name selection pattern
  */
 tSCC zSun_Rusers_SemiList[] =
-        "|" "rpcsvc/rusers.h" "|";
+  "|rpcsvc/rusers.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -2612,8 +2576,7 @@ tSCC zSun_SignalName[] =
  *  File name selection pattern
  */
 tSCC zSun_SignalList[] =
-        "|" "sys/signal.h"
-        "|" "signal.h" "|";
+  "|sys/signal.h|signal.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -2634,12 +2597,12 @@ tTestDesc aSun_SignalTests[] = {
  *  Fix Command Arguments for Sun_Signal
  */
 const char* apzSun_SignalPatch[] = { "sed",
-    "-e", "/^void\t(\\*signal())();$/i\\\n"
-       "#ifdef __cplusplus\\\n"
-       "void\t(*signal(...))(...);\\\n"
-       "#else\n",
-    "-e", "/^void\t(\\*signal())();$/a\\\n"
-       "#endif\n",
+    "-e", "/^void\t(\\*signal())();$/i\\\n\
+#ifdef __cplusplus\\\n\
+void\t(*signal(...))(...);\\\n\
+#else\n",
+    "-e", "/^void\t(\\*signal())();$/a\\\n\
+#endif\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -2652,10 +2615,7 @@ tSCC zSun_Auth_ProtoName[] =
  *  File name selection pattern
  */
 tSCC zSun_Auth_ProtoList[] =
-        "|" "rpc/auth.h"
-        "|" "rpc/clnt.h"
-        "|" "rpc/svc.h"
-        "|" "rpc/xdr.h" "|";
+  "|rpc/auth.h|rpc/clnt.h|rpc/svc.h|rpc/xdr.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -2683,12 +2643,12 @@ tTestDesc aSun_Auth_ProtoTests[] = {
  *  Fix Command Arguments for Sun_Auth_Proto
  */
 const char* apzSun_Auth_ProtoPatch[] = { "sed",
-    "-e", "s/^\\(.*(\\*[a-z][a-z_]*)(\\)\\();.*\\)/\\\n"
-       "#ifdef __cplusplus\\\n"
-       "\\1...\\2\\\n"
-       "#else\\\n"
-       "\\1\\2\\\n"
-       "#endif/",
+    "-e", "s/^\\(.*(\\*[a-z][a-z_]*)(\\)\\();.*\\)/\\\n\
+#ifdef __cplusplus\\\n\
+\\1...\\2\\\n\
+#else\\\n\
+\\1\\2\\\n\
+#endif/",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -2701,7 +2661,7 @@ tSCC zSunos_Matherr_DeclName[] =
  *  File name selection pattern
  */
 tSCC zSunos_Matherr_DeclList[] =
-        "|" "math.h" "|";
+  "|math.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -2715,8 +2675,8 @@ tSCC zSunos_Matherr_DeclList[] =
  */
 const char* apzSunos_Matherr_DeclPatch[] = { "sed",
     "-e", "/^struct exception/,$b",
-    "-e", "/matherr/i\\\n"
-       "struct exception;\n",
+    "-e", "/matherr/i\\\n\
+struct exception;\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -2729,7 +2689,7 @@ tSCC zSunos_StrlenName[] =
  *  File name selection pattern
  */
 tSCC zSunos_StrlenList[] =
-        "|" "strings.h" "|";
+  "|strings.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -2755,12 +2715,7 @@ tSCC zSystypesName[] =
  *  File name selection pattern
  */
 tSCC zSystypesList[] =
-        "|" "sys/types.h"
-        "|" "stdlib.h"
-        "|" "sys/stdtypes.h"
-        "|" "stddef.h"
-        "|" "memory.h"
-        "|" "unistd.h" "|";
+  "|sys/types.h|stdlib.h|sys/stdtypes.h|stddef.h|memory.h|unistd.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -2782,29 +2737,29 @@ tTestDesc aSystypesTests[] = {
  */
 const char* apzSystypesPatch[] = { "sed",
     "-e", "/^[ \t]*\\*[ \t]*typedef unsigned int size_t;/N",
-    "-e", "s/^\\([ \t]*\\*[ \t]*typedef unsigned int size_t;\\n[ \t]*\\*\\/\\)/\\1\\\n"
-       "#ifndef __SIZE_TYPE__\\\n"
-       "#define __SIZE_TYPE__ long unsigned int\\\n"
-       "#endif\\\n"
-       "typedef __SIZE_TYPE__ size_t;\\\n"
-       "/",
-    "-e", "/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]size_t/i\\\n"
-       "#ifndef __SIZE_TYPE__\\\n"
-       "#define __SIZE_TYPE__ long unsigned int\\\n"
-       "#endif\n",
+    "-e", "s/^\\([ \t]*\\*[ \t]*typedef unsigned int size_t;\\n[ \t]*\\*\\/\\)/\\1\\\n\
+#ifndef __SIZE_TYPE__\\\n\
+#define __SIZE_TYPE__ long unsigned int\\\n\
+#endif\\\n\
+typedef __SIZE_TYPE__ size_t;\\\n\
+/",
+    "-e", "/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]size_t/i\\\n\
+#ifndef __SIZE_TYPE__\\\n\
+#define __SIZE_TYPE__ long unsigned int\\\n\
+#endif\n",
     "-e", "s/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]size_t/typedef __SIZE_TYPE__ size_t/",
-    "-e", "/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]ptrdiff_t/i\\\n"
-       "#ifndef __PTRDIFF_TYPE__\\\n"
-       "#define __PTRDIFF_TYPE__ long int\\\n"
-       "#endif\n",
+    "-e", "/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]ptrdiff_t/i\\\n\
+#ifndef __PTRDIFF_TYPE__\\\n\
+#define __PTRDIFF_TYPE__ long int\\\n\
+#endif\n",
     "-e", "s/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]ptrdiff_t/typedef __PTRDIFF_TYPE__ ptrdiff_t/",
-    "-e", "/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]wchar_t/i\\\n"
-       "#ifndef __WCHAR_TYPE__\\\n"
-       "#define __WCHAR_TYPE__ int\\\n"
-       "#endif\\\n"
-       "#ifndef __cplusplus\n",
-    "-e", "/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]wchar_t/a\\\n"
-       "#endif\n",
+    "-e", "/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]wchar_t/i\\\n\
+#ifndef __WCHAR_TYPE__\\\n\
+#define __WCHAR_TYPE__ int\\\n\
+#endif\\\n\
+#ifndef __cplusplus\n",
+    "-e", "/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]wchar_t/a\\\n\
+#endif\n",
     "-e", "s/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]wchar_t/typedef __WCHAR_TYPE__ wchar_t/",
     (char*)NULL };
 
@@ -2818,7 +2773,7 @@ tSCC zSystypes_For_AixName[] =
  *  File name selection pattern
  */
 tSCC zSystypes_For_AixList[] =
-        "|" "sys/types.h" "|";
+  "|sys/types.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -2846,11 +2801,11 @@ tTestDesc aSystypes_For_AixTests[] = {
  *  Fix Command Arguments for Systypes_For_Aix
  */
 const char* apzSystypes_For_AixPatch[] = { "sed",
-    "-e", "/typedef[ \t][ \t]*[A-Za-z_][ \tA-Za-z_]*[ \t]size_t/i\\\n"
-       "#ifndef _GCC_SIZE_T\\\n"
-       "#define _GCC_SIZE_T\n",
-    "-e", "/typedef[ \t][ \t]*[A-Za-z_][ \tA-Za-z_]*[ \t]size_t/a\\\n"
-       "#endif\n",
+    "-e", "/typedef[ \t][ \t]*[A-Za-z_][ \tA-Za-z_]*[ \t]size_t/i\\\n\
+#ifndef _GCC_SIZE_T\\\n\
+#define _GCC_SIZE_T\n",
+    "-e", "/typedef[ \t][ \t]*[A-Za-z_][ \tA-Za-z_]*[ \t]size_t/a\\\n\
+#endif\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -2863,7 +2818,7 @@ tSCC zSysv68_StringName[] =
  *  File name selection pattern
  */
 tSCC zSysv68_StringList[] =
-        "|" "string.h" "|";
+  "|string.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -2882,9 +2837,9 @@ const char* apzSysv68_StringPatch[] = { "sed",
     "-e", "/^extern char$/N",
     "-e", "s/^extern char\\(\\n\t\\*memccpy(),\\)$/extern void\\1/",
     "-e", "/^\tstrncmp(),$/N",
-    "-e", "s/^\\(\tstrncmp()\\),\\n\\(\tstrlen(),\\)$/\\1;\\\n"
-       "extern unsigned int\\\n"
-       "\\2/",
+    "-e", "s/^\\(\tstrncmp()\\),\\n\\(\tstrlen(),\\)$/\\1;\\\n\
+extern unsigned int\\\n\
+\\2/",
     "-e", "/^extern int$/N",
     "-e", "s/^extern int\\(\\n\tstrlen(),\\)/extern size_t\\1/",
     (char*)NULL };
@@ -2899,7 +2854,7 @@ tSCC zSysz_Stdlib_For_SunName[] =
  *  File name selection pattern
  */
 tSCC zSysz_Stdlib_For_SunList[] =
-        "|" "stdlib.h" "|";
+  "|stdlib.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -2918,11 +2873,11 @@ const char* apzSysz_Stdlib_For_SunPatch[] = { "sed",
     "-e", "s/char[ \t]*\\*[ \t]*malloc/void \\*\tmalloc/g",
     "-e", "s/char[ \t]*\\*[ \t]*realloc/void \\*\trealloc/g",
     "-e", "s/int[ \t][ \t]*exit/void\texit/g",
-    "-e", "/typedef[ \ta-zA-Z_]*[ \t]size_t[ \t]*;/i\\\n"
-       "#ifndef _GCC_SIZE_T\\\n"
-       "#define _GCC_SIZE_T\n",
-    "-e", "/typedef[ \ta-zA-Z_]*[ \t]size_t[ \t]*;/a\\\n"
-       "#endif\n",
+    "-e", "/typedef[ \ta-zA-Z_]*[ \t]size_t[ \t]*;/i\\\n\
+#ifndef _GCC_SIZE_T\\\n\
+#define _GCC_SIZE_T\n",
+    "-e", "/typedef[ \ta-zA-Z_]*[ \t]size_t[ \t]*;/a\\\n\
+#endif\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -2935,7 +2890,7 @@ tSCC zSysz_Stdtypes_For_SunName[] =
  *  File name selection pattern
  */
 tSCC zSysz_Stdtypes_For_SunList[] =
-        "|" "sys/stdtypes.h" "|";
+  "|sys/stdtypes.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -2948,21 +2903,21 @@ tSCC zSysz_Stdtypes_For_SunList[] =
  *  Fix Command Arguments for Sysz_Stdtypes_For_Sun
  */
 const char* apzSysz_Stdtypes_For_SunPatch[] = { "sed",
-    "-e", "/[\t ]size_t.*;/i\\\n"
-       "#ifndef _GCC_SIZE_T\\\n"
-       "#define _GCC_SIZE_T\n",
-    "-e", "/[\t ]size_t.*;/a\\\n"
-       "#endif\n",
-    "-e", "/[\t ]ptrdiff_t.*;/i\\\n"
-       "#ifndef _GCC_PTRDIFF_T\\\n"
-       "#define _GCC_PTRDIFF_T\n",
-    "-e", "/[\t ]ptrdiff_t.*;/a\\\n"
-       "#endif\n",
-    "-e", "/[\t ]wchar_t.*;/i\\\n"
-       "#ifndef _GCC_WCHAR_T\\\n"
-       "#define _GCC_WCHAR_T\n",
-    "-e", "/[\t ]wchar_t.*;/a\\\n"
-       "#endif\n",
+    "-e", "/[\t ]size_t.*;/i\\\n\
+#ifndef _GCC_SIZE_T\\\n\
+#define _GCC_SIZE_T\n",
+    "-e", "/[\t ]size_t.*;/a\\\n\
+#endif\n",
+    "-e", "/[\t ]ptrdiff_t.*;/i\\\n\
+#ifndef _GCC_PTRDIFF_T\\\n\
+#define _GCC_PTRDIFF_T\n",
+    "-e", "/[\t ]ptrdiff_t.*;/a\\\n\
+#endif\n",
+    "-e", "/[\t ]wchar_t.*;/i\\\n\
+#ifndef _GCC_WCHAR_T\\\n\
+#define _GCC_WCHAR_T\n",
+    "-e", "/[\t ]wchar_t.*;/a\\\n\
+#endif\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -2975,7 +2930,7 @@ tSCC zTinfo_CplusplusName[] =
  *  File name selection pattern
  */
 tSCC zTinfo_CplusplusList[] =
-        "|" "tinfo.h" "|";
+  "|tinfo.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -3001,7 +2956,7 @@ tSCC zUltrix_Ansi_CompatName[] =
  *  File name selection pattern
  */
 tSCC zUltrix_Ansi_CompatList[] =
-        "|" "ansi_compat.h" "|";
+  "|ansi_compat.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -3022,8 +2977,8 @@ tTestDesc aUltrix_Ansi_CompatTests[] = {
  *  Fix Command Arguments for Ultrix_Ansi_Compat
  */
 const char* apzUltrix_Ansi_CompatPatch[] = { "sed",
-    "-e", "1i\\\n"
-       "/* This file intentionally left blank. */\n",
+    "-e", "1i\\\n\
+/* This file intentionally left blank. */\n",
     "-e", "1,$d",
     (char*)NULL };
 
@@ -3037,7 +2992,7 @@ tSCC zUltrix_Fix_FixprotoName[] =
  *  File name selection pattern
  */
 tSCC zUltrix_Fix_FixprotoList[] =
-        "|" "sys/utsname.h" "|";
+  "|sys/utsname.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -3058,8 +3013,8 @@ tTestDesc aUltrix_Fix_FixprotoTests[] = {
  *  Fix Command Arguments for Ultrix_Fix_Fixproto
  */
 const char* apzUltrix_Fix_FixprotoPatch[] = { "sed",
-    "-e", "/^[ \t]*extern[ \t]*int[ \t]*uname();$/i\\\n"
-       "struct utsname;\n",
+    "-e", "/^[ \t]*extern[ \t]*int[ \t]*uname();$/i\\\n\
+struct utsname;\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -3072,7 +3027,7 @@ tSCC zUltrix_Atof_ParamName[] =
  *  File name selection pattern
  */
 tSCC zUltrix_Atof_ParamList[] =
-        "|" "math.h" "|";
+  "|math.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -3102,7 +3057,7 @@ tSCC zUltrix_ConstName[] =
  *  File name selection pattern
  */
 tSCC zUltrix_ConstList[] =
-        "|" "stdio.h" "|";
+  "|stdio.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -3136,7 +3091,7 @@ tSCC zUltrix_IfdefName[] =
  *  File name selection pattern
  */
 tSCC zUltrix_IfdefList[] =
-        "|" "sys/file.h" "|";
+  "|sys/file.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -3170,7 +3125,7 @@ tSCC zUltrix_Nested_CmntName[] =
  *  File name selection pattern
  */
 tSCC zUltrix_Nested_CmntList[] =
-        "|" "rpc/svc.h" "|";
+  "|rpc/svc.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -3196,7 +3151,7 @@ tSCC zUltrix_StaticName[] =
  *  File name selection pattern
  */
 tSCC zUltrix_StaticList[] =
-        "|" "machine/cpu.h" "|";
+  "|machine/cpu.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -3259,8 +3214,8 @@ tTestDesc aUndefine_NullTests[] = {
  *  Fix Command Arguments for Undefine_Null
  */
 const char* apzUndefine_NullPatch[] = { "sed",
-    "-e", "/^#[ \t]*define[ \t][ \t]*NULL[ \t]/i\\\n"
-       "#undef NULL\n",
+    "-e", "/^#[ \t]*define[ \t][ \t]*NULL[ \t]/i\\\n\
+#undef NULL\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -3273,7 +3228,7 @@ tSCC zVa_I960_MacroName[] =
  *  File name selection pattern
  */
 tSCC zVa_I960_MacroList[] =
-        "|" "arch/i960/archI960.h" "|";
+  "|arch/i960/archI960.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -3310,17 +3265,7 @@ tSCC zVoid_NullName[] =
  *  File name selection pattern
  */
 tSCC zVoid_NullList[] =
-        "|" "curses.h"
-        "|" "dbm.h"
-        "|" "locale.h"
-        "|" "stdio.h"
-        "|" "stdlib.h"
-        "|" "string.h"
-        "|" "time.h"
-        "|" "unistd.h"
-        "|" "sys/dir.h"
-        "|" "sys/param.h"
-        "|" "sys/types.h" "|";
+  "|curses.h|dbm.h|locale.h|stdio.h|stdlib.h|string.h|time.h|unistd.h|sys/dir.h|sys/param.h|sys/types.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -3354,7 +3299,7 @@ tSCC zVxworks_Gcc_ProblemName[] =
  *  File name selection pattern
  */
 tSCC zVxworks_Gcc_ProblemList[] =
-        "|" "types/vxTypesBase.h" "|";
+  "|types/vxTypesBase.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -3376,21 +3321,21 @@ tTestDesc aVxworks_Gcc_ProblemTests[] = {
  */
 const char* apzVxworks_Gcc_ProblemPatch[] = { "sed",
     "-e", "s/#ifdef __GNUC_TYPEOF_FEATURE_BROKEN_USE_DEFAULT_UNTIL_FIXED__/#if 1/",
-    "-e", "/[ \t]size_t/i\\\n"
-       "#ifndef _GCC_SIZE_T\\\n"
-       "#define _GCC_SIZE_T\n",
-    "-e", "/[ \t]size_t/a\\\n"
-       "#endif\n",
-    "-e", "/[ \t]ptrdiff_t/i\\\n"
-       "#ifndef _GCC_PTRDIFF_T\\\n"
-       "#define _GCC_PTRDIFF_T\n",
-    "-e", "/[ \t]ptrdiff_t/a\\\n"
-       "#endif\n",
-    "-e", "/[ \t]wchar_t/i\\\n"
-       "#ifndef _GCC_WCHAR_T\\\n"
-       "#define _GCC_WCHAR_T\n",
-    "-e", "/[ \t]wchar_t/a\\\n"
-       "#endif\n",
+    "-e", "/[ \t]size_t/i\\\n\
+#ifndef _GCC_SIZE_T\\\n\
+#define _GCC_SIZE_T\n",
+    "-e", "/[ \t]size_t/a\\\n\
+#endif\n",
+    "-e", "/[ \t]ptrdiff_t/i\\\n\
+#ifndef _GCC_PTRDIFF_T\\\n\
+#define _GCC_PTRDIFF_T\n",
+    "-e", "/[ \t]ptrdiff_t/a\\\n\
+#endif\n",
+    "-e", "/[ \t]wchar_t/i\\\n\
+#ifndef _GCC_WCHAR_T\\\n\
+#define _GCC_WCHAR_T\n",
+    "-e", "/[ \t]wchar_t/a\\\n\
+#endif\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -3403,7 +3348,7 @@ tSCC zVxworks_Needs_VxtypesName[] =
  *  File name selection pattern
  */
 tSCC zVxworks_Needs_VxtypesList[] =
-        "|" "time.h" "|";
+  "|time.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -3437,7 +3382,7 @@ tSCC zVxworks_Needs_VxworksName[] =
  *  File name selection pattern
  */
 tSCC zVxworks_Needs_VxworksList[] =
-        "|" "sys/stat.h" "|";
+  "|sys/stat.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -3471,8 +3416,8 @@ tTestDesc aVxworks_Needs_VxworksTests[] = {
  *  Fix Command Arguments for Vxworks_Needs_Vxworks
  */
 const char* apzVxworks_Needs_VxworksPatch[] = { "sed",
-    "-e", "/#[ \t]define[ \t][ \t]*__INCstath/a\\\n"
-       "#include <types/vxTypesOld.h>\n",
+    "-e", "/#[ \t]define[ \t][ \t]*__INCstath/a\\\n\
+#include <types/vxTypesOld.h>\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -3485,7 +3430,7 @@ tSCC zVxworks_TimeName[] =
  *  File name selection pattern
  */
 tSCC zVxworks_TimeList[] =
-        "|" "time.h" "|";
+  "|time.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -3513,15 +3458,15 @@ tTestDesc aVxworks_TimeTests[] = {
  *  Fix Command Arguments for Vxworks_Time
  */
 const char* apzVxworks_TimePatch[] = { "sed",
-    "-e", "/VOIDFUNCPTR/i\\\n"
-       "#ifndef __gcc_VOIDFUNCPTR_defined\\\n"
-       "#ifdef __cplusplus\\\n"
-       "typedef void (*__gcc_VOIDFUNCPTR) (...);\\\n"
-       "#else\\\n"
-       "typedef void (*__gcc_VOIDFUNCPTR) ();\\\n"
-       "#endif\\\n"
-       "#define __gcc_VOIDFUNCPTR_defined\\\n"
-       "#endif\n",
+    "-e", "/VOIDFUNCPTR/i\\\n\
+#ifndef __gcc_VOIDFUNCPTR_defined\\\n\
+#ifdef __cplusplus\\\n\
+typedef void (*__gcc_VOIDFUNCPTR) (...);\\\n\
+#else\\\n\
+typedef void (*__gcc_VOIDFUNCPTR) ();\\\n\
+#endif\\\n\
+#define __gcc_VOIDFUNCPTR_defined\\\n\
+#endif\n",
     "-e", "s/VOIDFUNCPTR/__gcc_VOIDFUNCPTR/g",
     (char*)NULL };
 
@@ -3535,7 +3480,7 @@ tSCC zX11_ClassName[] =
  *  File name selection pattern
  */
 tSCC zX11_ClassList[] =
-        "|" "X11/ShellP.h" "|";
+  "|X11/ShellP.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -3556,12 +3501,12 @@ tTestDesc aX11_ClassTests[] = {
  *  Fix Command Arguments for X11_Class
  */
 const char* apzX11_ClassPatch[] = { "sed",
-    "-e", "/char \\*class;/i\\\n"
-       "#ifdef __cplusplus\\\n"
-       "\tchar *c_class;\\\n"
-       "#else\n",
-    "-e", "/char \\*class;/a\\\n"
-       "#endif\n",
+    "-e", "/char \\*class;/i\\\n\
+#ifdef __cplusplus\\\n\
+\tchar *c_class;\\\n\
+#else\n",
+    "-e", "/char \\*class;/a\\\n\
+#endif\n",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -3574,7 +3519,7 @@ tSCC zX11_Class_UsageName[] =
  *  File name selection pattern
  */
 tSCC zX11_Class_UsageList[] =
-        "|" "Xm/BaseClassI.h" "|";
+  "|Xm/BaseClassI.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -3608,7 +3553,7 @@ tSCC zX11_NewName[] =
  *  File name selection pattern
  */
 tSCC zX11_NewList[] =
-        "|" "Xm/Traversal.h" "|";
+  "|Xm/Traversal.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -3629,12 +3574,12 @@ tTestDesc aX11_NewTests[] = {
  *  Fix Command Arguments for X11_New
  */
 const char* apzX11_NewPatch[] = { "sed",
-    "-e", "/Widget\told, new;/i\\\n"
-       "#ifdef __cplusplus\\\n"
-       "\tWidget\told, c_new;\\\n"
-       "#else\n",
-    "-e", "/Widget\told, new;/a\\\n"
-       "#endif\n",
+    "-e", "/Widget\told, new;/i\\\n\
+#ifdef __cplusplus\\\n\
+\tWidget\told, c_new;\\\n\
+#else\n",
+    "-e", "/Widget\told, new;/a\\\n\
+#endif\n",
     "-e", "s/Widget new,/Widget c_new,/g",
     (char*)NULL };
 
@@ -3648,7 +3593,7 @@ tSCC zX11_SprintfName[] =
  *  File name selection pattern
  */
 tSCC zX11_SprintfList[] =
-        "|" "X11*/Xmu.h" "|";
+  "|X11*/Xmu.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -3661,9 +3606,9 @@ tSCC zX11_SprintfList[] =
  *  Fix Command Arguments for X11_Sprintf
  */
 const char* apzX11_SprintfPatch[] = { "sed",
-    "-e", "s,^extern char \\*\tsprintf();$,#ifndef __STDC__\\\n"
-       "extern char *\tsprintf();\\\n"
-       "#endif /* !defined __STDC__ */,",
+    "-e", "s,^extern char \\*\tsprintf();$,#ifndef __STDC__\\\n\
+extern char *\tsprintf();\\\n\
+#endif /* !defined __STDC__ */,",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -3676,7 +3621,7 @@ tSCC zZzz_Ki_IfaceName[] =
  *  File name selection pattern
  */
 tSCC zZzz_Ki_IfaceList[] =
-        "|" "sys/ki_iface.h" "|";
+  "|sys/ki_iface.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -3697,9 +3642,9 @@ tTestDesc aZzz_Ki_IfaceTests[] = {
  *  Fix Command Arguments for Zzz_Ki_Iface
  */
 const char* apzZzz_Ki_IfacePatch[] = { "sh", "-c",
-    "echo \"Removing incorrect fix to <$file>\" >&2\n"
-       "rm -f ${DESTDIR}/$file ${DESTDIR}/fixinc.tmp\n"
-       "cat > /dev/null",
+    "echo \"Removing incorrect fix to <$file>\" >&2\n\
+rm -f ${DESTDIR}/$file ${DESTDIR}/fixinc.tmp\n\
+cat > /dev/null",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -3712,7 +3657,7 @@ tSCC zZzz_KiName[] =
  *  File name selection pattern
  */
 tSCC zZzz_KiList[] =
-        "|" "sys/ki.h" "|";
+  "|sys/ki.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -3733,9 +3678,9 @@ tTestDesc aZzz_KiTests[] = {
  *  Fix Command Arguments for Zzz_Ki
  */
 const char* apzZzz_KiPatch[] = { "sh", "-c",
-    "echo \"Removing incorrect fix to <$file>\" >&2\n"
-       "rm -f ${DESTDIR}/$file ${DESTDIR}/fixinc.tmp\n"
-       "cat > /dev/null",
+    "echo \"Removing incorrect fix to <$file>\" >&2\n\
+rm -f ${DESTDIR}/$file ${DESTDIR}/fixinc.tmp\n\
+cat > /dev/null",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -3748,7 +3693,7 @@ tSCC zZzz_Ki_CallsName[] =
  *  File name selection pattern
  */
 tSCC zZzz_Ki_CallsList[] =
-        "|" "sys/ki_calls.h" "|";
+  "|sys/ki_calls.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -3769,9 +3714,9 @@ tTestDesc aZzz_Ki_CallsTests[] = {
  *  Fix Command Arguments for Zzz_Ki_Calls
  */
 const char* apzZzz_Ki_CallsPatch[] = { "sh", "-c",
-    "echo \"Removing incorrect fix to <$file>\" >&2\n"
-       "rm -f ${DESTDIR}/$file ${DESTDIR}/fixinc.tmp\n"
-       "cat > /dev/null",
+    "echo \"Removing incorrect fix to <$file>\" >&2\n\
+rm -f ${DESTDIR}/$file ${DESTDIR}/fixinc.tmp\n\
+cat > /dev/null",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -3784,7 +3729,7 @@ tSCC zZzz_Ki_DefsName[] =
  *  File name selection pattern
  */
 tSCC zZzz_Ki_DefsList[] =
-        "|" "sys/ki_defs.h" "|";
+  "|sys/ki_defs.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -3805,9 +3750,9 @@ tTestDesc aZzz_Ki_DefsTests[] = {
  *  Fix Command Arguments for Zzz_Ki_Defs
  */
 const char* apzZzz_Ki_DefsPatch[] = { "sh", "-c",
-    "echo \"Removing incorrect fix to <$file>\" >&2\n"
-       "rm -f ${DESTDIR}/$file ${DESTDIR}/fixinc.tmp\n"
-       "cat > /dev/null",
+    "echo \"Removing incorrect fix to <$file>\" >&2\n\
+rm -f ${DESTDIR}/$file ${DESTDIR}/fixinc.tmp\n\
+cat > /dev/null",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -3820,7 +3765,7 @@ tSCC zZzz_Bad_FixesName[] =
  *  File name selection pattern
  */
 tSCC zZzz_Bad_FixesList[] =
-        "|" "sundev/ipi_error.h" "|";
+  "|sundev/ipi_error.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -3833,9 +3778,9 @@ tSCC zZzz_Bad_FixesList[] =
  *  Fix Command Arguments for Zzz_Bad_Fixes
  */
 const char* apzZzz_Bad_FixesPatch[] = { "sh", "-c",
-    "echo \"Removing incorrect fix to <$file>\" >&2\n"
-       "rm -f ${DESTDIR}/$file ${DESTDIR}/fixinc.tmp\n"
-       "cat > /dev/null",
+    "echo \"Removing incorrect fix to <$file>\" >&2\n\
+rm -f ${DESTDIR}/$file ${DESTDIR}/fixinc.tmp\n\
+cat > /dev/null",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -3848,7 +3793,7 @@ tSCC zZzz_TimeName[] =
  *  File name selection pattern
  */
 tSCC zZzz_TimeList[] =
-        "|" "sys/time.h" "|";
+  "|sys/time.h|";
 /*
  *  Machine/OS name selection pattern
  */
@@ -3869,9 +3814,9 @@ tTestDesc aZzz_TimeTests[] = {
  *  Fix Command Arguments for Zzz_Time
  */
 const char* apzZzz_TimePatch[] = { "sh", "-c",
-    "echo \"Removing incorrect fix to <$file>\" >&2\n"
-       "rm -f ${DESTDIR}/$file ${DESTDIR}/fixinc.tmp\n"
-       "cat > /dev/null",
+    "echo \"Removing incorrect fix to <$file>\" >&2\n\
+rm -f ${DESTDIR}/$file ${DESTDIR}/fixinc.tmp\n\
+cat > /dev/null",
     (char*)NULL };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -4103,7 +4048,7 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
 
   {  zM88k_Multi_InclName,    zM88k_Multi_InclList,
      apzM88k_Multi_InclMachs, (regex_t*)NULL,
-     M88K_MULTI_INCL_TEST_CT, FD_MACH_ONLY,
+     M88K_MULTI_INCL_TEST_CT, FD_MACH_ONLY | FD_SHELL_SCRIPT,
      aM88k_Multi_InclTests,   apzM88k_Multi_InclPatch },
 
   {  zMachine_NameName,    zMachine_NameList,
@@ -4118,7 +4063,7 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
 
   {  zMath_Gcc_IfndefsName,    zMath_Gcc_IfndefsList,
      apzMath_Gcc_IfndefsMachs, (regex_t*)NULL,
-     MATH_GCC_IFNDEFS_TEST_CT, FD_MACH_ONLY,
+     MATH_GCC_IFNDEFS_TEST_CT, FD_MACH_ONLY | FD_SHELL_SCRIPT,
      aMath_Gcc_IfndefsTests,   apzMath_Gcc_IfndefsPatch },
 
   {  zNested_CommentName,    zNested_CommentList,
@@ -4198,7 +4143,7 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
 
   {  zStdio_Va_ListName,    zStdio_Va_ListList,
      apzStdio_Va_ListMachs, (regex_t*)NULL,
-     STDIO_VA_LIST_TEST_CT, FD_MACH_ONLY,
+     STDIO_VA_LIST_TEST_CT, FD_MACH_ONLY | FD_SHELL_SCRIPT,
      aStdio_Va_ListTests,   apzStdio_Va_ListPatch },
 
   {  zSun_Bogus_IfdefName,    zSun_Bogus_IfdefList,
@@ -4373,31 +4318,31 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
 
   {  zZzz_Ki_IfaceName,    zZzz_Ki_IfaceList,
      apzZzz_Ki_IfaceMachs, (regex_t*)NULL,
-     ZZZ_KI_IFACE_TEST_CT, FD_MACH_ONLY,
+     ZZZ_KI_IFACE_TEST_CT, FD_MACH_ONLY | FD_SHELL_SCRIPT,
      aZzz_Ki_IfaceTests,   apzZzz_Ki_IfacePatch },
 
   {  zZzz_KiName,    zZzz_KiList,
      apzZzz_KiMachs, (regex_t*)NULL,
-     ZZZ_KI_TEST_CT, FD_MACH_ONLY,
+     ZZZ_KI_TEST_CT, FD_MACH_ONLY | FD_SHELL_SCRIPT,
      aZzz_KiTests,   apzZzz_KiPatch },
 
   {  zZzz_Ki_CallsName,    zZzz_Ki_CallsList,
      apzZzz_Ki_CallsMachs, (regex_t*)NULL,
-     ZZZ_KI_CALLS_TEST_CT, FD_MACH_ONLY,
+     ZZZ_KI_CALLS_TEST_CT, FD_MACH_ONLY | FD_SHELL_SCRIPT,
      aZzz_Ki_CallsTests,   apzZzz_Ki_CallsPatch },
 
   {  zZzz_Ki_DefsName,    zZzz_Ki_DefsList,
      apzZzz_Ki_DefsMachs, (regex_t*)NULL,
-     ZZZ_KI_DEFS_TEST_CT, FD_MACH_ONLY,
+     ZZZ_KI_DEFS_TEST_CT, FD_MACH_ONLY | FD_SHELL_SCRIPT,
      aZzz_Ki_DefsTests,   apzZzz_Ki_DefsPatch },
 
   {  zZzz_Bad_FixesName,    zZzz_Bad_FixesList,
      apzZzz_Bad_FixesMachs, (regex_t*)NULL,
-     ZZZ_BAD_FIXES_TEST_CT, FD_MACH_ONLY,
+     ZZZ_BAD_FIXES_TEST_CT, FD_MACH_ONLY | FD_SHELL_SCRIPT,
      aZzz_Bad_FixesTests,   apzZzz_Bad_FixesPatch },
 
   {  zZzz_TimeName,    zZzz_TimeList,
      apzZzz_TimeMachs, (regex_t*)NULL,
-     ZZZ_TIME_TEST_CT, FD_MACH_ONLY,
+     ZZZ_TIME_TEST_CT, FD_MACH_ONLY | FD_SHELL_SCRIPT,
      aZzz_TimeTests,   apzZzz_TimePatch }
 };
diff --git a/gnu/egcs/gcc/fixinc/gnu-regex.c b/gnu/egcs/gcc/fixinc/gnu-regex.c
index 84db70f7952..b24845ba431 100644
--- a/gnu/egcs/gcc/fixinc/gnu-regex.c
+++ b/gnu/egcs/gcc/fixinc/gnu-regex.c
@@ -80,6 +80,16 @@
 
 #else  /* not emacs */
 
+# include "auto-host.h"
+
+# if !defined(const) && !defined(HAVE_CONST)
+#  define const
+# endif
+
+# if !defined(volatile) && !defined(HAVE_VOLATILE)
+#  define volatile
+# endif
+
 /* If we are not linking with Emacs proper,
    we can't use the relocating allocator
    even if config.h says that we can.  */
diff --git a/gnu/egcs/gcc/fixinc/inclhack.def b/gnu/egcs/gcc/fixinc/inclhack.def
index c8dbeda69b5..0695368e232 100644
--- a/gnu/egcs/gcc/fixinc/inclhack.def
+++ b/gnu/egcs/gcc/fixinc/inclhack.def
@@ -136,6 +136,18 @@ fix = {
 
     sed = "/^[ ]*typedef[ \t][ \t]*unsigned char[ \t][ \t]*bool[ \t]*;/a\\\n"
                 "#endif\n";
+
+    sed = "/^typedef[ \t][ \t]*int[ \t][ \t]*bool[ \t]*;/i\\\n"
+                "#ifndef __cplusplus\n";
+
+    sed = "/^typedef[ \t][ \t]*int[ \t][ \t]*bool[ \t]*;/a\\\n"
+                "#endif\n";
+
+    sed = "/^[ ]*typedef[ \t][ \t]*unsigned int[ \t][ \t]*bool[ \t]*;/i\\\n"
+                "#ifndef __cplusplus\n";
+
+    sed = "/^[ ]*typedef[ \t][ \t]*unsigned int[ \t][ \t]*bool[ \t]*;/a\\\n"
+                "#endif\n";
 };
 
 
@@ -567,7 +579,8 @@ fix = {
 fix = {
     hackname = io_def_quotes;
     select = "[ \t]*[ \t](_|DES)IO[A-Z]*[ \t]*\\( *[^,']";
-    sed = "s/\\([ \t]*[ \t](_|DES)IO[A-Z]*[ \t]*(\\)\\([^,']\\),/\\1'\\2',/";
+    sed = "s/\\([ \t]*[ \t]_IO[A-Z]*[ \t]*(\\)\\([^,']\\),/\\1'\\2',/";
+    sed = "s/\\([ \t]*[ \t]DESIO[A-Z]*[ \t]*(\\)\\([^,']\\),/\\1'\\2',/";
     sed = "/#[ \t]*define[ \t]*[ \t]_IO/"       "s/'\\([cgxtf]\\)'/\\1/g";
     sed = "/#[ \t]*define[ \t]*[ \t]DESIOC/"    's/\'\([cdgx]\)\'/\1/g';
 };
@@ -724,6 +737,7 @@ fix = {
 fix = {
     hackname = limits_ifndefs;
     files  = "limits.h";
+    files  = "sys/limits.h";
     bypass = "ifndef[ \t]+FLT_MIN";
 
     sed  = "/[ \t]FLT_MIN[ \t]/i\\\n#ifndef FLT_MIN\n";
@@ -1040,8 +1054,8 @@ fix = {
     "\tthen sed -e '/define[ \t]HUGE_VAL[ \t]DBL_MAX/s/DBL_MAX/$dbl_max_def/'"
     "\n\telse cat ; fi |\n"
 
-    "\tsed -e'/define[ \t]HUGE_VAL[ \t]/i\\\n#ifndef HUGE_VAL\n' "
-          "-e'/define[ \t]HUGE_VAL[ \t]/a\\\n#endif\n'";
+    "\tsed -e '/define[ \t]HUGE_VAL[ \t]/i\\\n#ifndef HUGE_VAL\n' "
+          "-e '/define[ \t]HUGE_VAL[ \t]/a\\\n#endif\n'";
 };
 
 
diff --git a/gnu/egcs/gcc/fixinc/inclhack.sh b/gnu/egcs/gcc/fixinc/inclhack.sh
index 153161bfad9..fda21b63820 100644
--- a/gnu/egcs/gcc/fixinc/inclhack.sh
+++ b/gnu/egcs/gcc/fixinc/inclhack.sh
@@ -563,6 +563,18 @@ struct rusage;
         -e '/^[ ]*typedef[ 	][ 	]*unsigned char[ 	][ 	]*bool[ 	]*;/a\
 #endif
 ' \
+        -e '/^typedef[ 	][ 	]*int[ 	][ 	]*bool[ 	]*;/i\
+#ifndef __cplusplus
+' \
+        -e '/^typedef[ 	][ 	]*int[ 	][ 	]*bool[ 	]*;/a\
+#endif
+' \
+        -e '/^[ ]*typedef[ 	][ 	]*unsigned int[ 	][ 	]*bool[ 	]*;/i\
+#ifndef __cplusplus
+' \
+        -e '/^[ ]*typedef[ 	][ 	]*unsigned int[ 	][ 	]*bool[ 	]*;/a\
+#endif
+' \
           < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
@@ -1056,7 +1068,8 @@ extern "C" {\
     then infile=${file}
     else infile=${DESTFILE} ; fi 
 
-    sed -e 's/\([ 	]*[ 	](_|DES)IO[A-Z]*[ 	]*(\)\([^,'\'']\),/\1'\''\2'\'',/' \
+    sed -e 's/\([ 	]*[ 	]_IO[A-Z]*[ 	]*(\)\([^,'\'']\),/\1'\''\2'\'',/' \
+        -e 's/\([ 	]*[ 	]DESIO[A-Z]*[ 	]*(\)\([^,'\'']\),/\1'\''\2'\'',/' \
         -e '/#[ 	]*define[ 	]*[ 	]_IO/s/'\''\([cgxtf]\)'\''/\1/g' \
         -e '/#[ 	]*define[ 	]*[ 	]DESIOC/s/'\''\([cdgx]\)'\''/\1/g' \
           < $infile > ${DESTDIR}/fixinc.tmp
@@ -1274,7 +1287,8 @@ struct __file_s;
     #
     # Fix  40:  Limits_Ifndefs
     #
-    case "${file}" in ./limits.h )
+    case "${file}" in ./limits.h | \
+	./sys/limits.h )
     if ( test -z "`egrep 'ifndef[ 	]+FLT_MIN' ${file}`"
        ) > /dev/null 2>&1 ; then
     fixlist="${fixlist}
@@ -1572,9 +1586,9 @@ s/\\+++fixinc_eol+++/\\/g
 	   ) > /dev/null 2>&1
 	then sed -e '/define[ 	]HUGE_VAL[ 	]DBL_MAX/s/DBL_MAX/$dbl_max_def/'
 	else cat ; fi |
-	sed -e'/define[ 	]HUGE_VAL[ 	]/i\
+	sed -e '/define[ 	]HUGE_VAL[ 	]/i\
 #ifndef HUGE_VAL
-' -e'/define[ 	]HUGE_VAL[ 	]/a\
+' -e '/define[ 	]HUGE_VAL[ 	]/a\
 #endif
 ' ) < $infile > ${DESTDIR}/fixinc.tmp
 
@@ -3093,7 +3107,7 @@ echo 'Removing unneeded directories:'
 cd $LIB
 all_dirs=`find . -type d -print | sort -r`
 for file in $all_dirs; do
-  rmdir $LIB/$file > /dev/null 2>&1 | :
+  rmdir $LIB/$file > /dev/null 2>&1
 done
 
 # # # # # # # # # # # # # # # # # # # # #
diff --git a/gnu/egcs/gcc/fixinc/inclhack.tpl b/gnu/egcs/gcc/fixinc/inclhack.tpl
index c2b3b513f30..f5153bf0892 100644
--- a/gnu/egcs/gcc/fixinc/inclhack.tpl
+++ b/gnu/egcs/gcc/fixinc/inclhack.tpl
@@ -405,7 +405,7 @@ echo 'Removing unneeded directories:'
 cd $LIB
 all_dirs=`find . -type d -print | sort -r`
 for file in $all_dirs; do
-  rmdir $LIB/$file > /dev/null 2>&1 | :
+  rmdir $LIB/$file > /dev/null 2>&1
 done
 
 # # # # # # # # # # # # # # # # # # # # #
diff --git a/gnu/egcs/gcc/fixinc/procopen.c b/gnu/egcs/gcc/fixinc/procopen.c
index 28004eed8a7..086a21e18e4 100644
--- a/gnu/egcs/gcc/fixinc/procopen.c
+++ b/gnu/egcs/gcc/fixinc/procopen.c
@@ -46,17 +46,8 @@
  * If you do not wish that, delete this exception notice.
  */
 #include "auto-host.h"
-
-#include <sys/types.h>
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#include <errno.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <sys/param.h>
+#include "gansidecl.h"
+#include "system.h"
 
 #include "server.h"
 
@@ -104,10 +95,12 @@ chain_open (stdin_fd, pp_args, p_child)
      t_pchar *pp_args;
      pid_t *p_child;
 {
-  t_fd_pair stdout_pair = {-1, -1};
+  t_fd_pair stdout_pair;
   pid_t ch_id;
   char *pz_cmd;
 
+  stdout_pair.read_fd = stdout_pair.write_fd = -1;
+
   /*
    *  Create a pipe it will be the child process' stdout,
    *  and the parent will read from it.
diff --git a/gnu/egcs/gcc/fixinc/server.c b/gnu/egcs/gcc/fixinc/server.c
index e803e0a29ce..40662c46572 100644
--- a/gnu/egcs/gcc/fixinc/server.c
+++ b/gnu/egcs/gcc/fixinc/server.c
@@ -46,17 +46,9 @@
  * If you do not wish that, delete this exception notice.
  */
 #include "auto-host.h"
-
-#include <sys/types.h>
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#include <errno.h>
+#include "gansidecl.h"
+#include "system.h"
 #include <signal.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <sys/param.h>
 
 #include "server.h"
 
@@ -86,6 +78,10 @@
 #define NUL '\0'
 #endif
 
+#if !defined(volatile) && !defined(HAVE_VOLATILE)
+# define volatile
+#endif
+
 STATIC volatile bool read_pipe_timeout;
 
 static t_pchar def_args[] =
diff --git a/gnu/egcs/gcc/objc/lang-specs.h b/gnu/egcs/gcc/objc/lang-specs.h
index d76dee8c3eb..41dc097b502 100644
--- a/gnu/egcs/gcc/objc/lang-specs.h
+++ b/gnu/egcs/gcc/objc/lang-specs.h
@@ -27,7 +27,7 @@ Boston, MA 02111-1307, USA.  */
    {"%{E|M|MM:cpp -lang-objc %{nostdinc*} %{C} %{v} %{A*} %{I*} %{P} %{$} %I\
 	%{C:%{!E:%eGNU C does not support -C without using -E}}\
 	%{M} %{MM} %{MD:-MD %b.d} %{MMD:-MMD %b.d} %{MG}\
-        -D__OBJC__ -D__GNUC__=%v1 -D__GNUC_MINOR__=%v2\
+        -D__OBJC__ %{!no-gcc:-D__GNUC__=%v1 -D__GNUC_MINOR__=%v2}\
 	%{ansi:-trigraphs -D__STRICT_ANSI__}\
 	%{!undef:%{!ansi:%p} %P} %{trigraphs}\
         %c %{Os:-D__OPTIMIZE_SIZE__} %{O*:%{!O0:-D__OPTIMIZE__}}\
@@ -40,7 +40,7 @@ Boston, MA 02111-1307, USA.  */
     "%{!M:%{!MM:%{!E:cc1obj %i %1 \
 		   %{nostdinc*} %{A*} %{I*} %{P} %I\
                    %{MD:-MD %b.d} %{MMD:-MMD %b.d} %{MG}\
-		   -D__OBJC__ -D__GNUC__=%v1 -D__GNUC_MINOR__=%v2\
+		   -D__OBJC__ %{!no-gcc:-D__GNUC__=%v1 -D__GNUC_MINOR__=%v2}\
 		   %{!undef:%{!ansi:%p} %P} %{trigraphs}\
 		   %c %{Os:-D__OPTIMIZE_SIZE__} %{O*:%{!O0:-D__OPTIMIZE__}}\
 		   %{ffast-math:-D__FAST_MATH__}\
@@ -58,7 +58,7 @@ Boston, MA 02111-1307, USA.  */
    {"cpp -lang-objc %{nostdinc*} %{C} %{v} %{A*} %{I*} %{P} %{$} %I\
 	%{C:%{!E:%eGNU C does not support -C without using -E}}\
 	%{M} %{MM} %{MD:-MD %b.d} %{MMD:-MMD %b.d} %{MG}\
-        -D__OBJC__ -D__GNUC__=%v1 -D__GNUC_MINOR__=%v2\
+        -D__OBJC__ %{!no-gcc:-D__GNUC__=%v1 -D__GNUC_MINOR__=%v2}\
 	 %{ansi:-trigraphs -D__STRICT_ANSI__}\
 	%{!undef:%{!ansi:%p} %P} %{trigraphs}\
         %c %{Os:-D__OPTIMIZE_SIZE__} %{O*:%{!O0:-D__OPTIMIZE__}}\
diff --git a/gnu/egcs/gcc/testsuite/ChangeLog b/gnu/egcs/gcc/testsuite/ChangeLog
index e87f1843458..b37ee29cc0a 100644
--- a/gnu/egcs/gcc/testsuite/ChangeLog
+++ b/gnu/egcs/gcc/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+1999-06-05  Craig Burley  <craig@jcb-sc.com>
+
+	* g77.f-torture/compile/19990502-0.f: Replace with new,
+	shorter, test that still fails after recent changes.
+
+Wed May 19 02:56:18 1999  Raja R Harinath <harinath@cs.umn.edu>
+
+	* gcc.c-torture/compile/990519-1.c: New test.
+
 1999-05-17  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
 
 	* gcc.c-torture/compile/990517-1.c: New test.