This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

[fixinc] c_asm.h fix and incomplete use of fixinc.tmp in fixincl.sh


Hi!

The sed commands in the recently installed fix for c_asm.h are
incorrect.  Furthermore, the shell-script uses ${DESTNAME}. and
FIXINC.tmp for temporaries, instead of the new fixinc.tmp.  This patch 
is supposed to fix these two problems.  Ok to install?

-- 
Alexandre Oliva http://www.dcc.unicamp.br/~oliva IC-Unicamp, Brasil
{oliva,Alexandre.Oliva}@dcc.unicamp.br  aoliva@{acm.org,computer.org}
oliva@{gnu.org,kaffe.org,{egcs,sourceware}.cygnus.com,samba.org}
*** E-mail about software projects will be forwarded to mailing lists
Index: gcc/ChangeLog
from  Alexandre Oliva  <oliva@dcc.unicamp.br>
	
	* fixinc/inclhack.def: fix c_asm.h fix
	* fixinc/hackshell.tpl: complete transition to fixinc.tmp
	
Index: gcc/fixinc/hackshell.tpl
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/fixinc/hackshell.tpl,v
retrieving revision 1.4
diff -u -r1.4 hackshell.tpl
--- gcc/fixinc/hackshell.tpl	1999/03/31 11:51:28	1.4
+++ gcc/fixinc/hackshell.tpl	1999/03/31 21:42:35
@@ -114,11 +114,11 @@
     sed [=
         _FOR sed =]-e [=sed _shrstr=] \
         [=
-        /sed=]  < $infile > ${DESTFILE}.[=
+        /sed=]  < $infile > ${DESTDIR}/fixinc.tmp[=
 
 
     _ELIF shell _exist =]
-    ( [=shell=] ) < $infile > ${DESTDIR}/FIXINC.tmp
+    ( [=shell=] ) < $infile > ${DESTDIR}/fixinc.tmp
 
     #  Shell scripts have the potential of removing the output
     #  We interpret that to mean the file is not to be altered
Index: gcc/fixinc/inclhack.def
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/fixinc/inclhack.def,v
retrieving revision 1.5
diff -u -r1.5 inclhack.def
--- gcc/fixinc/inclhack.def	1999/03/31 12:02:19	1.5
+++ gcc/fixinc/inclhack.def	1999/03/31 21:42:35
@@ -238,8 +238,8 @@
 fix = {
     hackname = dec_intern_asm;
     files    = c_asm.h;
-    sed = "/^[ \t]*float[ \t]*fasm/i\n#ifdef __DECC\n";
-    sed = "/^[ \t]*#[ \t]*pragma[ \t]*intrinsic([ \t]*dasm/a\n"
+    sed = "/^[ \t]*float[ \t]*fasm/i\\\n#ifdef __DECC\n";
+    sed = "/^[ \t]*#[ \t]*pragma[ \t]*intrinsic([ \t]*dasm/a\\\n"
           "#endif\n";
 };
 
Index: gcc/fixinc/inclhack.sh
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/fixinc/inclhack.sh,v
retrieving revision 1.6
diff -u -r1.6 inclhack.sh
--- gcc/fixinc/inclhack.sh	1999/03/31 12:05:26	1.6
+++ gcc/fixinc/inclhack.sh	1999/03/31 21:42:36
@@ -2,9 +2,9 @@
 #
 # DO NOT EDIT THIS FILE   (inclhack.sh)
 # 
-# It has been autogen-ed  Wednesday March 31, 1999 at 12:02:52 PM PST
-# From the definitions    inclhack.def
-# and the template file   inclhack.tpl
+# It has been autogen-ed  Wednesday March 31, 1999 at 06:37:53 PM EST
+# From the definitions    /home/phd/oliva/src/egcs-main/gcc/fixinc/inclhack.def
+# and the template file   /home/phd/oliva/src/egcs-main/gcc/fixinc/inclhack.tpl
 #
 # Install modified versions of certain ANSI-incompatible system header
 # files which are fixed to work correctly with ANSI C and placed in a
