Missing merges from fixincl-branch

From-SVN: r25725

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b86d4faae96b68d88390133abfcf942f5ae470cc..f7c232aa7af8248a26b685596aaa91a63e864205 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Fri Mar 12 07:54:43 1999  Bruce Korb <korb@datadesign.com>
+
+       * fixinc/fixinc.*: Some changes from the fixincl-branch
+       were not applied (??!!).  Corrected.
+
 Fri Mar 12 00:51:43 1999  Jeffrey A Law  (law@cygnus.com)
 
        * expr.c (expand_expr): Allow a CALL_EXPR with a mode wider than

diff --git a/gcc/fixinc/fixinc.dgux b/gcc/fixinc/fixinc.dgux
index 71365c4fa9dbdf22338668035279e5a8e8c62075..afdd0cd5935b8b1c1975a8ecc5fd233e8ce35577 100755 (executable)
--- a/gcc/fixinc/fixinc.dgux
+++ b/gcc/fixinc/fixinc.dgux
@@ -189,12 +189,12 @@ fi
 
 done
 
-if [ x${INSTALL_ASSERT_H} != x ] ;
+if [ x${INSTALL_ASSERT_H} != x ]
 then
   cd ${ORIG_DIR}
-  rm -f include/assert.h;
-  cp $(srcdir)/assert.h include/assert.h;
-  chmod a+r include/assert.h;
+  rm -f include/assert.h
+  cp ${srcdir}/assert.h include/assert.h || exit 1
+  chmod a+r include/assert.h
 fi
 
 exit 0

diff --git a/gcc/fixinc/fixinc.irix b/gcc/fixinc/fixinc.irix
index 1fa53a7b90f577b6e7e7fe1ced590c11cda24ee0..d12c78662cb341398bf030b1903a7d6ac2bd0366 100755 (executable)
--- a/gcc/fixinc/fixinc.irix
+++ b/gcc/fixinc/fixinc.irix
@@ -232,12 +232,12 @@ fi
 
 done
 
-if [ x${INSTALL_ASSERT_H} != x ] ;
+if [ x${INSTALL_ASSERT_H} != x ]
 then
   cd ${ORIG_DIR}
-  rm -f include/assert.h;
-  cp $(srcdir)/assert.h include/assert.h;
-  chmod a+r include/assert.h;
+  rm -f include/assert.h
+  cp ${srcdir}/assert.h include/assert.h || exit 1
+  chmod a+r include/assert.h
 fi
 
 exit 0

diff --git a/gcc/fixinc/fixinc.ptx b/gcc/fixinc/fixinc.ptx
index ac8478a7aa359e34f316d04695c94f61bd428385..c205e217d3636bfbbd3ea908a8b5a45834c85434 100644 (file)
--- a/gcc/fixinc/fixinc.ptx
+++ b/gcc/fixinc/fixinc.ptx
@@ -263,12 +263,12 @@ fi
 
 done
 
-if [ x${INSTALL_ASSERT_H} != x ] ;
+if [ x${INSTALL_ASSERT_H} != x ]
 then
   cd ${ORIG_DIR}
-  rm -f include/assert.h;
-  cp $(srcdir)/assert.h include/assert.h;
-  chmod a+r include/assert.h;
+  rm -f include/assert.h
+  cp ${srcdir}/assert.h include/assert.h || exit 1
+  chmod a+r include/assert.h
 fi
 
 exit 0

diff --git a/gcc/fixinc/fixinc.sco b/gcc/fixinc/fixinc.sco
index e580956b17c44785bc551202235faa4ac7f4f6aa..11e78f727caf673d87db0e61a583c4a903ade046 100755 (executable)
--- a/gcc/fixinc/fixinc.sco
+++ b/gcc/fixinc/fixinc.sco
@@ -434,12 +434,12 @@ fi
 
 done
 
-if [ x${INSTALL_ASSERT_H} != x ] ;
+if [ x${INSTALL_ASSERT_H} != x ]
 then
   cd ${ORIG_DIR}
