From 6655a9bc33ff49d1964a292d5cb2fcf916853a88 Mon Sep 17 00:00:00 2001 From: Bruce Korb Date: Fri, 12 Mar 1999 07:44:19 +0000 Subject: [PATCH] Missing merges from fixincl-branch From-SVN: r25725 --- gcc/ChangeLog | 5 +++++ gcc/fixinc/fixinc.dgux | 8 ++++---- gcc/fixinc/fixinc.irix | 8 ++++---- gcc/fixinc/fixinc.ptx | 8 ++++---- gcc/fixinc/fixinc.sco | 8 ++++---- gcc/fixinc/fixinc.svr4 | 8 ++++---- gcc/fixinc/fixinc.winnt | 8 ++++---- gcc/fixinc/fixinc.wrap | 8 ++++---- gcc/fixinc/fixinc.x86-linux-gnu | 8 ++++---- 9 files changed, 37 insertions(+), 32 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b86d4faae96..f7c232aa7af 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +Fri Mar 12 07:54:43 1999 Bruce Korb + + * 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 71365c4fa9d..afdd0cd5935 100755 --- 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 1fa53a7b90f..d12c78662cb 100755 --- 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 ac8478a7aa3..c205e217d36 100644 --- 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 e580956b17c..11e78f727ca 100755 --- 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 840a7d471f0..dedf4eb7e44 100755 --- 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 7b8fe9ec9e7..cb7e72f3bf5 100644 --- 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 ac9b5c92861..0c27536ce18 100755 --- 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 679933a1a96..1bee37d4171 100644 --- a/gcc/fixinc/fixinc.x86-linux-gnu +++ b/gcc/fixinc/fixinc.x86-linux-gnu @@ -136,12 +136,12 @@ __EOF__ # the real . 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 -- 2.30.2