@@ -374,7 +374,7 @@
     sed -e '/^extern pid_t wait3();$/i\
 struct rusage;
 ' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -395,7 +395,7 @@
     else infile=${DESTFILE} ; fi 
 
     sed -e 's/typedef volatile int sig_atomic_t/typedef int sig_atomic_t/' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -417,7 +417,7 @@
     else infile=${DESTFILE} ; fi 
 
     sed -e 's/getopt(int, char \*\[\],[ ]*char \*)/getopt(int, char *const[], const char *)/' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -438,7 +438,7 @@
     else infile=${DESTFILE} ; fi 
 
     sed -e 's/#ifndef(__mips64)/#ifndef __mips64/' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -459,7 +459,7 @@
     else infile=${DESTFILE} ; fi 
 
     sed -e 's/char\([ 	]*\*[	 ]*sbrk[ 	]*(\)/void\1/' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -478,7 +478,7 @@
     else infile=${DESTFILE} ; fi 
 
     sed -e 's/___type p_type/p_type/' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     ;; # case end for file name test
@@ -499,7 +499,7 @@
 
     sed -e 's/\(#[ 	]*ifndef[ 	]*\)__wchar_t/\1_GCC_WCHAR_T/' \
         -e 's/\(#[ 	]*define[ 	]*\)__wchar_t/\1_GCC_WCHAR_T/' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -520,7 +520,7 @@
     else infile=${DESTFILE} ; fi 
 
     sed -e 's|#ifndef NOINLINE|#if !defined(NOINLINE) \&\& !defined(__GNUC__)|' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -553,7 +553,7 @@
         -e '/^typedef[ 	][ 	]*char[ 	][ 	]*bool[ 	]*;/a\
 #endif
 ' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     ;; # case end for file name test
@@ -573,7 +573,7 @@
     else infile=${DESTFILE} ; fi 
 
     sed -e 's/^[ 	]*typedef[ 	][ 	]*\(struct[ 	][ 	]*term[ 	]*;[ 	]*\)$/\1/' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -592,7 +592,7 @@
     else infile=${DESTFILE} ; fi 
 
     sed -e 's/doesn'\''t/does not/' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     ;; # case end for file name test
@@ -625,7 +625,7 @@
     else infile=${DESTFILE} ; fi 
 
     sed -e 's/^[ 	]*#[ 	]*define[ 	]*\([^(]*\)\(([^)]*)\)[ 	]*\(_.\)\1\2[ 	]*$/#define \1 \3\1/' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -649,7 +649,7 @@
     sed -e '1i\
 #include <stdio.h>
 ' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -675,7 +675,7 @@
 #include <stdlib.h>\
 #endif
 ' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -696,7 +696,7 @@
 
     sed -e '/[ 	]BSD43__IO[A-Z]*[ 	]*(/s/(\(.\),/('\''\1'\'',/' \
         -e '/#[ 	]*define[ 	]*[ 	]BSD43__IO/s/'\''\([cgx]\)'\''/\1/g' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -712,13 +712,13 @@
     then infile=${file}
     else infile=${DESTFILE} ; fi 
 
-    sed -e '/^[ 	]*float[ 	]*fasm/i
+    sed -e '/^[ 	]*float[ 	]*fasm/i\
 #ifdef __DECC
 ' \
-        -e '/^[ 	]*#[ 	]*pragma[ 	]*intrinsic([ 	]*dasm/a
+        -e '/^[ 	]*#[ 	]*pragma[ 	]*intrinsic([ 	]*dasm/a\
 #endif
 ' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     ;; # case end for file name test
@@ -738,7 +738,7 @@
     else infile=${DESTFILE} ; fi 
 
     sed -e '/\/\/[^"*]/s|//.*$||g' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -756,7 +756,7 @@
     else infile=${DESTFILE} ; fi 
 
     sed -e 's/ecd.cursor/ecd_cursor/' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     ;; # case end for file name test
