More fixes for IRIX 4.0.1

From-SVN: r4372

1 files changed, 13 insertions, 1 deletions

diff --git a/gcc/fixincludes b/gcc/fixincludes
index f1281e5..4773729 100755
--- a/gcc/fixincludes
+++ b/gcc/fixincludes
@@ -277,7 +277,8 @@ while [ $# != 0 ]; do
 	  /[ 	]BSD43__IO[A-Z]*[ 	]*(/	s/(\(.\),/('\''\1'\'',/
 	  /#define._IO/			s/'\''\([cgx]\)'\''/\1/g
 	  /#define.BSD43__IO/		s/'\''\([cgx]\)'\''/\1/g
-	  /[^A-Z]CTRL[ 	]*(/		s/\([^'\'']\))/'\''\1'\'')/
+	  /[^A-Z_]CTRL[ 	]*(/		s/\([^'\'']\))/'\''\1'\'')/
+	  /[^A-Z]_CTRL[ 	]*(/		s/\([^'\'']\))/'\''\1'\'')/
 	  /#define.CTRL/		s/'\''\([cgx]\)'\''/\1/g
 	  /#define._CTRL/		s/'\''\([cgx]\)'\''/\1/g
 	  /#define.BSD43_CTRL/		s/'\''\([cgx]\)'\''/\1/g
@@ -846,6 +847,17 @@ if [ -r ${LIB}/$file ]; then
   fi
 fi
 
+# Another IRIX 4.0.1 header file contains the string "//"
+file=elf_abi.h
+if [ -r ${LIB}/$file ]; then
+  echo Fixing $file, overeager sed script
+  sed -e 's|"/\*"\*/|"//"|' ${LIB}/$file > ${LIB}/${file}.sed
+  rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
+  if cmp $file ${LIB}/$file >/dev/null 2>&1; then
+    rm -f ${LIB}/$file
+  fi
+fi
+
 # Fix non-ANSI memcpy declaration that conflicts with gcc's builtin
 # declaration on Sun OS 4.x.  We must only fix this on Sun OS 4.x, because
 # many other systems have similar text but correct versions of the file.