Patches for IRIX 4.0.1

From-SVN: r4337

1 files changed, 30 insertions, 1 deletions

diff --git a/gcc/fixincludes b/gcc/fixincludes
index 6121ff9..f1281e5 100755
--- a/gcc/fixincludes
+++ b/gcc/fixincludes
@@ -273,7 +273,7 @@ while [ $# != 0 ]; do
 	  s%^\([ 	]*#[ 	]*endif[ 	]*\)\([^/ 	].*\)$%\1/* \2 */%
 	  s%^\([ 	]*#[ 	]*else[ 	]*\)\([^/ 	].*\)$%\1/* \2 */%
 	  /\/\/[^*]/			s|//\(.*\)$|/*\1*/|
-	  /[ 	]_IO[A-Z]*[ 	]*(/	s/(\(.\),/('\''\1'\'',/
+	  /[ 	]_IO[A-Z]*[ 	]*(/	s/\(_IO[A-Z]*[ 	]*(\)\(.\),/\1'\''\2'\'',/
 	  /[ 	]BSD43__IO[A-Z]*[ 	]*(/	s/(\(.\),/('\''\1'\'',/
 	  /#define._IO/			s/'\''\([cgx]\)'\''/\1/g
 	  /#define.BSD43__IO/		s/'\''\([cgx]\)'\''/\1/g
@@ -817,6 +817,35 @@ if [ -r ${LIB}/$file ]; then
   fi
 fi
 
+# Fix line in IRIX 4.0.1 header file.  The sed script turns
+# #define EM_CTRL		(CUTIOC|0x1)
+# into
+# #define EM_CTRL		(CUTIOC|0x'1')
+file=sys/t3270reg.h
+if [ -r ${LIB}/$file ]; then
+  echo Fixing $file, overeager sed script
+  sed -e "s/0x'1'/0x1/" ${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
+
+# Turning // comments into /* */ comments trashes this IRIX 4.0.1
+# header file, which embeds // comments inside multi-line /* */
+# comments.  If this looks like the IRIX header file, we refix it by
+# just throwing away the // comments.
+file=fam.h
+if [ -r ${LIB}/$file ]; then
+  if egrep indigo.esd ${LIB}/$file > /dev/null; then
+    echo Fixing $file, overeager sed script
+    rm ${LIB}/$file
+    sed -e 's|//.*$||g' $file > ${LIB}/$file
+    chmod +w ${LIB}/$file 2>/dev/null
+    chmod a+r ${LIB}/$file 2>/dev/null
+  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.