@@ -781,7 +781,7 @@
 s/\\+++fixinc_eol+++/\\/g
 s%^\([ 	]*#[ 	]*else\)[ 	]*/[^*].*%\1%
 s%^\([ 	]*#[ 	]*else\)[ 	]*[^/ 	].*%\1%' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -806,7 +806,7 @@
 s%^\([ 	]*#[ 	]*endif\)[ 	]*/[^*].*%\1%
 s%^\([ 	]*#[ 	]*endif\)[ 	]*\*[^/].*%\1%
 s%^\([ 	]*#[ 	]*endif\)[ 	]*[^/* 	].*%\1%' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -826,7 +826,7 @@
 
     sed -e 's,"../machine/inline.h",<machine/inline.h>,' \
         -e 's,"../machine/psl.h",<machine/psl.h>,' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -847,7 +847,7 @@
     else infile=${DESTFILE} ; fi 
 
     sed -e 's/(\.\.\.)/(struct file * ...)/' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -879,7 +879,7 @@
 }\
 #endif
 ' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -903,7 +903,7 @@
         -e '/^#[ 	]*define[ 	]*MAXINT[ 	]/a\
 #endif
 ' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     ;; # case end for file name test
@@ -923,7 +923,7 @@
     else infile=${DESTFILE} ; fi 
 
     sed -e 's/^extern struct sigevent;/struct sigevent;/' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -950,7 +950,7 @@
     else infile=${DESTFILE} ; fi 
 
     sed -e 's/!defined(__STDC__) && !defined(_POSIX_SOURCE)/!defined(_POSIX_SOURCE)/' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -972,7 +972,7 @@
     else infile=${DESTFILE} ; fi 
 
     sed -e 's/fmod(double)/fmod(double, double)/' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -995,7 +995,7 @@
 
     sed -e '/CHILD_MAX/s,/\* Max, Max,' \
         -e '/OPEN_MAX/s,/\* Max, Max,' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -1017,7 +1017,7 @@
     sed -e 's/\([ 	](_|DES)IO[A-Z]*[ 	]*(\)\([^,'\'']\),/\1'\''\2'\'',/' \
         -e '/#[ 	]*define[ 	]*[ 	]_IO/s/'\''\([cgxtf]\)'\''/\1/g' \
         -e '/#[ 	]*define[ 	]*[ 	]DESIOC/s/'\''\([cdgx]\)'\''/\1/g' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -1039,7 +1039,7 @@
         -e '/#[ 	]*define[ 	]*[ 	]CTRL/s/'\''\([cgx]\)'\''/\1/g' \
         -e '/#[ 	]*define[ 	]*[ 	]_CTRL/s/'\''\([cgx]\)'\''/\1/g' \
         -e '/#[ 	]*define[ 	]*[ 	]BSD43_CTRL/s/'\''\([cgx]\)'\''/\1/g' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -1056,7 +1056,7 @@
     else infile=${DESTFILE} ; fi 
 
     sed -e '/^struct/,/^};/s/}$/};/' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     ;; # case end for file name test
@@ -1075,7 +1075,7 @@
 
     sed -e 's@type of the result@type of the result */@' \
         -e 's@of the sizeof@/* of the sizeof@' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     ;; # case end for file name test
@@ -1097,7 +1097,7 @@
     sed -e '/authdes_create.*struct sockaddr/i\
 struct sockaddr;
 ' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -1118,7 +1118,7 @@
     sed -e '/xdrstdio_create.*struct __file_s/i\
 struct __file_s;
 ' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     ;; # case end for file name test
@@ -1138,7 +1138,7 @@
     else infile=${DESTFILE} ; fi 
 
     sed -e 's/fmod(double)/fmod(double, double)/' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -1160,7 +1160,7 @@
 
     sed -e 's@^\(#undef[ 	][ 	]*PIPE_BUF[ 	]*/\* max # bytes atomic in write to a\)$@\1 */@' \
         -e 's@\(/\*#define	HUGE_VAL	3.40282346638528860e+38 \)\(/\*error value returned by Math lib\*/\)$@\1*/ \2@' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     ;; # case end for machine type test
@@ -1183,7 +1183,7 @@
 
     sed -e '/CHILD_MAX/s,/\* Max, Max,' \
         -e '/OPEN_MAX/s,/\* Max, Max,' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -1221,7 +1221,7 @@
     else infile=${DESTFILE} ; fi 
 
     sed -e 's|/\*\*/|##|g' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -1278,7 +1278,7 @@
 #endif
 ' \
         -e '/^\(\/\*#define	HUGE_VAL	3\.[0-9e+]* *\)\/\*/s//\1/' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -1299,7 +1299,7 @@
     else infile=${DESTFILE} ; fi 
 
     sed -e '/#[ 	]*define[ 	][ 	]*void[ 	]int/d' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -1320,7 +1320,7 @@
     else infile=${DESTFILE} ; fi 
 
     sed -e 's/\(fcntl.*(int, int, \)int)/\1...)/' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -1354,7 +1354,7 @@
 }\
 #define hypot	fake_hypot
 ' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     ;; # case end for machine type test
@@ -1378,7 +1378,7 @@
 
     sed -e 's/^\(#define[ 	]*S_IS[A-Z]*(m)\)[ 	]*(m[ 	]*&[ 	]*\(S_IF[A-Z][A-Z][A-Z][A-Z]*\)[ 	]*)/\1 (((m)\&S_IFMT)==\2)/' \
         -e 's/^\(#define[ 	]*S_IS[A-Z]*(m)\)[ 	]*(m[ 	]*&[ 	]*\(0[0-9]*\)[ 	]*)/\1 (((m)\&S_IFMT)==\2)/' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -1405,7 +1405,7 @@
       echo "#ifndef __GCC_GOT_${cpp_wrapper}_"
       echo "#define __GCC_GOT_${cpp_wrapper}_"
       cat
-      echo "#endif /* ! __GCC_GOT_${cpp_wrapper}_ */" ) < $infile > ${DESTDIR}/FIXINC.tmp
+      echo "#endif /* ! __GCC_GOT_${cpp_wrapper}_ */" ) < $infile > ${DESTDIR}/fixinc.tmp
 
     #  Shell scripts have the potential of removing the output
     #  We interpret that to mean the file is not to be altered
