*** gcc-old/gcc-2.95.3/gcc/p/gpc.c	Tue Feb 27 04:09:54 2001
--- gcc-2.95.3/gcc/p/gpc.c	Wed Apr 11 22:49:24 2001
***************
*** 709,714 ****
--- 709,848 ----
    {".c", {"@c"}},
    {"@c",
     {
+ #ifdef GCC_2_95_3    /* use cpp0 */
+ #if USE_CPPLIB
+      "%{E|M|MM:cpp0 -lang-c %{ansi:-std=c89} %{std*} %{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}\
+         %{!no-gcc:-D__GNUC__=%v1 -D__GNUC_MINOR__=%v2}\
+         %{ansi|std=*:%{!std=gnu*:-trigraphs -D__STRICT_ANSI__}}\
+         %{!undef:%{!ansi:%{!std=*:%p}%{std=gnu*:%p}} %P} %{trigraphs}\
+         %c %{Os:-D__OPTIMIZE_SIZE__} %{O*:%{!O0:-D__OPTIMIZE__}}\
+         %{ffast-math:-D__FAST_MATH__}\
+         %{traditional} %{ftraditional:-traditional}\
+         %{traditional-cpp:-traditional}\
+         %{fleading-underscore} %{fno-leading-underscore}\
+         %{g*} %{W*} %{w} %{pedantic*} %{H} %{d*} %C %{D*} %{U*} %{i*} %Z\
+         %i %{E:%W{o*}}%{M:%W{o*}}%{MM:%W{o*}}\n}\
+       %{!E:%{!M:%{!MM:cc1 %i %1 \
+                   %{std*} %{nostdinc*} %{A*} %{I*} %I\
+                   %{!Q:-quiet} -dumpbase %b.c %{d*} %{m*} %{a*}\
+                   %{MD:-MD %b.d} %{MMD:-MMD %b.d} %{MG}\
+                   %{!no-gcc:-D__GNUC__=%v1 -D__GNUC_MINOR__=%v2}\
+                   %{ansi|std=*:%{!std=gnu*:-trigraphs -D__STRICT_ANSI__}}\
+                   %{!undef:%{!ansi:%{!std=*:%p}%{std=gnu*:%p}} %P} %{trigraphs}\
+                   %c %{Os:-D__OPTIMIZE_SIZE__} %{O*:%{!O0:-D__OPTIMIZE__}}\
+                   %{ffast-math:-D__FAST_MATH__}\
+                   %{H} %C %{D*} %{U*} %{i*} %Z\
+                   %{ftraditional:-traditional}\
+                   %{traditional-cpp:-traditional}\
+                   %{traditional} %{v:-version} %{pg:-p} %{p} %{f*}\
+                   %{aux-info*} %{Qn:-fno-ident}\
+                   %{--help:--help}\
+                   %{g*} %{O*} %{W*} %{w} %{pedantic*}\
+                   %{pg:%{fomit-frame-pointer:%e-pg and -fomit-frame-pointer are incompatible}}\
+                   %{S:%W{o*}%{!o*:-o %b.s}}%{!S:-o %{|!pipe:%g.s}} |\n\
+                   %{!S:as %a %Y\
+                      %{c:%W{o*}%{!o*:-o %w%b%O}}%{!c:-o %d%w%u%O}\
+                      %{!pipe:%g.s} %A\n }}}}"
+ #else /* ! USE_CPPLIB */
+     "cpp0 -lang-c %{ansi:-std=c89} %{std*} %{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}\
+         %{!no-gcc:-D__GNUC__=%v1 -D__GNUC_MINOR__=%v2}\
+         %{ansi|std=*:%{!std=gnu*:-trigraphs -D__STRICT_ANSI__}}\
+         %{!undef:%{!ansi:%{!std=*:%p}%{std=gnu*:%p}} %P} %{trigraphs}\
+         %c %{Os:-D__OPTIMIZE_SIZE__} %{O*:%{!O0:-D__OPTIMIZE__}}\
+         %{ffast-math:-D__FAST_MATH__}\
+         %{traditional} %{ftraditional:-traditional}\
+         %{traditional-cpp:-traditional}\
+         %{fleading-underscore} %{fno-leading-underscore}\
+         %{g*} %{W*} %{w} %{pedantic*} %{H} %{d*} %C %{D*} %{U*} %{i*} %Z\
+         %i %{!M:%{!MM:%{!E:%{!pipe:%g.i}}}}%{E:%W{o*}}%{M:%W{o*}}%{MM:%W{o*}} |\n",
+    "%{!M:%{!MM:%{!E:cc1 %{!pipe:%g.i} %1 \
+                    %{!Q:-quiet} -dumpbase %b.c %{d*} %{m*} %{a*}\
+                    %{g*} %{O*} %{W*} %{w} %{pedantic*} %{std*}\
+                    %{traditional} %{v:-version} %{pg:-p} %{p} %{f*}\
+                    %{aux-info*} %{Qn:-fno-ident}\
+                    %{--help:--help} \
+                    %{pg:%{fomit-frame-pointer:%e-pg and -fomit-frame-pointer are incompatible}}\
+                    %{S:%W{o*}%{!o*:-o %b.s}}%{!S:-o %{|!pipe:%g.s}} |\n\
+               %{!S:as %a %Y\
+                       %{c:%W{o*}%{!o*:-o %w%b%O}}%{!c:-o %d%w%u%O}\
+                       %{!pipe:%g.s} %A\n }}}}"
+ #endif /* ! USE_CPPLIB */
+   }},
+   {"-",
+    {"%{E:cpp0 -lang-c %{ansi:-std=c89} %{std*} %{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}\
+         %{!no-gcc:-D__GNUC__=%v1 -D__GNUC_MINOR__=%v2}\
+         %{ansi|std=*:%{!std=gnu*:-trigraphs -D__STRICT_ANSI__}}\
+         %{!undef:%{!ansi:%{!std=*:%p}%{std=gnu*:%p}} %P} %{trigraphs}\
+         %c %{Os:-D__OPTIMIZE_SIZE__} %{O*:%{!O0:-D__OPTIMIZE__}}\
+         %{ffast-math:-D__FAST_MATH__}\
+         %{traditional} %{ftraditional:-traditional}\
+         %{traditional-cpp:-traditional}\
+         %{fleading-underscore} %{fno-leading-underscore}\
+         %{g*} %{W*} %{w} %{pedantic*} %{H} %{d*} %C %{D*} %{U*} %{i*} %Z\
+         %i %W{o*}}\
+     %{!E:%e-E required when input is from standard input}"}},
+   {".h", {"@c-header"}},
+   {"@c-header",
+    {"%{!E:%eCompilation of header file requested} \
+    cpp0 %{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}\
+         %{!no-gcc:-D__GNUC__=%v1 -D__GNUC_MINOR__=%v2}\
+         %{std=*:%{!std=gnu*:-trigraphs -D__STRICT_ANSI__}}\
+         %{!undef:%{!std=*:%p}%{std=gnu*:%p} %P} %{trigraphs}\
+         %c %{Os:-D__OPTIMIZE_SIZE__} %{O*:%{!O0:-D__OPTIMIZE__}}\
+         %{ffast-math:-D__FAST_MATH__}\
+         %{traditional} %{ftraditional:-traditional}\
+         %{traditional-cpp:-traditional}\
+         %{fleading-underscore} %{fno-leading-underscore}\
+         %{g*} %{W*} %{w} %{pedantic*} %{H} %{d*} %C %{D*} %{U*} %{i*} %Z\
+         %i %W{o*}"}},
+   {".i", {"@cpp-output"}},
+   {"@cpp-output",
+    {"%{!M:%{!MM:%{!E:cc1 %i %1 %{!Q:-quiet} %{d*} %{m*} %{a*}\
+                         %{g*} %{O*} %{W*} %{w} %{pedantic*} %{std*}\
+                         %{traditional} %{v:-version} %{pg:-p} %{p} %{f*}\
+                         %{aux-info*} %{Qn:-fno-ident}\
+                         %{pg:%{fomit-frame-pointer:%e-pg and -fomit-frame-pointer are incompatible}}\
+                         %{S:%W{o*}%{!o*:-o %b.s}}%{!S:-o %{|!pipe:%g.s}} |\n\
+                      %{!S:as %a %Y\
+                              %{c:%W{o*}%{!o*:-o %w%b%O}}%{!c:-o %d%w%u%O}\
+                              %{!pipe:%g.s} %A\n }}}}"}},
+   {".s", {"@assembler"}},
+   {"@assembler",
+    {"%{!M:%{!MM:%{!E:%{!S:as %a %Y\
+                             %{c:%W{o*}%{!o*:-o %w%b%O}}%{!c:-o %d%w%u%O}\
+                             %i %A\n }}}}"}},
+   {".S", {"@assembler-with-cpp"}},
+   {"@assembler-with-cpp",
+    {"cpp0 -lang-asm %{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} %{trigraphs}\
+         -$ %{!undef:%p %P} -D__ASSEMBLER__ \
+         %c %{Os:-D__OPTIMIZE_SIZE__} %{O*:%{!O0:-D__OPTIMIZE__}}\
+         %{ffast-math:-D__FAST_MATH__}\
+         %{traditional} %{ftraditional:-traditional}\
+         %{traditional-cpp:-traditional}\
+         %{fleading-underscore} %{fno-leading-underscore}\
+         %{g*} %{W*} %{w} %{pedantic*} %{H} %{d*} %C %{D*} %{U*} %{i*} %Z\
+         %i %{!M:%{!MM:%{!E:%{!pipe:%g.s}}}}%{E:%W{o*}}%{M:%W{o*}}%{MM:%W{o*}} |\n",
+     "%{!M:%{!MM:%{!E:%{!S:as %a %Y\
+                     %{c:%W{o*}%{!o*:-o %w%b%O}}%{!c:-o %d%w%u%O}\
+                     %{!pipe:%g.s} %A\n }}}}"}},
+ #include "specs.h"
+   /* Mark end of table */
+   {0, {0}}
+ };
+ #else   /* not GCC_2_95_3 */
  #if USE_CPPLIB
       "%{E|M|MM:cpp -lang-c %{ansi:-std=c89} %{std*} %{nostdinc*}\
          %{C} %{v} %{A*} %{I*} %{P} %{$} %I\
***************
*** 841,848 ****
    /* Mark end of table */
    {0, {0}}
  };
! 
! #else  /* not EGCS95 */
  
  static struct compiler default_compilers[] =
  {
--- 975,982 ----
    /* Mark end of table */
    {0, {0}}
  };
! #endif   /* not GCC_2_95_3 */
! #else    /* not EGCS95 */
  
  static struct compiler default_compilers[] =
  {
***************
*** 1607,1612 ****
--- 1741,1750 ----
  
  /* This is the list of suffixes and codes (%g/%u/%U) and the associated
     temp file.  Used only if MKTEMP_EACH_FILE.  */
+  
+ #ifdef GCC_2_95_3
+ #define MKTEMP_EACH_FILE
+ #endif
  
  #ifdef MKTEMP_EACH_FILE
  static struct temp_name {