-  rm -f include/assert.h;
-  cp $(srcdir)/assert.h include/assert.h;
-  chmod a+r include/assert.h;
+  rm -f include/assert.h
+  cp ${srcdir}/assert.h include/assert.h || exit 1
+  chmod a+r include/assert.h
 fi
 
 exit 0

diff --git a/gcc/fixinc/fixinc.svr4 b/gcc/fixinc/fixinc.svr4
index 840a7d471f0fef93df94b262cc327e8d49b7c022..dedf4eb7e445203ac694d1b8e5834adb5434cb1f 100755 (executable)
--- a/gcc/fixinc/fixinc.svr4
+++ b/gcc/fixinc/fixinc.svr4
@@ -1767,12 +1767,12 @@ chmod a+r ${LIB}/sys/byteorder.h
 
 done
 
-if [ x${INSTALL_ASSERT_H} != x ] ;
+if [ x${INSTALL_ASSERT_H} != x ]
 then
   cd ${ORIG_DIR}
-  rm -f include/assert.h;
-  cp $(srcdir)/assert.h include/assert.h;
-  chmod a+r include/assert.h;
+  rm -f include/assert.h
+  cp ${srcdir}/assert.h include/assert.h || exit 1
+  chmod a+r include/assert.h
 fi
 
 exit 0

diff --git a/gcc/fixinc/fixinc.winnt b/gcc/fixinc/fixinc.winnt
index 7b8fe9ec9e79105553db482a00b086700fba86fa..cb7e72f3bf5f48ab3087a36dab5985168006fb98 100644 (file)
--- a/gcc/fixinc/fixinc.winnt
+++ b/gcc/fixinc/fixinc.winnt
@@ -229,12 +229,12 @@ for file in $files; do
   rmdir $LIB/$file > NUL 2>&1
 done
 
-if [ x${INSTALL_ASSERT_H} != x ] ;
+if [ x${INSTALL_ASSERT_H} != x ]
 then
   cd ${ORIG_DIR}
-  rm -f include/assert.h;
-  cp $(srcdir)/assert.h include/assert.h;
-  chmod a+r include/assert.h;
+  rm -f include/assert.h
+  cp ${srcdir}/assert.h include/assert.h || exit 1
+  chmod a+r include/assert.h
 fi
 
 exit 0

diff --git a/gcc/fixinc/fixinc.wrap b/gcc/fixinc/fixinc.wrap
index ac9b5c92861c859477db97d202004c9249a258f3..0c27536ce186475b7d282d4c1f83b945f647a372 100755 (executable)
--- a/gcc/fixinc/fixinc.wrap
+++ b/gcc/fixinc/fixinc.wrap
@@ -133,12 +133,12 @@ fi
 
 done
 
-if [ x${INSTALL_ASSERT_H} != x ] ;
+if [ x${INSTALL_ASSERT_H} != x ]
 then
   cd ${ORIG_DIR}
-  rm -f include/assert.h;
-  cp $(srcdir)/assert.h include/assert.h;
-  chmod a+r include/assert.h;
+  rm -f include/assert.h
+  cp ${srcdir}/assert.h include/assert.h || exit 1
+  chmod a+r include/assert.h
 fi
 
 exit 0

diff --git a/gcc/fixinc/fixinc.x86-linux-gnu b/gcc/fixinc/fixinc.x86-linux-gnu
index 679933a1a96a7a65d75789853866cb63f8cb8d35..1bee37d4171908cdeb7c21c5d8c38383c509c2ba 100644 (file)
--- a/gcc/fixinc/fixinc.x86-linux-gnu
+++ b/gcc/fixinc/fixinc.x86-linux-gnu
@@ -136,12 +136,12 @@ __EOF__
 # the real <gnu/types.h>.
 chmod a+r $LIB/$file
 
-if [ x${INSTALL_ASSERT_H} != x ] ;
+if [ x${INSTALL_ASSERT_H} != x ]
 then
   cd ${ORIG_DIR}
-  rm -f include/assert.h;
-  cp $(srcdir)/assert.h include/assert.h;
-  chmod a+r include/assert.h;
+  rm -f include/assert.h
+  cp ${srcdir}/assert.h include/assert.h || exit 1
+  chmod a+r include/assert.h
 fi
 
 exit 0