@@ -1467,7 +1467,7 @@
 	s/ vax / __vax__ /g
 	s/ \([a-zA-Z0-9_][a-zA-Z0-9_]*\) /\1/g
 	}' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -1505,7 +1505,7 @@
 #undef exception\
 #endif
 ' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -1534,7 +1534,7 @@
 #ifndef HUGE_VAL
 ' -e'/define[ 	]HUGE_VAL[ 	]/a\
 #endif
-' ) < $infile > ${DESTDIR}/FIXINC.tmp
+' ) < $infile > ${DESTDIR}/fixinc.tmp
 
     #  Shell scripts have the potential of removing the output
     #  We interpret that to mean the file is not to be altered
@@ -1558,7 +1558,7 @@
     else infile=${DESTFILE} ; fi 
 
     sed -e 's@^\(/\*.*rpc/auth_des.h>.*\)/\*@\1*/ /*@' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     ;; # case end for file name test
@@ -1583,7 +1583,7 @@
         -e '/^#include <stdlib.h>/a\
 #endif
 ' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -1608,7 +1608,7 @@
         -e '/^extern.*double.*__const__.*cos(/s/__const__//' \
         -e '/^extern.*double.*__const__.*hypot(/s/__const__//' \
         -e '/^extern.*double.*__const__.*sin(/s/__const__//' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -1630,7 +1630,7 @@
 
     sed -e '/\(.*template\)/s/template//' \
         -e '/extern.*volatile.*void.*abort/s/volatile//' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -1652,7 +1652,7 @@
 
     sed -e '/extern.*volatile.*void.*exit/s/volatile//' \
         -e '/extern.*volatile.*void.*abort/s/volatile//' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -1673,7 +1673,7 @@
     else infile=${DESTFILE} ; fi 
 
     sed -e 's@wait(union wait@wait(void@' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -1692,7 +1692,7 @@
     else infile=${DESTFILE} ; fi 
 
     sed -e 's/char.*na_addr *$/char *na_addr;/' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     ;; # case end for file name test
@@ -1718,7 +1718,7 @@
     sed -e 's/regex_t/__regex_t/g' \
         -e 's/regoff_t/__regoff_t/g' \
         -e 's/regmatch_t/__regmatch_t/g' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -1746,7 +1746,7 @@
 typedef __regoff_t	regoff_t;\
 typedef __regmatch_t	regmatch_t;
 ' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -1767,7 +1767,7 @@
     else infile=${DESTFILE} ; fi 
 
     sed -e 's/^int __page_size/extern int __page_size/' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -1793,7 +1793,7 @@
         -e '/class[(]/a\
 #endif
 ' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -1814,7 +1814,7 @@
     else infile=${DESTFILE} ; fi 
 
     sed -e 's/fchmod(char \*/fchmod(int/' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -1834,7 +1834,7 @@
     else infile=${DESTFILE} ; fi 
 
     sed -e 's@rename(const char \*old, const char \*new)@rename(const char *_old, const char *_new)@' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     ;; # case end for file name test
@@ -1854,7 +1854,7 @@
     else infile=${DESTFILE} ; fi 
 
     sed -e 's@"../machine/endian.h"@<machine/endian.h>@' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -1875,7 +1875,7 @@
     else infile=${DESTFILE} ; fi 
 
     sed -e 's/boottime$/boottime;/' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -1909,7 +1909,7 @@
       -e 's@GNUC_VA_LIST@GNUC_Va_LIST@' \
       -e 's@_NEED___VA_LIST@_NEED___Va_LIST@' \
       -e 's@VA_LIST@DUMMY_VA_LIST@' \
-      -e 's@_Va_LIST@_VA_LIST@' ) < $infile > ${DESTDIR}/FIXINC.tmp
+      -e 's@_Va_LIST@_VA_LIST@' ) < $infile > ${DESTDIR}/fixinc.tmp
 
     #  Shell scripts have the potential of removing the output
     #  We interpret that to mean the file is not to be altered
@@ -1936,7 +1936,7 @@
     else infile=${DESTFILE} ; fi 
 
     sed -e 's/\#ifdef __i386__ || __vax__/\#if __i386__ || __vax__/g' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -1957,7 +1957,7 @@
     else infile=${DESTFILE} ; fi 
 
     sed -e 's/\#ifdef __i386__ || __sun4c__/\#if __i386__ || __sun4c__/g' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -1985,7 +1985,7 @@
         -e '/^#define[ 	]CAT(a,b)/ a\
 #endif
 ' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -2007,7 +2007,7 @@
         -e 's/int[ 	][ 	]*free/void	free/g' \
         -e 's/char\([ 	]*\*[ 	]*malloc\)/void\1/g' \
         -e 's/char\([ 	]*\*[ 	]*realloc\)/void\1/g' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     ;; # case end for file name test
@@ -2048,7 +2048,7 @@
 #endif /* __memory_h__ */
 ' \
         -e '1,$d' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -2069,7 +2069,7 @@
     else infile=${DESTFILE} ; fi 
 
     sed -e '/^struct/,/^};/s/_cnt$/_cnt;/' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -2098,7 +2098,7 @@
         -e '/^void	(\*signal())();$/a\
 #endif
 ' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -2129,7 +2129,7 @@
 #else\
 \1\2\
 #endif/' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -2153,7 +2153,7 @@
         -e '/matherr/i\
 struct exception;
 ' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     ;; # case end for file name test
@@ -2171,7 +2171,7 @@
     else infile=${DESTFILE} ; fi 
 
     sed -e 's/int[ 	]*strlen();/__SIZE_TYPE__ strlen();/' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     ;; # case end for file name test
@@ -2224,7 +2224,7 @@
 #endif
 ' \
         -e 's/typedef[ 	][ 	]*[a-z_][ 	a-z_]*[ 	]wchar_t/typedef __WCHAR_TYPE__ wchar_t/' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -2252,7 +2252,7 @@
         -e '/typedef[ 	][ 	]*[A-Za-z_][ 	A-Za-z_]*[ 	]size_t/a\
 #endif
 ' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -2281,7 +2281,7 @@
 \2/' \
         -e '/^extern int$/N' \
         -e 's/^extern int\(\n	strlen(),\)/extern size_t\1/' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     ;; # case end for file name test
@@ -2313,7 +2313,7 @@
         -e '/typedef[ 	a-zA-Z_]*[ 	]size_t[ 	]*;/a\
 #endif
 ' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     ;; # case end for machine type test
@@ -2353,7 +2353,7 @@
         -e '/[	 ]wchar_t.*;/a\
 #endif
 ' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     ;; # case end for file name test
@@ -2371,7 +2371,7 @@
     else infile=${DESTFILE} ; fi 
 
     sed -e 's/[ 	]_cplusplus/ __cplusplus/' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     ;; # case end for file name test
@@ -2394,7 +2394,7 @@
 /* This file intentionally left blank. */
 ' \
         -e '1,$d' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -2417,7 +2417,7 @@
     sed -e '/^[ 	]*extern[ 	]*int[ 	]*uname();$/i\
 struct utsname;
 ' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -2440,7 +2440,7 @@
         -e 's@inline double abs(double [a-z][a-z]*) {.*}@@' \
         -e 's@inline int sqr(int [a-z][a-z]*) {.*}@@' \
         -e 's@inline double sqr(double [a-z][a-z]*) {.*}@@' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     ;; # case end for file name test
@@ -2466,7 +2466,7 @@
         -e 's@sscanf( char \*__s, char \*__format,@sscanf( const char *__s, const char *__format,@' \
         -e 's@popen(char \*, char \*);@popen(const char *, const char *);@' \
         -e 's@tempnam(char\*,char\*);@tempnam(const char*,const char*);@' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     ;; # case end for file name test
@@ -2486,7 +2486,7 @@
     else infile=${DESTFILE} ; fi 
 
     sed -e 's/#ifdef KERNEL/#if defined(KERNEL)/' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -2505,7 +2505,7 @@
     else infile=${DESTFILE} ; fi 
 
     sed -e 's@^\( \*	int protocol;  \)/\*@\1*/ /*@' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     ;; # case end for file name test
@@ -2527,7 +2527,7 @@
     sed -e 's/^static struct tlb_pid_state/struct tlb_pid_state/' \
         -e 's/^#include "r3_cpu\.h"$/#include <machine\/r3_cpu\.h>/' \
         -e 's/^#include "r4_cpu\.h"$/#include <machine\/r4_cpu\.h>/' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -2550,7 +2550,7 @@
     sed -e '/^#[ 	]*define[ 	][ 	]*NULL[ 	]/i\
 #undef NULL
 ' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -2572,7 +2572,7 @@
         -e 's/__vali/__vxvali/' \
         -e 's/__vpad/__vxvpad/' \
         -e 's/__alignof__/__vxalignof__/' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -2603,7 +2603,7 @@
     else infile=${DESTFILE} ; fi 
 
     sed -e 's/^#[ 	]*define[ 	]*NULL[ 	]*((void[ 	]*\*)0)/#define NULL 0/' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -2645,7 +2645,7 @@
         -e '/[ 	]wchar_t/a\
 #endif
 ' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -2666,7 +2666,7 @@
     else infile=${DESTFILE} ; fi 
 
     sed -e 's/uint_t/unsigned int/' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -2692,7 +2692,7 @@
     sed -e '/#[ 	]define[ 	][ 	]*__INCstath/a\
 #include <types/vxTypesOld.h>
 ' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -2724,7 +2724,7 @@
 #endif
 ' \
         -e 's/VOIDFUNCPTR/__gcc_VOIDFUNCPTR/g' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -2752,7 +2752,7 @@
         -e '/char \*class;/a\
 #endif
 ' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -2773,7 +2773,7 @@
     else infile=${DESTFILE} ; fi 
 
     sed -e 's/ class[)]/ c_class)/g' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -2802,7 +2802,7 @@
 #endif
 ' \
         -e 's/Widget new,/Widget c_new,/g' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     fi # end of selection 'if'
@@ -2823,7 +2823,7 @@
     sed -e 's,^extern char \*	sprintf();$,#ifndef __STDC__\
 extern char *	sprintf();\
 #endif /* !defined __STDC__ */,' \
-          < $infile > ${DESTFILE}.
+          < $infile > ${DESTDIR}/fixinc.tmp
     rm -f ${DESTFILE}
     mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
     ;; # case end for file name test
@@ -2843,7 +2843,7 @@
     else infile=${DESTFILE} ; fi 
     ( echo "Removing incorrect fix to <$file>" >&2
 rm -f ${DESTDIR}/$file ${DESTDIR}/$file.
-cat > /dev/null ) < $infile > ${DESTDIR}/FIXINC.tmp
+cat > /dev/null ) < $infile > ${DESTDIR}/fixinc.tmp
 
     #  Shell scripts have the potential of removing the output
     #  We interpret that to mean the file is not to be altered
@@ -2870,7 +2870,7 @@
     else infile=${DESTFILE} ; fi 
     ( echo "Removing incorrect fix to <$file>" >&2
 rm -f ${DESTDIR}/$file ${DESTDIR}/$file.
-cat > /dev/null ) < $infile > ${DESTDIR}/FIXINC.tmp
+cat > /dev/null ) < $infile > ${DESTDIR}/fixinc.tmp
 
     #  Shell scripts have the potential of removing the output
     #  We interpret that to mean the file is not to be altered
@@ -2897,7 +2897,7 @@
     else infile=${DESTFILE} ; fi 
     ( echo "Removing incorrect fix to <$file>" >&2
 rm -f ${DESTDIR}/$file ${DESTDIR}/$file.
-cat > /dev/null ) < $infile > ${DESTDIR}/FIXINC.tmp
+cat > /dev/null ) < $infile > ${DESTDIR}/fixinc.tmp
 
     #  Shell scripts have the potential of removing the output
     #  We interpret that to mean the file is not to be altered
@@ -2924,7 +2924,7 @@
     else infile=${DESTFILE} ; fi 
     ( echo "Removing incorrect fix to <$file>" >&2
 rm -f ${DESTDIR}/$file ${DESTDIR}/$file.
-cat > /dev/null ) < $infile > ${DESTDIR}/FIXINC.tmp
+cat > /dev/null ) < $infile > ${DESTDIR}/fixinc.tmp
 
     #  Shell scripts have the potential of removing the output
     #  We interpret that to mean the file is not to be altered
@@ -2949,7 +2949,7 @@
     else infile=${DESTFILE} ; fi 
     ( echo "Removing incorrect fix to <$file>" >&2
 rm -f ${DESTDIR}/$file ${DESTDIR}/$file.
-cat > /dev/null ) < $infile > ${DESTDIR}/FIXINC.tmp
+cat > /dev/null ) < $infile > ${DESTDIR}/fixinc.tmp
 
     #  Shell scripts have the potential of removing the output
     #  We interpret that to mean the file is not to be altered
@@ -2975,7 +2975,7 @@
     else infile=${DESTFILE} ; fi 
     ( echo "Removing incorrect fix to <$file>" >&2
 rm -f ${DESTDIR}/$file ${DESTDIR}/$file.
-cat > /dev/null ) < $infile > ${DESTDIR}/FIXINC.tmp
+cat > /dev/null ) < $infile > ${DESTDIR}/fixinc.tmp
 
     #  Shell scripts have the potential of removing the output
     #  We interpret that to mean the file is not to be altered
Index: gcc/fixinc/fixincl.sh
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/fixinc/fixincl.sh,v
retrieving revision 1.6
diff -u -r1.6 fixincl.sh
--- gcc/fixinc/fixincl.sh	1999/03/31 12:05:23	1.6
+++ gcc/fixinc/fixincl.sh	1999/03/31 21:42:36
@@ -2,9 +2,9 @@
 #
 # DO NOT EDIT THIS FILE   (fixincl.sh)
 # 
-# It has been autogen-ed  Wednesday March 31, 1999 at 12:03:13 PM PST
-# From the definitions    inclhack.def
-# and the template file   inclhack.tpl
+# It has been autogen-ed  Wednesday March 31, 1999 at 06:37:56 PM EST
+# From the definitions    /home/phd/oliva/src/egcs-main/gcc/fixinc/inclhack.def
+# and the template file   /home/phd/oliva/src/egcs-main/gcc/fixinc/inclhack.tpl
 #
 # Install modified versions of certain ANSI-incompatible system header
 # files which are fixed to work correctly with ANSI C and placed in a
Index: gcc/fixinc/fixincl.x
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/fixinc/fixincl.x,v
retrieving revision 1.6
diff -u -r1.6 fixincl.x
--- gcc/fixinc/fixincl.x	1999/03/31 12:05:24	1.6
+++ gcc/fixinc/fixincl.x	1999/03/31 21:42:38
@@ -1,9 +1,9 @@
 /*
  * DO NOT EDIT THIS FILE   (fixincl.x)
  * 
- * It has been autogen-ed  Wednesday March 31, 1999 at 12:03:54 PM PST
- * From the definitions    inclhack.def
- * and the template file   fixincl.tpl
+ * It has been autogen-ed  Wednesday March 31, 1999 at 06:37:57 PM EST
+ * From the definitions    /home/phd/oliva/src/egcs-main/gcc/fixinc/inclhack.def
+ * and the template file   /home/phd/oliva/src/egcs-main/gcc/fixinc/fixincl.tpl
  *
  * Install modified versions of certain ANSI-incompatible system header
  * files which are fixed to work correctly with ANSI C and placed in a
@@ -566,9 +566,9 @@
  *  Fix Command Arguments for Dec_Intern_Asm
  */
 const char* apzDec_Intern_AsmPatch[] = { "sed",
-    "-e" "/^[ \t]*float[ \t]*fasm/i\n"
+    "-e" "/^[ \t]*float[ \t]*fasm/i\\\n"
        "#ifdef __DECC\n",
-    "-e" "/^[ \t]*#[ \t]*pragma[ \t]*intrinsic([ \t]*dasm/a\n"
+    "-e" "/^[ \t]*#[ \t]*pragma[ \t]*intrinsic([ \t]*dasm/a\\\n"
        "#endif\n",
     (char*)NULL };
 

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]