These files are being moved from the contrib/fixinc directory.

They have been modified somewhat to work in the new environment.

From-SVN: r23125

18 files changed, 13425 insertions, 0 deletions

diff --git a/gcc/fixinc/Makefile.in b/gcc/fixinc/Makefile.in
new file mode 100644
index 0000000..e220c22
--- /dev/null
+++ b/gcc/fixinc/Makefile.in
@@ -0,0 +1,132 @@
+# Makefile for GNU C++ compiler.
+#   Copyright (C) 1987, 88, 90-5, 1998 Free Software Foundation, Inc.
+
+#This file is part of GNU CC.
+
+#GNU CC is free software; you can redistribute it and/or modify
+#it under the terms of the GNU General Public License as published by
+#the Free Software Foundation; either version 2, or (at your option)
+#any later version.
+
+#GNU CC is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#GNU General Public License for more details.
+
+#You should have received a copy of the GNU General Public License
+#along with GNU CC; see the file COPYING.  If not, write to
+#the Free Software Foundation, 59 Temple Place - Suite 330,
+#Boston, MA 02111-1307, USA.
+
+# The makefile built from this file lives in the fixinc subdirectory.
+# Its purpose is to build the any-platforms fixinc.sh script.
+
+CFLAGS = -g
+
+CC = @CC@
+SHELL = /bin/sh
+
+target=@target@
+# Directory where sources are, from where we are.
+srcdir = @srcdir@
+VPATH = @srcdir@
+
+# End of variables for you to override.
+
+default : gen
+
+# Now figure out from those variables how to compile and link.
+
+# Specify the directories to be searched for header files.
+# Both . and srcdir are used, in that order.
+INCLUDES = -I. -I.. -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../config
+
+# Always use -I$(srcdir)/config when compiling.
+.c.o:
+	$(CC) -c $(CFLAGS) $(CPPFLAGS) $(INCLUDES) $<
+
+# The only suffixes we want for implicit rules are .c and .o.
+.SUFFIXES:
+.SUFFIXES: .c .o
+
+#
+
+## # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+##
+##  Makefile for constructing the "best" include fixer we can
+##
+##  $Id: Makefile.in,v 1.2 1998/12/16 21:18:54 law Exp $
+##
+## # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+
+OBJ = fixincl.o server.o regex.o
+HDR = server.h regex.h
+
+SH_TARGET  = inclhack.sh fixincl.sh
+BIN_TARGET = fixincl
+AG_TEXT    = $(SH_TARGET) fixincl.x \
+	inclhack.def inclhack.tpl hackshell.tpl fixincl.tpl
+TARGETS    = $(SH_TARGET) $(BIN_TARGET)
+
+all : $(TARGETS)
+sh  : $(SH_TARGET)
+gen : $(SH_TARGET) fixincl.x
+
+$(OBJ): $(HDR)
+
+fixincl: $(OBJ)
+	@echo $(CC) -o $@ $(OBJ) $(LIB) ; \
+	if $(CC) -o $@ $(OBJ) $(LIB) ; then : ; else \
+	rm -f $@ ; (echo "#! /bin/sh" ; echo exit 1 ) > $@ ; \
+	chmod 777 $@ ; fi
+
+regex.o: regex.c
+	-$(CC) $(CFLAGS) -DSTDC_HEADERS=1 -c regex.c
+
+fixincl.o : fixincl.x fixincl.c
+server.o : server.c server.h
+
+fixincl.x: fixincl.tpl inclhack.def
+	@if ( autogen --help > /dev/null 2>&1 ) ; then \
+		echo autogen -T fixincl.tpl -b fixincl inclhack.def ; \
+		autogen -T $(srcdir)/fixincl.tpl -b fixincl \
+			$(srcdir)/inclhack.def ; \
+	else echo You need to install autogen ; \
+		$(CP) $(srcdir)/$@ . ; fi
+
+inclhack.sh: inclhack.def inclhack.tpl hackshell.tpl
+	@if ( autogen --help > /dev/null 2>&1 ) ; then \
+		echo autogen inclhack.def ; \
+		autogen inclhack.def ; \
+	else echo You need to install autogen ; \
+		$(CP) $(srcdir)/$@ . ; fi
+
+fixincl.sh: inclhack.def inclhack.tpl
+	@if ( autogen --help > /dev/null 2>&1 ) ; then \
+		echo autogen -DPROGRAM=1 -b fixincl inclhack.def ; \
+		autogen -DPROGRAM=1 -b fixincl inclhack.def ; touch $@ ; \
+	else echo You need to install autogen ; \
+		$(CP) $(srcdir)/$@ . ; fi
+
+clean:
+	rm -f *.o $(TARGETS) fixincl.x
+
+#  Ensure all the targets are built.  If the program "fixincl"
+#  failed to compile, link or load, then we install the
+#  "inclhack.sh" script.  Otherwise, we install that program
+#  plus the wrapper script, "fixincl.sh".
+#
+install: $(TARGETS)
+	@rm -f ../fixinc.sh ; \
+	if ( ./fixincl -v > /dev/null 2>&1 ) ; then \
+		echo cp fixincl.sh ../fixinc.sh ; \
+		cp fixincl.sh ../fixinc.sh ; \
+		chmod 555 ../fixinc.sh ; \
+		rm -f ../fixincl ; \
+		echo cp fixincl .. ; \
+		cp fixincl .. ; \
+		chmod 555 ../fixincl ; \
+	else \
+		echo cp inclhack.sh ../fixinc.sh ; \
+		cp inclhack.sh ../fixinc.sh ; \
+	fi
diff --git a/gcc/fixinc/fixinc.dgux b/gcc/fixinc/fixinc.dgux
new file mode 100755
index 0000000..422ba5f
--- /dev/null
+++ b/gcc/fixinc/fixinc.dgux
@@ -0,0 +1,185 @@
+#!/bin/sh
+#
+# modified for dgux by hassey@dg-rtp.dg.com based on
+#
+#   fixinc.svr4  written by Ron Guilmette (rfg@ncd.com).
+#
+# This file is part of GNU CC.
+# 
+# GNU CC is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+# 
+# GNU CC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GNU CC; see the file COPYING.  If not, write to
+# the Free Software Foundation, 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+#
+#
+#	See README-fixinc for more information.
+
+# Directory containing the original header files.
+INPUT=${2-${INPUT-/usr/include}}
+
+# Fail if no arg to specify a directory for the output.
+if [ x$1 = x ]
+then echo fixincludes: no output directory specified
+exit 1
+fi
+
+# Directory in which to store the results.
+LIB=${1?"fixincludes: output directory not specified"}
+
+# Make sure it exists.
+if [ ! -d $LIB ]; then
+  mkdir $LIB || exit 1
+fi
+
+ORIG_DIR=`pwd`
+
+# Make LIB absolute if it is relative.
+# Don't do this if not necessary, since may screw up automounters.
+case $LIB in
+/*)
+	;;
+*)
+	cd $LIB; LIB=`${PWDCMD-pwd}`
+	;;
+esac
+
+echo 'Building fixincludes in ' ${LIB}
+
+# Determine whether this filesystem has symbolic links.
+if ln -s X $LIB/ShouldNotExist 2>/dev/null; then
+  rm -f $LIB/ShouldNotExist
+  LINKS=true
+else
+  LINKS=false
+fi
+
+echo 'Making directories:'
+cd ${INPUT}
+if $LINKS; then
+  files=`ls -LR | sed -n s/:$//p`
+else
+  files=`find . -type d -print | sed '/^.$/d'`
+fi
+for file in $files; do
+  rm -rf $LIB/$file
+  if [ ! -d $LIB/$file ]
+  then mkdir $LIB/$file
+  fi
+done
+
+# treetops gets an alternating list
+# of old directories to copy
+# and the new directories to copy to.
+treetops="${INPUT} ${LIB}"
+
+if $LINKS; then
+  echo 'Making internal symbolic directory links'
+  for file in $files; do
+    dest=`ls -ld $file | sed -n 's/.*-> //p'`
+    if [ "$dest" ]; then    
+      cwd=`pwd`
+      # In case $dest is relative, get to $file's dir first.
+      cd ${INPUT}
+      cd `echo ./$file | sed -n 's&[^/]*$&&p'`
+      # Check that the target directory exists.
+      # Redirections changed to avoid bug in sh on Ultrix.
+      (cd $dest) > /dev/null 2>&1
+      if [ $? = 0 ]; then
+	cd $dest
+	# X gets the dir that the link actually leads to.
+	x=`pwd`
+	# If link leads back into ${INPUT},
+	# make a similar link here.
+	if expr $x : "${INPUT}/.*" > /dev/null; then
+	  # Y gets the actual target dir name, relative to ${INPUT}.
+	  y=`echo $x | sed -n "s&${INPUT}/&&p"`
+	  # DOTS is the relative path from ${LIB}/$file's dir back to ${LIB}.
+	  dots=`echo "$file" |
+	    sed -e 's@^./@@' -e 's@/./@/@g' -e 's@[^/][^/]*@..@g' -e 's@..$@@'`
+	  echo $file '->' $dots$y ': Making link'
+	  rm -fr ${LIB}/$file > /dev/null 2>&1
+	  ln -s $dots$y ${LIB}/$file > /dev/null 2>&1
+	else
+	  # If the link is to outside ${INPUT},
+	  # treat this directory as if it actually contained the files.
+# This line used to have $dest instead of $x.
+# $dest seemed to be wrong for links found in subdirectories
+# of ${INPUT}.  Does this change break anything?
+	  treetops="$treetops $x ${LIB}/$file"
+	fi
+      fi
+      cd $cwd
+    fi
+  done
+fi
+
+# Completely replace <_int_varargs.h> with a file that defines
+# va_list and gnuc_va_list
+
+file=_int_varargs.h
+if [ -r ${INPUT}/$file ]; then
+  echo Replacing $file
+  cat > ${LIB}/$file << EOF
+/* This file was generated by fixinc.dgux.  */
+#ifndef __INT_VARARGS_H
+#define __INT_VARARGS_H
+
+#if defined(__m88k__) && defined (__DGUX__)
+#ifndef __GNUC_VA_LIST
+#define __GNUC_VA_LIST
+typedef struct
+{
+  int  __va_arg;		/* argument number */
+  int *__va_stk;		/* start of args passed on stack */
+  int *__va_reg;		/* start of args passed in regs */
+} __gnuc_va_list;
+#endif /* not __GNUC_VA_LIST */
+#endif /* 88k && dgux */
+
+#ifndef _VA_LIST_
+#define _VA_LIST_
+typedef __gnuc_va_list va_list;
+#endif /* _VA_LIST_ */
+
+#endif /* __INT_VARARGS_H */
+
+EOF
+  chmod a+r ${LIB}/$file
+fi
+
+echo 'Removing unneeded directories:'
+cd $LIB
+files=`find . -type d -print | sort -r`
+for file in $files; do
+  rmdir $LIB/$file > /dev/null 2>&1
+done
+
+if $LINKS; then
+  echo 'Making internal symbolic non-directory links'
+  cd ${INPUT}
+  files=`find . -type l -print`
+  for file in $files; do
+    dest=`ls -ld $file | sed -n 's/.*-> //p'`
+    if expr "$dest" : '[^/].*' > /dev/null; then    
+      target=${LIB}/`echo file | sed "s|[^/]*\$|$dest|"`
+      if [ -f $target ]; then
+        ln -s $dest ${LIB}/$file >/dev/null 2>&1
+      fi
+    fi
+  done
+fi
+
+cd ${ORIG_DIR}
+
+exit 0
+
diff --git a/gcc/fixinc/fixinc.irix b/gcc/fixinc/fixinc.irix
new file mode 100755
index 0000000..6562581
--- /dev/null
+++ b/gcc/fixinc/fixinc.irix
@@ -0,0 +1,225 @@
+#! /bin/sh
+# Install modified versions of certain problematic Irix include files.
+# If possible, create a wrapper (see fixinc.wrap) instead of copying files.
+#
+# Copyright (C) 1997 Free Software Foundation, Inc.
+# Contributed by Brendan Kehoe (brendan@cygnus.com).
+#
+# This file is part of GNU CC.
+# 
+# GNU CC is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+# 
+# GNU CC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GNU CC; see the file COPYING.  If not, write to
+# the Free Software Foundation, 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+#
+#	See README-fixinc for more information.
+
+# Directory containing the original header files.
+INPUT=${2-${INPUT-/usr/include}}
+
+# Fail if no arg to specify a directory for the output.
+if [ x$1 = x ]
+then echo fixincludes: no output directory specified
+exit 1
+fi
+
+# Directory in which to store the results.
+LIB=${1?"fixincludes: output directory not specified"}
+
+# Make sure it exists.
+if [ ! -d $LIB ]; then
+  mkdir $LIB || exit 1
+fi
+
+ORIG_DIR=`pwd`
+
+# Make LIB absolute if it is relative.
+# Don't do this if not necessary, since may screw up automounters.
+case $LIB in
+/*)
+	;;
+*)
+ 	LIB=$ORIG_DIR/$LIB
+	;;
+esac
+
+echo 'Building fixincludes in ' ${LIB}
+
+#
+# Note: For Irix, we deliberately don't try to create the directory trees,
+#       since we only modify math.h, limits.h and unistd.h.  If we
+#	ADD ANY OTHERS, the "Making directories:" and symlinks code from
+#	fixinc.svr4 may have to go back in.
+
+# This math.h fix is copied from fixinc.wrap.  We want to avoid copying
+# math.h because both math.h and stdlib.h have a declaration for initstate,
+# and this declaration changed between Irix 6.2 and Irix 6.3.  If we copy this
+# file, then the same toolchain can't be shared between 6.2 and 6.3+.
+
+# Some math.h files define struct exception, which conflicts with
+# the class exception defined in the C++ file std/stdexcept.h.  We
+# redefine it to __math_exception.  This is not a great fix, but I
+# haven't been able to think of anything better.
+file=math.h
+if [ -r $INPUT/$file ]; then
+  echo Checking $INPUT/$file
+  if grep 'struct exception' $INPUT/$file >/dev/null
+  then
+    echo Fixed $file
+    rm -f $LIB/$file
+    cat <<'__EOF__' >$LIB/$file
+#ifndef _MATH_H_WRAPPER
+#ifdef __cplusplus
+# define exception __math_exception
+#endif
+#include_next <math.h>
+#ifdef __cplusplus
+# undef exception
+#endif
+#define _MATH_H_WRAPPER
+#endif /* _MATH_H_WRAPPER */
+__EOF__
+    # Define _MATH_H_WRAPPER at the end of the wrapper, not the start,
+    # so that if #include_next gets another instance of the wrapper,
+    # this will follow the #include_next chain until we arrive at
+    # the real <math.h>.
+    chmod a+r $LIB/$file
+  fi
+fi
+
+# Avoid the definition of the bool type in curses.h when using
+# g++, since it's now an official type in the C++ language.
+
+# This is also from fixinc.wrap.
+
+file=curses.h
+if [ -r $INPUT/$file ]; then
+  echo Checking $INPUT/$file
+  w='[	 ]'
+  if grep "typedef$w$w*char$w$w*bool$w*;" $INPUT/$file >/dev/null
+  then
+    echo Fixed $file
+    rm -f $LIB/$file
+    cat <<'__EOF__' >$LIB/$file
+#ifndef _CURSES_H_WRAPPER
+#ifdef __cplusplus
+# define bool __curses_bool_t
+#endif
+#include_next <curses.h>
+#ifdef __cplusplus
+# undef bool
+#endif
+#define _CURSES_H_WRAPPER
+#endif /* _CURSES_H_WRAPPER */
+__EOF__
+    # Define _CURSES_H_WRAPPER at the end of the wrapper, not the start,
+    # so that if #include_next gets another instance of the wrapper,
+    # this will follow the #include_next chain until we arrive at
+    # the real <curses.h>.
+    chmod a+r $LIB/$file
+  fi
+fi
+
+# In limits.h, put #ifndefs around things that are supposed to be defined
+# in float.h to avoid redefinition errors if float.h is included first.
+
+file=limits.h
+base=`basename $file`
+if [ -r ${LIB}/$file ]; then
+  file_to_fix=${LIB}/$file
+else
+  if [ -r ${INPUT}/$file ]; then
+    file_to_fix=${INPUT}/$file
+  else
+    file_to_fix=""
+  fi
+fi
+if [ \! -z "$file_to_fix" ]; then
+  echo Checking $file_to_fix
+  sed -e '/[ 	]FLT_MIN[ 	]/i\
+#ifndef FLT_MIN
+'\
+      -e '/[ 	]FLT_MIN[ 	]/a\
+#endif
+'\
+      -e '/[ 	]FLT_MAX[ 	]/i\
+#ifndef FLT_MAX
+'\
+      -e '/[ 	]FLT_MAX[ 	]/a\
+#endif
+'\
+      -e '/[ 	]FLT_DIG[ 	]/i\
+#ifndef FLT_DIG
+'\
+      -e '/[ 	]FLT_DIG[ 	]/a\
+#endif
+'\
+      -e '/[ 	]DBL_MIN[ 	]/i\
+#ifndef DBL_MIN
+'\
+      -e '/[ 	]DBL_MIN[ 	]/a\
+#endif
+'\
+      -e '/[ 	]DBL_MAX[ 	]/i\
+#ifndef DBL_MAX
+'\
+      -e '/[ 	]DBL_MAX[ 	]/a\
+#endif
+'\
+      -e '/[ 	]DBL_DIG[ 	]/i\
+#ifndef DBL_DIG
+'\
+      -e '/[ 	]DBL_DIG[ 	]/a\
+#endif
+' $file_to_fix > /tmp/$base
+  if cmp $file_to_fix /tmp/$base >/dev/null 2>&1; then \
+    true
+  else
+    echo Fixed $file_to_fix
+    rm -f ${LIB}/$file
+    cp /tmp/$base ${LIB}/$file
+    chmod a+r ${LIB}/$file
+  fi
+  rm -f /tmp/$base
+fi
+
+# The Irix unistd.h will introduce a call to __vfork in its libc, but the
+# function is never actually prototyped.
+file=unistd.h
+base=`basename $file`
+if [ -r ${LIB}/$file ]; then
+  file_to_fix=${LIB}/$file
+else
+  if [ -r ${INPUT}/$file ]; then
+    file_to_fix=${INPUT}/$file
+  else
+    file_to_fix=""
+  fi
+fi
+if [ \! -z "$file_to_fix" ]; then
+  echo Checking $file_to_fix
+  sed -e '/__vfork/i\
+extern pid_t __vfork(void);'\
+     $file_to_fix > /tmp/$base
+  if cmp $file_to_fix /tmp/$base >/dev/null 2>&1; then \
+    true
+  else
+    echo Fixed $file_to_fix
+    rm -f ${LIB}/$file
+    cp /tmp/$base ${LIB}/$file
+    chmod a+r ${LIB}/$file
+  fi
+  rm -f /tmp/$base
+fi
+
+exit 0
diff --git a/gcc/fixinc/fixinc.ptx b/gcc/fixinc/fixinc.ptx
new file mode 100644
index 0000000..93a8f2c
--- /dev/null
+++ b/gcc/fixinc/fixinc.ptx
@@ -0,0 +1,257 @@
+#! /bin/sh
+# Install modified versions of certain ANSI-incompatible
+# native Sequent DYNIX/ptx System V Release 3.2 system include files.
+# Copyright (C) 1994, 1996, 1997 Free Software Foundation, Inc.
+# Contributed by Bill Burton <billb@progress.com>
+# Portions adapted from fixinc.svr4 and fixincludes.
+#
+# This file is part of GNU CC.
+# 
+# GNU CC is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+# 
+# GNU CC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GNU CC; see the file COPYING.  If not, write to
+# the Free Software Foundation, 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+#
+#	This script munges the native include files provided with DYNIX/ptx
+#	so as to remove things which are violations of the ANSI C standard.
+#	This is done by first running fixinc.svr4 which does most of the
+#	work.  A few includes have fixes made to them afterwards  by this
+#	script.  Once munged, the resulting new system include files are
+#	placed in a directory that GNU C will search *before* searching the
+#	/usr/include directory. This script should work properly for most
+#	DYNIX/ptx systems.  For other types of systems, you should use the
+#	`fixincludes' script instead.
+#
+#	See README-fixinc for more information.
+
+# Directory containing the original header files.
+INPUT=${2-${INPUT-/usr/include}}
+
+# Fail if no arg to specify a directory for the output.
+if [ x$1 = x ]
+then echo fixincludes: no output directory specified
+exit 1
+fi
+
+# Directory in which to store the results.
+LIB=${1?"fixincludes: output directory not specified"}
+
+# Make sure it exists.
+if [ ! -d $LIB ]; then
+  mkdir $LIB || exit 1
+fi
+
+ORIG_DIR=`pwd`
+
+# Make LIB absolute if it is relative.
+# Don't do this if not necessary, since may screw up automounters.
+case $LIB in
+/*)
+	;;
+*)
+ 	LIB=$ORIG_DIR/$LIB
+	;;
+esac
+
+echo 'Running fixinc.svr4'
+# DYNIX/ptx has dirname so this is no problem
+`dirname $0`/fixinc.svr4 $*
+echo 'Finished fixinc.svr4'
+
+echo 'Building fixincludes in ' ${LIB}
+
+# Copied from fixincludes.
+# Don't use or define the name va_list in stdio.h.
+# This is for ANSI and also to interoperate properly with gcc's varargs.h.
+file=stdio.h
+if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
+  cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
+  chmod +w ${LIB}/$file 2>/dev/null
+  chmod a+r ${LIB}/$file 2>/dev/null
+fi
+
+if [ -r ${LIB}/$file ]; then
+  echo Fixing $file, use of va_list
+  # Arrange for stdio.h to use stdarg.h to define __gnuc_va_list
+  (echo "#define __need___va_list"
+   echo "#include <stdarg.h>") > ${LIB}/${file}.sed
+  # Use __gnuc_va_list in arg types in place of va_list.
+  # On 386BSD use __gnuc_va_list instead of _VA_LIST_. We're hoping the
+  # trailing parentheses and semicolon save all other systems from this.
+  # Define __va_list__ (something harmless and unused) instead of va_list.
+  # Don't claim to have defined va_list.
+  sed -e 's@ va_list @ __gnuc_va_list @' \
+      -e 's@ va_list)@ __gnuc_va_list)@' \
+      -e 's@ _VA_LIST_));@ __gnuc_va_list));@' \
+      -e 's@ va_list@ __va_list__@' \
+      -e 's@\*va_list@*__va_list__@' \
+      -e 's@ __va_list)@ __gnuc_va_list)@' \
+      -e 's@_NEED___VA_LIST@_NEED___Va_LIST@' \
+      -e 's@VA_LIST@DUMMY_VA_LIST@' \
+      -e 's@_NEED___Va_LIST@_NEED___VA_LIST@' \
+    ${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
+
+# In pwd.h, PTX 1.x needs stdio.h included since FILE * was added in a
+# prototype later on in the file.
+file=pwd.h
+base=`basename $file`
+if [ -r ${LIB}/$file ]; then
+  file_to_fix=${LIB}/$file
+else
+  if [ -r ${INPUT}/$file ]; then
+    file_to_fix=${INPUT}/$file
+  else
+    file_to_fix=""
+  fi
+fi
+if [ \! -z "$file_to_fix" ]; then
+  echo Checking $file_to_fix
+  if grep stdio $file_to_fix > /dev/null; then
+    true
+  else
+    sed -e '/#include <sys\/types\.h>/a\
+\
+#if defined(__STDC__) || defined(__cplusplus)\
+#include <stdio.h>\
+#endif  /* __STDC__ */
+' \
+    $file_to_fix > ${LIB}/${file}.sed
+    rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
+    echo Fixed $file_to_fix
+  fi
+fi
+
+# Copied from fixincludes.
+# math.h puts the declaration of matherr before the definition
+# of struct exception, so the prototype (added by fixproto) causes havoc.
+file=math.h
+if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
+  cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
+  chmod +w ${LIB}/$file 2>/dev/null
+  chmod a+r ${LIB}/$file 2>/dev/null
+fi
+
+if [ -r ${LIB}/$file ]; then
+  echo Fixing $file, matherr declaration
+  sed -e '/^struct exception/,$b' \
+      -e '/matherr/i\
+struct exception;
+'\
+    ${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
+
+# In netinet/in.h, the network byte swapping asm functions supported by the
+# native cc compiler on PTX 1.x and 2.x is not supported in gcc.  Instead,
+# include <sys/byteorder.h> written out by the fixinc.svr4 script which has
+# these same routines written in an asm format supported by gcc.
+file=netinet/in.h
+base=`basename $file`
+if [ -r ${LIB}/$file ]; then
+  file_to_fix=${LIB}/$file
+else
+  if [ -r ${INPUT}/$file ]; then
+    file_to_fix=${INPUT}/$file
+  else
+    file_to_fix=""
+  fi
+fi
+if [ \! -z "$file_to_fix" ]; then
+  echo Checking $file_to_fix
+  if grep __GNUC__ $file_to_fix > /dev/null; then
+    true
+  else
+    sed -e '/#define NETSWAP/a\
+\
+#if defined (__GNUC__) || defined (__GNUG__)\
+#include <sys/byteorder.h>\
+#else  /* not __GNUC__ */
+' \
+    -e '/#endif[ 	]*\/\* NETSWAP \*\//i\
+#endif /* not __GNUC__ */
+' \
+    $file_to_fix > ${LIB}/${file}.sed
+    rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
+    echo Fixed $file_to_fix
+  fi
+fi
+
+# /usr/include/sys/mc_param.h has an embedded asm for the cpuid instruction
+# on the P5. This is not used by anything else so we ifdef it out.
+file=sys/mc_param.h
+if [ -r ${LIB}/$file ]; then
+  file_to_fix=${LIB}/$file
+else
+  if [ -r ${INPUT}/$file ]; then
+    file_to_fix=${INPUT}/$file
+  else
+    file_to_fix=""
+  fi
+fi
+if [ \! -z "$file_to_fix" ]; then
+  echo Checking $file_to_fix
+  if grep __GNUC__ $file_to_fix > /dev/null; then
+    true
+  else
+    sed -e '/__asm/,/}/{
+/__asm/i\
+#if !defined (__GNUC__) && !defined (__GNUG__)
+/}/a\
+#endif
+}' \
+    $file_to_fix > ${LIB}/${file}.sed
+    rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
+    echo Fixed $file_to_fix
+  fi
+fi
+
+# /usr/include/sys/mc_param.h has an embedded asm for the cpuid instruction
+# on the P5. This is not used by anything else so we ifdef it out.
+file=sys/mc_param.h
+if [ -r ${LIB}/$file ]; then
+  file_to_fix=${LIB}/$file
+else
+  if [ -r ${INPUT}/$file ]; then
+    file_to_fix=${INPUT}/$file
+  else
+    file_to_fix=""
+  fi
+fi
+if [ \! -z "$file_to_fix" ]; then
+  echo Checking $file_to_fix
+  if grep __GNUC__ $file_to_fix > /dev/null; then
+    true
+  else
+    sed -e '/__asm/,/}/{
+/__asm/i\
+#if !defined (__GNUC__) && !defined (__GNUG__)
+/}/a\
+#endif
+}' \
+    $file_to_fix > ${LIB}/${file}.sed
+    rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
+    echo Fixed $file_to_fix
+  fi
+fi
+
+exit 0
+
diff --git a/gcc/fixinc/fixinc.sco b/gcc/fixinc/fixinc.sco
new file mode 100755
index 0000000..205a882
--- /dev/null
+++ b/gcc/fixinc/fixinc.sco
@@ -0,0 +1,427 @@
+#! /bin/sh
+#
+#   fixinc.sco  --  Install modified versions of SCO system include
+#   files.
+#
+#   Based on fixinc.svr4 script by Ron Guilmette (rfg@ncd.com) (SCO
+#   modifications by Ian Lance Taylor (ian@airs.com)).
+#
+# Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+#
+# This file is part of GNU CC.
+# 
+# GNU CC is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+# 
+# GNU CC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GNU CC; see the file COPYING.  If not, write to
+# the Free Software Foundation, 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+#
+#	This script munges the native include files provided with SCO
+#	3.2v4 systems so as to provide a reasonable namespace when
+#	compiling with gcc.  The header files by default do not
+#	provide many essential definitions and declarations if
+#	__STDC__ is 1.  This script modifies the header files to check
+#	for __STRICT_ANSI__ being defined instead.  Once munged, the
+#	resulting new system include files are placed in a directory
+#	that GNU C will search *before* searching the /usr/include
+#	directory.  This script should work properly for most SCO
+#	3.2v4 systems.  For other types of systems, you should use the
+#	`fixincludes' or the `fixinc.svr4' script instead.
+#
+#	See README-fixinc for more information.
+
+# Directory containing the original header files.
+INPUT=${2-${INPUT-/usr/include}}
+
+# Fail if no arg to specify a directory for the output.
+if [ x$1 = x ]
+then echo fixincludes: no output directory specified
+exit 1
+fi
+
+# Directory in which to store the results.
+LIB=${1?"fixincludes: output directory not specified"}
+
+# Make sure it exists.
+if [ ! -d $LIB ]; then
+  mkdir $LIB || exit 1
+fi
+
+ORIG_DIR=`pwd`
+
+# Make LIB absolute if it is relative.
+# Don't do this if not necessary, since may screw up automounters.
+case $LIB in
+/*)
+	;;
+*)
+	cd $LIB; LIB=`${PWDCMD-pwd}`
+	;;
+esac
+
+echo 'Building fixincludes in ' ${LIB}
+
+# Determine whether this filesystem has symbolic links.
+if ln -s X $LIB/ShouldNotExist 2>/dev/null; then
+  rm -f $LIB/ShouldNotExist
+  LINKS=true
+else
+  LINKS=false
+fi
+
+echo 'Making directories:'
+cd ${INPUT}
+if $LINKS; then
+  files=`ls -LR | sed -n s/:$//p`
+else
+  files=`find . -type d -print | sed '/^.$/d'`
+fi
+for file in $files; do
+  rm -rf $LIB/$file
+  if [ ! -d $LIB/$file ]
+  then mkdir $LIB/$file
+  fi
+done
+
+# treetops gets an alternating list
+# of old directories to copy
+# and the new directories to copy to.
+treetops="${INPUT} ${LIB}"
+
+if $LINKS; then
+  echo 'Making internal symbolic directory links'
+  for file in $files; do
+    dest=`ls -ld $file | sed -n 's/.*-> //p'`
+    if [ "$dest" ]; then    
+      cwd=`pwd`
+      # In case $dest is relative, get to $file's dir first.
+      cd ${INPUT}
+      cd `echo ./$file | sed -n 's&[^/]*$&&p'`
+      # Check that the target directory exists.
+      # Redirections changed to avoid bug in sh on Ultrix.
+      (cd $dest) > /dev/null 2>&1
+      if [ $? = 0 ]; then
+	cd $dest
+	# X gets the dir that the link actually leads to.
+	x=`pwd`
+	# If link leads back into ${INPUT},
+	# make a similar link here.
+	if expr $x : "${INPUT}/.*" > /dev/null; then
+	  # Y gets the actual target dir name, relative to ${INPUT}.
+	  y=`echo $x | sed -n "s&${INPUT}/&&p"`
+	  echo $file '->' $y ': Making link'
+	  rm -fr ${LIB}/$file > /dev/null 2>&1
+	  ln -s ${LIB}/$y ${LIB}/$file > /dev/null 2>&1
+	else
+	  # If the link is to outside ${INPUT},
+	  # treat this directory as if it actually contained the files.
+# This line used to have $dest instead of $x.
+# $dest seemed to be wrong for links found in subdirectories
+# of ${INPUT}.  Does this change break anything?
+	  treetops="$treetops $x ${LIB}/$file"
+	fi
+      fi
+      cd $cwd
+    fi
+  done
+fi
+
+set - $treetops
+while [ $# != 0 ]; do
+  # $1 is an old directory to copy, and $2 is the new directory to copy to.
+  echo "Finding header files in $1:"
+  cd ${INPUT}
+  cd $1
+  files=`find . -name '*.h' -type f -print`
+  echo 'Checking header files:'
+  for file in $files; do
+    if egrep '!__STDC__' $file >/dev/null; then
+      if [ -r $file ]; then
+	cp $file $2/$file >/dev/null 2>&1 || echo "Can't copy $file"
+	chmod +w $2/$file
+	chmod a+r $2/$file
+
+# The following have been removed from the sed command below
+# because it is more useful to leave these things in.
+# The only reason to remove them was for -pedantic,
+# which isn't much of a reason. -- rms.
+#	  /^[ 	]*#[ 	]*ident/d
+
+	sed -e '
+	  s/!__STDC__/!defined (__STRICT_ANSI__)/g
+	' $2/$file > $2/$file.sed
+	mv $2/$file.sed $2/$file
+	if cmp $file $2/$file >/dev/null 2>&1; then
+	   rm $2/$file
+	else
+	   echo Fixed $file
+	fi
+      fi
+    fi
+  done
+  shift; shift
+done
+
+# We shouldn't stay in the directory we just copied.
+cd ${INPUT}
+
+# Fix first broken decl of getcwd present on some svr4 systems.
+
+file=stdlib.h
+base=`basename $file`
+if [ -r ${LIB}/$file ]; then
+  file_to_fix=${LIB}/$file
+else
+  if [ -r ${INPUT}/$file ]; then
+    file_to_fix=${INPUT}/$file
+  else
+    file_to_fix=""
+  fi
+fi
+if [ \! -z "$file_to_fix" ]; then
+  echo Checking $file_to_fix
+  sed -e 's/getcwd(char \{0,\}\*, int)/getcwd(char *, size_t)/' $file_to_fix > /tmp/$base
+  if cmp $file_to_fix /tmp/$base >/dev/null 2>&1; then \
+    true
+  else
+    echo Fixed $file_to_fix
+    rm -f ${LIB}/$file
+    cp /tmp/$base ${LIB}/$file
+    chmod a+r ${LIB}/$file
+  fi
+  rm -f /tmp/$base
+fi
+
+# Fix second broken decl of getcwd present on some svr4 systems.  Also
+# fix the incorrect decl of profil present on some svr4 systems.
+
+file=unistd.h
+base=`basename $file`
+if [ -r ${LIB}/$file ]; then
+  file_to_fix=${LIB}/$file
+else
+  if [ -r ${INPUT}/$file ]; then
+    file_to_fix=${INPUT}/$file
+  else
+    file_to_fix=""
+  fi
+fi
+if [ \! -z "$file_to_fix" ]; then
+  echo Checking $file_to_fix
+  sed -e 's/getcwd(char \*, int)/getcwd(char *, size_t)/' $file_to_fix \
+    | sed -e 's/profil(unsigned short \*, unsigned int, unsigned int, unsigned int)/profil(unsigned short *, size_t, int, unsigned)/' > /tmp/$base
+  if cmp $file_to_fix /tmp/$base >/dev/null 2>&1; then \
+    true
+  else
+    echo Fixed $file_to_fix
+    rm -f ${LIB}/$file
+    cp /tmp/$base ${LIB}/$file
+    chmod a+r ${LIB}/$file
+  fi
+  rm -f /tmp/$base
+fi
+
+# Fix third broken decl of getcwd on SCO.  Also fix incorrect decl of
+# link.
+file=prototypes.h
+base=`basename $file`
+if [ -r ${LIB}/$file ]; then
+  file_to_fix=${LIB}/$file
+else
+  if [ -r ${INPUT}/$file ]; then
+    file_to_fix=${INPUT}/$file
+  else
+    file_to_fix=""
+  fi
+fi
+if [ \! -z "$file_to_fix" ]; then
+  echo Checking $file_to_fix
+  sed -e 's/getcwd(char \*, int)/getcwd(char *, size_t)/' $file_to_fix \
+    | sed -e 's/const  int	link(const char \*, char \*)/extern  int	link(const char *, const char *)/' > /tmp/$base
+  if cmp $file_to_fix /tmp/$base >/dev/null 2>&1; then \
+    true
+  else
+    echo Fixed $file_to_fix
+    rm -f ${LIB}/$file
+    cp /tmp/$base ${LIB}/$file
+    chmod a+r ${LIB}/$file
+  fi
+  rm -f /tmp/$base
+fi
+
+# Fix an error in this file: the #if says _cplusplus, not the double
+# underscore __cplusplus that it should be
+file=tinfo.h
+if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
+  mkdir ${LIB}/rpcsvc 2>/dev/null
+  cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
+  chmod +w ${LIB}/$file 2>/dev/null
+  chmod a+r ${LIB}/$file 2>/dev/null
+fi
+
+if [ -r ${LIB}/$file ]; then
+  echo Fixing $file, __cplusplus macro
+  sed -e 's/[ 	]_cplusplus/ __cplusplus/' ${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 ${LIB}/$file
+  fi
+fi
+
+# Fix prototype declaration of utime in sys/times.h.  In 3.2v4.0 the
+# const is missing.
+file=sys/times.h
+if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
+  cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
+  chmod +w ${LIB}/$file 2>/dev/null
+  chmod a+r ${LIB}/$file 2>/dev/null
+fi
+
+if [ -r ${LIB}/$file ]; then
+  echo Fixing $file, utime prototype
+  sed -e 's/(const char \*, struct utimbuf \*);/(const char *, const struct utimbuf *);/' ${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 ${LIB}/$file
+  fi
+fi
+
+# This function is borrowed from fixinclude.svr4
+# The OpenServer math.h defines struct exception, which conflicts with
+# the class exception defined in the C++ file std/stdexcept.h.  We
+# redefine it to __math_exception.  This is not a great fix, but I
+# haven't been able to think of anything better.
+#
+# OpenServer's math.h declares abs as inline int abs...  Unfortunately,
+# we blow over that one (with C++ linkage) and stick a new one in stdlib.h
+# with C linkage.   So we eat the one out of math.h.
+file=math.h
+base=`basename $file`
+if [ -r ${LIB}/$file ]; then
+  file_to_fix=${LIB}/$file
+else
+  if [ -r ${INPUT}/$file ]; then
+    file_to_fix=${INPUT}/$file
+  else
+    file_to_fix=""
+  fi
+fi
+if [ \! -z "$file_to_fix" ]; then
+  echo Checking $file_to_fix
+  sed -e '/struct exception/i\
+#ifdef __cplusplus\
+#define exception __math_exception\
+#endif'\
+      -e '/struct exception/a\
+#ifdef __cplusplus\
+#undef exception\
+#endif' \
+      -e 's@inline int abs(int [a-z][a-z]*) {.*}@extern "C" int abs(int);@' \
+ $file_to_fix > /tmp/$base
+  if cmp $file_to_fix /tmp/$base >/dev/null 2>&1; then \
+    true
+  else
+    echo Fixed $file_to_fix
+    rm -f ${LIB}/$file
+    cp /tmp/$base ${LIB}/$file
+    chmod a+r ${LIB}/$file
+  fi
+  rm -f /tmp/$base
+fi
+
+#
+# Also, the static functions lstat() and fchmod() in <sys/stat.h> 
+# cause G++ grief since they're not wrapped in "if __cplusplus".   
+# Fix that up now.
+#
+file=sys/stat.h
+if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
+  cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
+  chmod +w ${LIB}/$file 2>/dev/null
+  chmod a+r ${LIB}/$file 2>/dev/null
+fi
+
+if [ -r ${LIB}/$file ]; then
+  echo Fixing $file, static definitions not C++-aware.
+  sed -e '/^static int[ 	]*/i\
+#if __cplusplus\
+extern "C"\
+{\
+#endif /* __cplusplus */ \
+' \
+-e '/^}$/a\
+#if __cplusplus\
+}\
+#endif /* __cplusplus */ \
+' ${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
+
+# This fix has the regex modified from the from fixinc.wrap
+# Avoid the definition of the bool type in the following files when using
+# g++, since it's now an official type in the C++ language.
+for file in term.h tinfo.h
+do
+  if [ -r $INPUT/$file ]; then
+    echo Checking $INPUT/$file
+    w='[	 ]'
+    if grep "typedef$w.*char$w.*bool$w*;" $INPUT/$file >/dev/null
+    then
+      echo Fixed $file
+      rm -f $LIB/$file
+      cat <<'__EOF__' >$LIB/$file
+#ifndef _CURSES_H_WRAPPER
+#ifdef __cplusplus
+# define bool __curses_bool_t
+#endif
+#include_next <curses.h>
+#ifdef __cplusplus
+# undef bool
+#endif
+#define _CURSES_H_WRAPPER
+#endif /* _CURSES_H_WRAPPER */
+__EOF__
+      # Define _CURSES_H_WRAPPER at the end of the wrapper, not the start,
+      # so that if #include_next gets another instance of the wrapper,
+      # this will follow the #include_next chain until we arrive at
+      # the real <curses.h>.
+      chmod a+r $LIB/$file
+    fi
+  fi
+done
+
+echo 'Removing unneeded directories:'
+cd $LIB
+files=`find . -type d -print | sort -r`
+for file in $files; do
+  rmdir $LIB/$file > /dev/null 2>&1
+done
+
+if $LINKS; then
+  echo 'Making internal symbolic non-directory links'
+  cd ${INPUT}
+  files=`find . -type l -print`
+  for file in $files; do
+    dest=`ls -ld $file | sed -n 's/.*-> //p'`
+    if expr "$dest" : '[^/].*' > /dev/null; then    
+      target=${LIB}/`echo file | sed "s|[^/]*\$|$dest|"`
+      if [ -f $target ]; then
+        ln -s $dest ${LIB}/$file >/dev/null 2>&1
+      fi
+    fi
+  done
+fi
+
+exit 0
diff --git a/gcc/fixinc/fixinc.svr4 b/gcc/fixinc/fixinc.svr4
new file mode 100755
index 0000000..46e07ce
--- /dev/null
+++ b/gcc/fixinc/fixinc.svr4
@@ -0,0 +1,1726 @@
+#! /bin/sh
+# Install modified versions of certain ANSI-incompatible
+# native System V Release 4 system include files.
+# Copyright (C) 1994, 1996, 1997 Free Software Foundation, Inc.
+# Contributed by Ron Guilmette (rfg@monkeys.com).
+#
+# This file is part of GNU CC.
+# 
+# GNU CC is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+# 
+# GNU CC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GNU CC; see the file COPYING.  If not, write to
+# the Free Software Foundation, 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+#
+#	This script munges the native include files provided with System V
+#	Release 4 systems so as to remove things which are violations of the
+#	ANSI C standard.  Once munged, the resulting new system include files
+#	are placed in a directory that GNU C will search *before* searching
+#	the /usr/include directory. This script should work properly for most
+#	System V Release 4 systems.  For other types of systems, you should
+#	use the `fixincludes' script instead.
+#
+#	See README-fixinc for more information.
+
+# Directory containing the original header files.
+INPUT=${2-${INPUT-/usr/include}}
+
+# Fail if no arg to specify a directory for the output.
+if [ x$1 = x ]
+then echo fixincludes: no output directory specified
+exit 1
+fi
+
+# Directory in which to store the results.
+LIB=${1?"fixincludes: output directory not specified"}
+
+# Make sure it exists.
+if [ ! -d $LIB ]; then
+  mkdir $LIB || exit 1
+fi
+
+ORIG_DIR=`pwd`
+
+# Make LIB absolute if it is relative.
+# Don't do this if not necessary, since may screw up automounters.
+case $LIB in
+/*)
+	;;
+*)
+ 	LIB=$ORIG_DIR/$LIB
+	;;
+esac
+
+echo 'Building fixincludes in ' ${LIB}
+
+# Determine whether this filesystem has symbolic links.
+if ln -s X $LIB/ShouldNotExist 2>/dev/null; then
+  rm -f $LIB/ShouldNotExist
+  LINKS=true
+else
+  LINKS=false
+fi
+
+echo 'Making directories:'
+cd ${INPUT}
+if $LINKS; then
+  files=`find . -follow -type d -print 2>/dev/null | sed '/^.$/d'`
+else
+  files=`find . -type d -print | sed '/^.$/d'`
+fi
+for file in $files; do
+  rm -rf $LIB/$file
+  if [ ! -d $LIB/$file ]
+  then mkdir $LIB/$file
+  fi
+done
+
+# treetops gets an alternating list
+# of old directories to copy
+# and the new directories to copy to.
+treetops="${INPUT} ${LIB}"
+
+if $LINKS; then
+  echo 'Making internal symbolic directory links'
+  for file in $files; do
+    dest=`ls -ld $file | sed -n 's/.*-> //p'`
+    if [ "$dest" ]; then    
+      cwd=`pwd`
+      # In case $dest is relative, get to $file's dir first.
+      cd ${INPUT}
+      cd `echo ./$file | sed -n 's&[^/]*$&&p'`
+      rwd=`pwd`
+      # Check that the target directory exists.
+      # Redirections changed to avoid bug in sh on Ultrix.
+      (cd $dest) > /dev/null 2>&1
+      if [ $? = 0 ]; then
+	cd $dest
+	# X gets the dir that the link actually leads to.
+	x=`pwd`
+	# If link leads back into ${INPUT},
+	# make a similar link here.
+        if expr "$dest" : '[^/][^/]*' >/dev/null && [ ! -h $dest ]; then
+          echo $file '->'  $dest': Making link'
+          rm -fr ${LIB}/$file > /dev/null 2>&1
+          ln -s $dest ${LIB}/$file > /dev/null 2>&1
+	elif expr $x : "${INPUT}/.*" > /dev/null; then
+	  # Y gets the actual target dir name, relative to ${INPUT}.
+	  y=`echo $x | sed -n "s&${INPUT}/&&p"`
+	  # DOTS is the relative path from ${LIB}/$file's dir back to ${LIB}.
+	  dots=`echo "$file" |
+	    sed -e 's@^./@@' -e 's@/./@/@g' -e 's@[^/][^/]*@..@g' -e 's@..$@@'`
+	  echo $file '->' $dots$y ': Making link'
+	  rm -fr ${LIB}/$file > /dev/null 2>&1
+	  ln -s $dots$y ${LIB}/$file > /dev/null 2>&1
+	elif expr $x : "${rwd}/.*" > /dev/null; then
+	  # Y gets the actual target dir name, relative to the directory where the link is.
+	  y=`echo $x | sed -n "s&${rwd}/&&p"`
+	  # DOTS is the relative path from ${LIB}/$file's dir back to ${LIB}.
+	  dots=`echo "$file" |
+	    sed -e 's@^./@@' -e 's@/./@/@g' -e 's@[^/][^/]*@..@g' -e 's@..$@@'`
+	  echo $file '->' $dots$y ': Making link'
+	  rm -fr ${LIB}/$file > /dev/null 2>&1
+	  ln -s $dots$y ${LIB}/$file > /dev/null 2>&1
+	else
+	  # If the link is to outside ${INPUT},
+	  # treat this directory as if it actually contained the files.
+# This line used to have $dest instead of $x.
+# $dest seemed to be wrong for links found in subdirectories
+# of ${INPUT}.  Does this change break anything?
+	  treetops="$treetops $x ${LIB}/$file"
+	fi
+      fi
+      cd $cwd
+    fi
+  done
+fi
+
+set - $treetops
+while [ $# != 0 ]; do
+  # $1 is an old directory to copy, and $2 is the new directory to copy to.
+  echo "Finding header files in $1:"
+  cd ${INPUT}
+  cd $1
+  files=`find . -name '*.h' -type f -print`
+  echo 'Checking header files:'
+  for file in $files; do
+      if [ -r $file ]; then
+	cp $file $2/$file >/dev/null 2>&1 || echo "Can't copy $file"
+	chmod +w $2/$file
+	chmod a+r $2/$file
+
+# The following have been removed from the sed command below
+# because it is more useful to leave these things in.
+# The only reason to remove them was for -pedantic,
+# which isn't much of a reason. -- rms.
+#	  /^[ 	]*#[ 	]*ident/d
+
+# This code makes Solaris SCSI fail, because it changes the
+# alignment within some critical structures.  See <sys/scsi/impl/commands.h>.
+#	  s/u_char\([ 	][ 	]*[a-zA-Z0-9_][a-zA-Z0-9_]*[ 	]*:[ 	]*[0-9][0-9]*\)/u_int\1/
+# Disable these also, since they probably aren't safe either.
+#	  s/u_short\([ 	][ 	]*[a-zA-Z0-9_][a-zA-Z0-9_]*[ 	]*:[ 	]*[0-9][0-9]*\)/u_int\1/
+#	  s/ushort\([ 	][ 	]*[a-zA-Z0-9_][a-zA-Z0-9_]*[ 	]*:[ 	]*[0-9][0-9]*\)/u_int\1/
+#	  s/evcm_t\([ 	][ 	]*[a-zA-Z0-9_][a-zA-Z0-9_]*[ 	]*:[ 	]*[0-9][0-9]*\)/u_int\1/
+#	  s/Pbyte\([ 	][ 	]*[a-zA-Z0-9_][a-zA-Z0-9_]*[ 	]*:[ 	]*SEQSIZ\)/unsigned int\1/
+
+# The change of u_char, etc, to u_int
+# applies to bit fields.
+	sed -e '
+	  s%^\([ 	]*#[ 	]*else\)[ 	]*/[^*].*%\1%
+	  s%^\([ 	]*#[ 	]*else\)[ 	]*[^/ 	].*%\1%
+	  s%^\([ 	]*#[ 	]*endif\)[ 	]*/[^*].*%\1%
+	  s%^\([ 	]*#[ 	]*endif\)[ 	]*[^/ 	].*%\1%
+  	  s/#lint(on)/defined(lint)/g
+  	  s/#lint(off)/!defined(lint)/g
+  	  s/#machine(\([^)]*\))/defined(__\1__)/g
+  	  s/#system(\([^)]*\))/defined(__\1__)/g
+  	  s/#cpu(\([^)]*\))/defined(__\1__)/g
+	  /#[a-z]*if.*[	 (]m68k/		s/\([^_]\)m68k/\1__m68k__/g
+	  /#[a-z]*if.*[	 (]__i386\([^_]\)/	s/__i386/__i386__/g
+	  /#[a-z]*if.*[	 (]i386/		s/\([^_]\)i386/\1__i386__/g
+	  /#[a-z]*if.*[	 (!]__i860\([^_]\)/	s/__i860/__i860__/g
+	  /#[a-z]*if.*[	 (!]i860/		s/\([^_]\)i860/\1__i860__/g
+	  /#[a-z]*if.*[	 (]sparc/	s/\([^_]\)sparc/\1__sparc__/g
+	  /#[a-z]*if.*[	 (]mc68000/	s/\([^_]\)mc68000/\1__mc68000__/g
+	  /#[a-z]*if.*[	 (]vax/		s/\([^_]\)vax/\1__vax__/g
+	  /#[a-z]*if.*[	 (]sun/		s/\([^_]\)\(sun[a-z0-9]*\)\([^a-z0-9_]\)/\1__\2__\3/g
+	  /#[a-z]*if.*[	 (]sun/		s/\([^_]\)\(sun[a-z0-9]*\)$/\1__\2__/g
+	  /#[a-z]*if.*[	 (]ns32000/	s/\([^_]\)ns32000/\1__ns32000__/g
+	  /#[a-z]*if.*[	 (]pyr/		s/\([^_]\)pyr/\1__pyr__/g
+	  /#[a-z]*if.*[	 (]is68k/	s/\([^_]\)is68k/\1__is68k__/g
+	  s/__STDC__[ 	][ 	]*==[ 	][ 	]*0/!defined (__STRICT_ANSI__)/g
+	  s/__STDC__[ 	][ 	]*==[ 	][ 	]*1/defined (__STRICT_ANSI__)/g
+	  s/__STDC__[ 	][ 	]*!=[ 	][ 	]*0/defined (__STRICT_ANSI__)/g
+	  s/__STDC__[ 	][ 	]*!=[ 	][ 	]*1/!defined (__STRICT_ANSI__)/g
+	  s/__STDC__ - 0 == 0/!defined (__STRICT_ANSI__)/g
+	  s/__STDC__ - 0 == 1/defined (__STRICT_ANSI__)/g
+	  /^typedef[ 	][ 	]*[unsigned 	]*long[ 	][ 	]*[u_]*longlong_t;/s/long/long long/
+	' $2/$file > $2/$file.sed
+	mv $2/$file.sed $2/$file
+	if cmp $file $2/$file >/dev/null 2>&1; then
+	   rm $2/$file
+	else
+	   echo Fixed $file
+	fi
+      fi
+  done
+  shift; shift
+done
+
+# Install the proper definition of the three standard types in header files
+# that they come from.
+for file in sys/types.h stdlib.h sys/stdtypes.h stddef.h memory.h unistd.h; do
+  if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
+    cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
+    chmod +w ${LIB}/$file 2>/dev/null
+    chmod a+r ${LIB}/$file 2>/dev/null
+  fi
+
+  if [ -r ${LIB}/$file ]; then
+    echo Fixing size_t, ptrdiff_t and wchar_t in $file
+    sed \
+      -e '/typedef[ 	][ 	]*[a-z_][ 	a-z_]*[ 	]size_t/i\
+#ifndef __SIZE_TYPE__\
+#define __SIZE_TYPE__ long unsigned int\
+#endif
+' \
+      -e 's/typedef[ 	][ 	]*[a-z_][ 	a-z_]*[ 	]size_t/typedef __SIZE_TYPE__ size_t/' \
+      -e '/typedef[ 	][ 	]*[a-z_][ 	a-z_]*[ 	]ptrdiff_t/i\
+#ifndef __PTRDIFF_TYPE__\
+#define __PTRDIFF_TYPE__ long int\
+#endif
+' \
+      -e 's/typedef[ 	][ 	]*[a-z_][ 	a-z_]*[ 	]ptrdiff_t/typedef __PTRDIFF_TYPE__ ptrdiff_t/' \
+      -e '/typedef[ 	][ 	]*[a-z_][ 	a-z_]*[ 	]wchar_t/i\
+#ifndef __WCHAR_TYPE__\
+#define __WCHAR_TYPE__ int\
+#endif
+' \
+      -e 's/typedef[ 	][ 	]*[a-z_][ 	a-z_]*[ 	]wchar_t/typedef __WCHAR_TYPE__ wchar_t/' \
+      ${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 ${LIB}/$file
+    fi
+  fi
+done
+
+# Fix first broken decl of getcwd present on some svr4 systems.
+
+file=stdlib.h
+base=`basename $file`
+if [ -r ${LIB}/$file ]; then
+  file_to_fix=${LIB}/$file
+else
+  if [ -r ${INPUT}/$file ]; then
+    file_to_fix=${INPUT}/$file
+  else
+    file_to_fix=""
+  fi
+fi
+if [ \! -z "$file_to_fix" ]; then
+  echo Checking $file_to_fix
+  sed -e 's/getcwd(char \*, int)/getcwd(char *, size_t)/' $file_to_fix > /tmp/$base
+  if cmp $file_to_fix /tmp/$base >/dev/null 2>&1; then \
+    true
+  else
+    echo Fixed $file_to_fix
+    rm -f ${LIB}/$file
+    cp /tmp/$base ${LIB}/$file
+    chmod a+r ${LIB}/$file
+  fi
+  rm -f /tmp/$base
+fi
+
+# Fix second broken decl of getcwd present on some svr4 systems.  Also
+# fix the incorrect decl of profil present on some svr4 systems.
+
+file=unistd.h
+base=`basename $file`
+if [ -r ${LIB}/$file ]; then
+  file_to_fix=${LIB}/$file
+else
+  if [ -r ${INPUT}/$file ]; then
+    file_to_fix=${INPUT}/$file
+  else
+    file_to_fix=""
+  fi
+fi
+if [ \! -z "$file_to_fix" ]; then
+  echo Checking $file_to_fix
+  sed -e 's/getcwd(char \*, int)/getcwd(char *, size_t)/' $file_to_fix \
+    | sed -e 's/profil(unsigned short \*, unsigned int, unsigned int, unsigned int)/profil(unsigned short *, size_t, int, unsigned)/' > /tmp/$base
+  if cmp $file_to_fix /tmp/$base >/dev/null 2>&1; then \
+    true
+  else
+    echo Fixed $file_to_fix
+    rm -f ${LIB}/$file
+    cp /tmp/$base ${LIB}/$file
+    chmod a+r ${LIB}/$file
+  fi
+  rm -f /tmp/$base
+fi
+
+# Fix the definition of NULL in <sys/param.h> so that it is conditional
+# and so that it is correct for both C and C++.
+
+file=sys/param.h
+base=`basename $file`
+if [ -r ${LIB}/$file ]; then
+  file_to_fix=${LIB}/$file
+else
+  if [ -r ${INPUT}/$file ]; then
+    file_to_fix=${INPUT}/$file
+  else
+    file_to_fix=""
+  fi
+fi
+if [ \! -z "$file_to_fix" ]; then
+  echo Checking $file_to_fix
+  cp $file_to_fix /tmp/$base
+  chmod +w /tmp/$base
+  chmod a+r /tmp/$base
+  sed -e '/^#define[ 	]*NULL[ 	]*0$/c\
+#ifndef NULL\
+#ifdef __cplusplus\
+#define __NULL_TYPE\
+#else /* !defined(__cplusplus) */\
+#define __NULL_TYPE (void *)\
+#endif /* !defined(__cplusplus) */\
+#define NULL (__NULL_TYPE 0)\
+#endif /* !defined(NULL) */' /tmp/$base > /tmp/$base.sed
+  if cmp $file_to_fix /tmp/$base.sed >/dev/null 2>&1; then \
+    true
+  else
+    echo Fixed $file_to_fix
+    rm -f ${LIB}/$file
+    cp /tmp/$base.sed ${LIB}/$file
+    chmod a+r ${LIB}/$file
+  fi
+  rm -f /tmp/$base /tmp/$base.sed
+fi
+
+# Likewise fix the definition of NULL in <stdio.h> so that it is conditional
+# and so that it is correct for both C and C++.
+
+file=stdio.h
+base=`basename $file`
+if [ -r ${LIB}/$file ]; then
+  file_to_fix=${LIB}/$file
+else
+  if [ -r ${INPUT}/$file ]; then
+    file_to_fix=${INPUT}/$file
+  else
+    file_to_fix=""
+  fi
+fi
+if [ \! -z "$file_to_fix" ]; then
+  echo Checking $file_to_fix
+  cp $file_to_fix /tmp/$base
+  chmod +w /tmp/$base
+  sed -e '/^#define[ 	]*NULL[ 	]*0$/c\
+#ifdef __cplusplus\
+#define __NULL_TYPE\
+#else /* !defined(__cplusplus) */\
+#define __NULL_TYPE (void *)\
+#endif /* !defined(__cplusplus) */\
+#define NULL (__NULL_TYPE 0)' /tmp/$base > /tmp/$base.sed
+  if cmp $file_to_fix /tmp/$base.sed >/dev/null 2>&1; then \
+    true
+  else
+    echo Fixed $file_to_fix
+    rm -f ${LIB}/$file
+    cp /tmp/$base.sed ${LIB}/$file
+    chmod a+r ${LIB}/$file
+  fi
+  rm -f /tmp/$base /tmp/$base.sed
+fi
+
+# Likewise fix the definition of NULL in <dbm.h> so that it is conditional
+# and so that it is correct for both C and C++.
+
+file=dbm.h
+base=`basename $file`
+if [ -r ${LIB}/$file ]; then
+  file_to_fix=${LIB}/$file
+else
+  if [ -r ${INPUT}/$file ]; then
+    file_to_fix=${INPUT}/$file
+  else
+    file_to_fix=""
+  fi
+fi
+if [ \! -z "$file_to_fix" ]; then
+  echo Checking $file_to_fix
+  cp $file_to_fix /tmp/$base
+  chmod +w /tmp/$base
+  sed -e '/^#define[ 	]*NULL[ 	]*((char \*) 0)$/c\
+#ifndef NULL\
+#ifdef __cplusplus\
+#define __NULL_TYPE\
+#else /* !defined(__cplusplus) */\
+#define __NULL_TYPE (void *)\
+#endif /* !defined(__cplusplus) */\
+#define NULL (__NULL_TYPE 0)\
+#endif /* !defined(NULL) */' /tmp/$base > /tmp/$base.sed
+  if cmp $file_to_fix /tmp/$base.sed >/dev/null 2>&1; then \
+    true
+  else
+    echo Fixed $file_to_fix
+    rm -f ${LIB}/$file
+    cp /tmp/$base.sed ${LIB}/$file
+    chmod a+r ${LIB}/$file
+  fi
+  rm -f /tmp/$base /tmp/$base.sed
+fi
+
+# Add a prototyped declaration of mmap to <sys/mman.h>.
+
+file=sys/mman.h
+base=`basename $file`
+if [ -r ${LIB}/$file ]; then
+  file_to_fix=${LIB}/$file
+else
+  if [ -r ${INPUT}/$file ]; then
+    file_to_fix=${INPUT}/$file
+  else
+    file_to_fix=""
+  fi
+fi
+if [ \! -z "$file_to_fix" ]; then
+  echo Checking $file_to_fix
+  cp $file_to_fix /tmp/$base
+  chmod +w /tmp/$base
+  sed -e '/^extern caddr_t mmap();$/c\
+#ifdef __STDC__\
+extern caddr_t mmap (caddr_t, size_t, int, int, int, off_t);\
+#else /* !defined(__STDC__) */\
+extern caddr_t mmap ();\
+#endif /* !defined(__STDC__) */' /tmp/$base > /tmp/$base.sed
+  if cmp $file_to_fix /tmp/$base.sed >/dev/null 2>&1; then \
+    true
+  else
+    echo Fixed $file_to_fix
+    rm -f ${LIB}/$file
+    cp /tmp/$base.sed ${LIB}/$file
+    chmod a+r ${LIB}/$file
+  fi
+  rm -f /tmp/$base /tmp/$base.sed
+fi
+
+# Fix declarations of `ftw' and `nftw' in <ftw.h>.  On some/most SVR4 systems
+# the file <ftw.h> contains extern declarations of these functions followed
+# by explicitly `static' definitions of these functions... and that's not
+# allowed according to ANSI C.  (Note however that on Solaris, this header
+# file glitch has been pre-fixed by Sun.  In the Solaris version of <ftw.h>
+# there are no static definitions of any function so we don't need to do
+# any of this stuff when on Solaris.
+
+file=ftw.h
+base=`basename $file`
+if [ -r ${LIB}/$file ]; then
+  file_to_fix=${LIB}/$file
+else
+  if [ -r ${INPUT}/$file ]; then
+    file_to_fix=${INPUT}/$file
+  else
+    file_to_fix=""
+  fi
+fi
+if test -z "$file_to_fix" || grep 'define	ftw' $file_to_fix > /dev/null; then
+# Either we have no <ftw.h> file at all, or else we have the pre-fixed Solaris
+# one.  Either way, we don't have to do anything.
+  true
+else
+  echo Checking $file_to_fix
+  cp $file_to_fix /tmp/$base
+  chmod +w /tmp/$base
+  sed -e '/^extern int ftw(const/i\
+#if !defined(_STYPES)\
+static\
+#else\
+extern\
+#endif
+'\
+  -e 's/extern \(int ftw(const.*\)$/\1/' \
+  -e '/^extern int nftw/i\
+#if defined(_STYPES)\
+static\
+#else\
+extern\
+#endif
+'\
+  -e 's/extern \(int nftw.*\)$/\1/' \
+  -e '/^extern int ftw(),/c\
+#if !defined(_STYPES)\
+static\
+#else\
+extern\
+#endif\
+  int ftw();\
+#if defined(_STYPES)\
+static\
+#else\
+extern\
+#endif\
+  int nftw();' /tmp/$base > /tmp/$base.sed
+  if cmp $file_to_fix /tmp/$base.sed >/dev/null 2>&1; then \
+    true
+  else
+    echo Fixed $file_to_fix
+    rm -f ${LIB}/$file
+    cp /tmp/$base.sed ${LIB}/$file
+    chmod a+r ${LIB}/$file
+  fi
+  rm -f /tmp/$base /tmp/$base.sed
+fi
+
+# Avoid the definition of the bool type in the Solaris 2.x curses.h when using
+# g++, since it's now an official type in the C++ language.
+file=curses.h
+base=`basename $file`
+if [ -r ${LIB}/$file ]; then
+  file_to_fix=${LIB}/$file
+else
+  if [ -r ${INPUT}/$file ]; then
+    file_to_fix=${INPUT}/$file
+  else
+    file_to_fix=""
+  fi
+fi
+
+if [ \! -z "$file_to_fix" ]; then
+  echo Checking $file_to_fix
+  cp $file_to_fix /tmp/$base
+  chmod +w /tmp/$base
+  sed -e 's,^typedef[ 	]char[ 	]bool;$,#ifndef __cplusplus\
+typedef	char bool;\
+#endif /* !defined __cplusplus */,' /tmp/$base > /tmp/$base.sed
+  if cmp $file_to_fix /tmp/$base.sed >/dev/null 2>&1; then \
+    true
+  else
+    echo Fixed $file_to_fix
+    rm -f ${LIB}/$file
+    cp /tmp/$base.sed ${LIB}/$file
+    chmod a+r ${LIB}/$file
+  fi
+  rm -f /tmp/$base /tmp/$base.sed
+fi
+
+# Add a `static' declaration of `getrnge' into <regexp.h>.
+
+# Don't do this if there is already a `static void getrnge' declaration
+# present, since this would cause a redeclaration error.  Solaris 2.x has
+# such a declaration.
+
+file=regexp.h
+base=`basename $file`
+if [ -r ${LIB}/$file ]; then
+  file_to_fix=${LIB}/$file
+else
+  if [ -r ${INPUT}/$file ]; then
+    file_to_fix=${INPUT}/$file
+  else
+    file_to_fix=""
+  fi
+fi
+if [ \! -z "$file_to_fix" ]; then
+  echo Checking $file_to_fix
+  if grep "static void getrnge" $file_to_fix > /dev/null; then
+    true
+  else
+    cp $file_to_fix /tmp/$base
+    chmod +w /tmp/$base
+    sed -e '/^static int[ 	]*size;/c\
+static int	size ;\
+\
+static int getrnge ();' /tmp/$base > /tmp/$base.sed
+    if cmp $file_to_fix /tmp/$base.sed >/dev/null 2>&1; then \
+      true
+    else
+      echo Fixed $file_to_fix
+      rm -f ${LIB}/$file
+      cp /tmp/$base.sed ${LIB}/$file
+      chmod a+r ${LIB}/$file
+    fi
+  fi
+  rm -f /tmp/$base /tmp/$base.sed
+fi
+
+# Disable apparent native compiler optimization cruft in SVR4.2 <string.h>
+# that is visible to any ANSI compiler using this include.  Simply
+# delete the lines that #define some string functions to internal forms.
+
+file=string.h
+base=`basename $file`
+if [ -r ${LIB}/$file ]; then
+  file_to_fix=${LIB}/$file
+else
+  if [ -r ${INPUT}/$file ]; then
+    file_to_fix=${INPUT}/$file
+  else
+    file_to_fix=""
+  fi
+fi
+if [ \! -z "$file_to_fix" ]; then
+  echo Checking $file_to_fix
+  cp $file_to_fix /tmp/$base
+  chmod +w /tmp/$base
+  sed -e '/#define.*__std_hdr_/d' /tmp/$base > /tmp/$base.sed
+  if cmp $file_to_fix /tmp/$base.sed >/dev/null 2>&1; then \
+    true
+  else
+    echo Fixed $file_to_fix
+    rm -f ${LIB}/$file
+    cp /tmp/$base.sed ${LIB}/$file
+    chmod a+r ${LIB}/$file
+  fi
+  rm -f /tmp/$base /tmp/$base.sed
+fi
+
+# Delete any #defines of `__i386' which may be present in <ieeefp.h>.  They
+# tend to conflict with the compiler's own definition of this symbol.  (We
+# will use the compiler's definition.)
+# Likewise __sparc, for Solaris, and __i860, and a few others
+# (guessing it is necessary for all of them).
+
+file=ieeefp.h
+base=`basename $file`
+if [ -r ${LIB}/$file ]; then
+  file_to_fix=${LIB}/$file
+else
+  if [ -r ${INPUT}/$file ]; then
+    file_to_fix=${INPUT}/$file
+  else
+    file_to_fix=""
+  fi
+fi
+if [ \! -z "$file_to_fix" ]; then
+  echo Checking $file_to_fix
+  cp $file_to_fix /tmp/$base
+  chmod +w /tmp/$base
+  sed -e '/#define[ 	]*__i386 /d' -e '/#define[ 	]*__sparc /d' \
+      -e '/#define[ 	]*__i860 /d' -e '/#define[ 	]*__m88k /d' \
+      -e '/#define[ 	]*__mips /d' -e '/#define[ 	]*__m68k /d' \
+     /tmp/$base > /tmp/$base.sed
+  if cmp $file_to_fix /tmp/$base.sed >/dev/null 2>&1; then \
+    true
+  else
+    echo Fixed $file_to_fix 
+    rm -f ${LIB}/$file
+    cp /tmp/$base.sed ${LIB}/$file 
+    chmod a+r ${LIB}/$file
+  fi
+  rm -f /tmp/$base /tmp/$base.sed 
+fi 
+
+# Add a #define of _SIGACTION_ into <sys/signal.h>.
+# Also fix types of SIG_DFL, SIG_ERR, SIG_IGN, and SIG_HOLD.
+
+file=sys/signal.h
+base=`basename $file`
+if [ -r ${LIB}/$file ]; then
+  file_to_fix=${LIB}/$file
+else
+  if [ -r ${INPUT}/$file ]; then
+    file_to_fix=${INPUT}/$file
+  else
+    file_to_fix=""
+  fi
+fi
+if [ \! -z "$file_to_fix" ]; then
+  echo Checking $file_to_fix
+  cp $file_to_fix /tmp/$base
+  chmod +w /tmp/$base
+  sed -e '/^struct sigaction {/c\
+#define _SIGACTION_\
+struct  sigaction  {' \
+  -e '1,$s/(void *(\*)())/(void (*)(int))/' /tmp/$base > /tmp/$base.sed
+  if cmp $file_to_fix /tmp/$base.sed >/dev/null 2>&1; then \
+    true
+  else
+    echo Fixed $file_to_fix
+    rm -f ${LIB}/$file
+    cp /tmp/$base.sed ${LIB}/$file
+    chmod a+r ${LIB}/$file
+  fi
+  rm -f /tmp/$base /tmp/$base.sed
+fi
+
+# Fix declarations of `makedev', `major', and `minor' in <sys/mkdev.h>.
+
+file=sys/mkdev.h
+base=`basename $file`
+if [ -r ${LIB}/$file ]; then
+  file_to_fix=${LIB}/$file
+else
+  if [ -r ${INPUT}/$file ]; then
+    file_to_fix=${INPUT}/$file
+  else
+    file_to_fix=""
+  fi
+fi
+if [ \! -z "$file_to_fix" ]; then
+  echo Checking $file_to_fix
+  cp $file_to_fix /tmp/$base
+  chmod +w /tmp/$base
+  sed -e '/^dev_t makedev(const/c\
+static dev_t makedev(const major_t, const minor_t);' \
+  -e '/^dev_t makedev()/c\
+static dev_t makedev();' \
+  -e '/^major_t major(const/c\
+static major_t major(const dev_t);' \
+  -e '/^major_t major()/c\
+static major_t major();' \
+  -e '/^minor_t minor(const/c\
+static minor_t minor(const dev_t);' \
+  -e '/^minor_t minor()/c\
+static minor_t minor();' /tmp/$base > /tmp/$base.sed
+  if cmp $file_to_fix /tmp/$base.sed >/dev/null 2>&1; then \
+    true
+  else
+    echo Fixed $file_to_fix
+    rm -f ${LIB}/$file
+    cp /tmp/$base.sed ${LIB}/$file
+    chmod a+r ${LIB}/$file
+  fi
+  rm -f /tmp/$base /tmp/$base.sed
+fi
+
+# Fix reference to NMSZ in <sys/adv.h>.
+
+file=sys/adv.h
+base=`basename $file`
+if [ -r ${LIB}/$file ]; then
+  file_to_fix=${LIB}/$file
+else
+  if [ -r ${INPUT}/$file ]; then
+    file_to_fix=${INPUT}/$file
+  else
+    file_to_fix=""
+  fi
+fi
+if [ \! -z "$file_to_fix" ]; then
+  echo Checking $file_to_fix
+  sed 's/\[NMSZ\]/\[RFS_NMSZ\]/g' $file_to_fix > /tmp/$base
+  if cmp $file_to_fix /tmp/$base >/dev/null 2>&1; then \
+    true
+  else
+    echo Fixed $file_to_fix
+    rm -f ${LIB}/$file
+    cp /tmp/$base ${LIB}/$file
+    chmod a+r ${LIB}/$file
+  fi
+  rm -f /tmp/$base
+fi
+
+# Fix reference to NC_NPI_RAW in <sys/netcspace.h>.  Also fix types of
+# array initializers.
+
+file=sys/netcspace.h
+base=`basename $file`
+if [ -r ${LIB}/$file ]; then
+  file_to_fix=${LIB}/$file
+else
+  if [ -r ${INPUT}/$file ]; then
+    file_to_fix=${INPUT}/$file
+  else
+    file_to_fix=""
+  fi
+fi
+if [ \! -z "$file_to_fix" ]; then
+  echo Checking $file_to_fix
+  sed 's/NC_NPI_RAW/NC_TPI_RAW/g' $file_to_fix \
+    | sed 's/NC_/(unsigned long) NC_/' > /tmp/$base
+  if cmp $file_to_fix /tmp/$base >/dev/null 2>&1; then \
+    true
+  else
+    echo Fixed $file_to_fix
+    rm -f ${LIB}/$file
+    cp /tmp/$base ${LIB}/$file
+    chmod a+r ${LIB}/$file
+  fi
+  rm -f /tmp/$base
+fi
+
+# Conditionalize all of <fs/rfs/rf_cache.h> on _KERNEL being defined.
+
+file=fs/rfs/rf_cache.h
+base=`basename $file`
+if [ -r ${LIB}/$file ]; then
+  file_to_fix=${LIB}/$file
+else
+  if [ -r ${INPUT}/$file ]; then
+    file_to_fix=${INPUT}/$file
+  else
+    file_to_fix=""
+  fi
+fi
+if [ \! -z "$file_to_fix" ]; then
+  echo Checking $file_to_fix
+  if grep _KERNEL $file_to_fix > /dev/null; then
+    true
+  else
+    echo '#ifdef _KERNEL' > /tmp/$base
+    cat $file_to_fix >> /tmp/$base
+    echo '#endif /* defined(_KERNEL) */' >> /tmp/$base
+    echo Fixed $file_to_fix
+    rm -f ${LIB}/$file
+    cp /tmp/$base ${LIB}/$file
+    chmod a+r ${LIB}/$file
+    rm -f /tmp/$base
+  fi
+fi
+
+# Conditionalize all of <sys/erec.h> on _KERNEL being defined.
+
+file=sys/erec.h
+base=`basename $file`
+if [ -r ${LIB}/$file ]; then
+  file_to_fix=${LIB}/$file
+else
+  if [ -r ${INPUT}/$file ]; then
+    file_to_fix=${INPUT}/$file
+  else
+    file_to_fix=""
+  fi
+fi
+if [ \! -z "$file_to_fix" ]; then
+  echo Checking $file_to_fix
+  if grep _KERNEL $file_to_fix > /dev/null; then
+    true
+  else
+    echo '#ifdef _KERNEL' > /tmp/$base
+    cat $file_to_fix >> /tmp/$base
+    echo '#endif /* defined(_KERNEL) */' >> /tmp/$base
+    echo Fixed $file_to_fix
+    rm -f ${LIB}/$file
+    cp /tmp/$base ${LIB}/$file
+    chmod a+r ${LIB}/$file
+    rm -f /tmp/$base
+  fi
+fi
+
+# Conditionalize all of <sys/err.h> on _KERNEL being defined.
+
+file=sys/err.h
+base=`basename $file`
+if [ -r ${LIB}/$file ]; then
+  file_to_fix=${LIB}/$file
+else
+  if [ -r ${INPUT}/$file ]; then
+    file_to_fix=${INPUT}/$file
+  else
+    file_to_fix=""
+  fi
+fi
+if [ \! -z "$file_to_fix" ]; then
+  echo Checking $file_to_fix
+  if grep _KERNEL $file_to_fix > /dev/null; then
+    true
+  else
+    echo '#ifdef _KERNEL' > /tmp/$base
+    cat $file_to_fix >> /tmp/$base
+    echo '#endif /* defined(_KERNEL) */' >> /tmp/$base
+    echo Fixed $file_to_fix
+    rm -f ${LIB}/$file
+    cp /tmp/$base ${LIB}/$file
+    chmod a+r ${LIB}/$file
+    rm -f /tmp/$base
+  fi
+fi
+
+# Conditionalize all of <sys/char.h> on _KERNEL being defined.
+
+file=sys/char.h
+base=`basename $file`
+if [ -r ${LIB}/$file ]; then
+  file_to_fix=${LIB}/$file
+else
+  if [ -r ${INPUT}/$file ]; then
+    file_to_fix=${INPUT}/$file
+  else
+    file_to_fix=""
+  fi
+fi
+if [ \! -z "$file_to_fix" ]; then
+  echo Checking $file_to_fix
+  if grep _KERNEL $file_to_fix > /dev/null; then
+    true
+  else
+    echo '#ifdef _KERNEL' > /tmp/$base
+    cat $file_to_fix >> /tmp/$base
+    echo '#endif /* defined(_KERNEL) */' >> /tmp/$base
+    echo Fixed $file_to_fix
+    rm -f ${LIB}/$file
+    cp /tmp/$base ${LIB}/$file
+    chmod a+r ${LIB}/$file
+    rm -f /tmp/$base
+  fi
+fi
+
+# Conditionalize all of <sys/getpages.h> on _KERNEL being defined.
+
+file=sys/getpages.h
+base=`basename $file`
+if [ -r ${LIB}/$file ]; then
+  file_to_fix=${LIB}/$file
+else
+  if [ -r ${INPUT}/$file ]; then
+    file_to_fix=${INPUT}/$file
+  else
+    file_to_fix=""
+  fi
+fi
+if [ \! -z "$file_to_fix" ]; then
+  echo Checking $file_to_fix
+  if grep _KERNEL $file_to_fix > /dev/null; then
+    true
+  else
+    echo '#ifdef _KERNEL' > /tmp/$base
+    cat $file_to_fix >> /tmp/$base
+    echo '#endif /* defined(_KERNEL) */' >> /tmp/$base
+    echo Fixed $file_to_fix
+    rm -f ${LIB}/$file
+    cp /tmp/$base ${LIB}/$file
+    chmod a+r ${LIB}/$file
+    rm -f /tmp/$base
+  fi
+fi
+
+# Conditionalize all of <sys/map.h> on _KERNEL being defined.
+
+file=sys/map.h
+base=`basename $file`
+if [ -r ${LIB}/$file ]; then
+  file_to_fix=${LIB}/$file
+else
+  if [ -r ${INPUT}/$file ]; then
+    file_to_fix=${INPUT}/$file
+  else
+    file_to_fix=""
+  fi
+fi
+if [ \! -z "$file_to_fix" ]; then
+  echo Checking $file_to_fix
+  if grep _KERNEL $file_to_fix > /dev/null; then
+    true
+  else
+    echo '#ifdef _KERNEL' > /tmp/$base
+    cat $file_to_fix >> /tmp/$base
+    echo '#endif /* defined(_KERNEL) */' >> /tmp/$base
+    echo Fixed $file_to_fix
+    rm -f ${LIB}/$file
+    cp /tmp/$base ${LIB}/$file
+    chmod a+r ${LIB}/$file
+    rm -f /tmp/$base
+  fi
+fi
+
+# Conditionalize all of <sys/cmn_err.h> on _KERNEL being defined.
+
+file=sys/cmn_err.h
+base=`basename $file`
+if [ -r ${LIB}/$file ]; then
+  file_to_fix=${LIB}/$file
+else
+  if [ -r ${INPUT}/$file ]; then
+    file_to_fix=${INPUT}/$file
+  else
+    file_to_fix=""
+  fi
+fi
+if [ \! -z "$file_to_fix" ]; then
+  echo Checking $file_to_fix
+  if grep _KERNEL $file_to_fix > /dev/null; then
+    true
+  else
+    echo '#ifdef _KERNEL' > /tmp/$base
+    cat $file_to_fix >> /tmp/$base
+    echo '#endif /* defined(_KERNEL) */' >> /tmp/$base
+    echo Fixed $file_to_fix
+    rm -f ${LIB}/$file
+    cp /tmp/$base ${LIB}/$file
+    chmod a+r ${LIB}/$file
+    rm -f /tmp/$base
+  fi
+fi
+
+# Conditionalize all of <sys/kdebugger.h> on _KERNEL being defined.
+
+file=sys/kdebugger.h
+base=`basename $file`
+if [ -r ${LIB}/$file ]; then
+  file_to_fix=${LIB}/$file
+else
+  if [ -r ${INPUT}/$file ]; then
+    file_to_fix=${INPUT}/$file
+  else
+    file_to_fix=""
+  fi
+fi
+if [ \! -z "$file_to_fix" ]; then
+  echo Checking $file_to_fix
+  if grep _KERNEL $file_to_fix > /dev/null; then
+    true
+  else
+    echo '#ifdef _KERNEL' > /tmp/$base
+    cat $file_to_fix >> /tmp/$base
+    echo '#endif /* defined(_KERNEL) */' >> /tmp/$base
+    echo Fixed $file_to_fix
+    rm -f ${LIB}/$file
+    cp /tmp/$base ${LIB}/$file
+    chmod a+r ${LIB}/$file
+    rm -f /tmp/$base
+  fi
+fi
+
+# Conditionalize some of <netinet/in.h> on _KERNEL being defined.
+# This has been taken out because it breaks on some versions of
+# DYNIX/ptx, and it does not seem to do much good on any system.
+# file=netinet/in.h
+# base=`basename $file`
+# if [ -r ${LIB}/$file ]; then
+#   file_to_fix=${LIB}/$file
+# else
+#   if [ -r ${INPUT}/$file ]; then
+#     file_to_fix=${INPUT}/$file
+#   else
+#     file_to_fix=""
+#   fi
+# fi
+# if [ \! -z "$file_to_fix" ]; then
+#   echo Checking $file_to_fix
+#   if grep _KERNEL $file_to_fix > /dev/null; then
+#     true
+#   else
+#     sed -e '/#ifdef INKERNEL/i\
+# #ifdef _KERNEL
+# ' \
+#     -e '/#endif[ 	]*\/\* INKERNEL \*\//a\
+# #endif /* _KERNEL */
+# ' \
+#     $file_to_fix > ${LIB}/${file}.sed
+#     rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
+#     echo Fixed $file_to_fix
+#   fi
+# fi
+
+# Conditionalize some of <sys/endian.h> on __GNUC__ and __GNUG__.
+
+file=sys/endian.h
+base=`basename $file`
+if [ -r ${LIB}/$file ]; then
+  file_to_fix=${LIB}/$file
+else
+  if [ -r ${INPUT}/$file ]; then
+    file_to_fix=${INPUT}/$file
+  else
+    file_to_fix=""
+  fi
+fi
+if [ \! -z "$file_to_fix" ]; then
+  echo Checking $file_to_fix
+  if grep __GNUC__ $file_to_fix > /dev/null; then
+    true
+  else
+    sed -e '/#	ifdef	__STDC__/i\
+#   if !defined (__GNUC__) && !defined (__GNUG__)
+' \
+    -e '/#		include	<sys\/byteorder.h>/s/		/   /'\
+    -e '/#   include	<sys\/byteorder.h>/i\
+#   endif /* !defined (__GNUC__) && !defined (__GNUG__) */
+'\
+    $file_to_fix > ${LIB}/${file}.sed
+    rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
+    echo Fixed $file_to_fix
+  fi
+fi
+
+# Commented out because tmcconne@sedona.intel.com says we don't clearly need it
+# and the text in types.h is not erroneous.
+## In sys/types.h, don't name the enum for booleans.
+#
+#file=sys/types.h
+#base=`basename $file`
+#if [ -r ${LIB}/$file ]; then
+#  file_to_fix=${LIB}/$file
+#else
+#  if [ -r ${INPUT}/$file ]; then
+#    file_to_fix=${INPUT}/$file
+#  else
+#    file_to_fix=""
+#  fi
+#fi
+#if [ \! -z "$file_to_fix" ]; then
+#  echo Checking $file_to_fix
+#  if grep "enum boolean" $file_to_fix > /dev/null; then
+#    sed -e 's/enum boolean/enum/' ${LIB}/$file > ${LIB}/${file}.sed
+#    rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
+#    echo Fixed $file_to_fix
+#  else
+#    true
+#  fi
+#fi
+
+# Remove useless extern keyword from struct forward declarations in
+# <sys/stream.h> and <sys/strsubr.h>
+
+file=sys/stream.h
+base=`basename $file`
+if [ -r ${LIB}/$file ]; then
+  file_to_fix=${LIB}/$file
+else
+  if [ -r ${INPUT}/$file ]; then
+    file_to_fix=${INPUT}/$file
+  else
+    file_to_fix=""
+  fi
+fi
+if [ \! -z "$file_to_fix" ]; then
+  echo Checking $file_to_fix
+  sed -e '
+    s/extern struct stdata;/struct stdata;/g
+    s/extern struct strevent;/struct strevent;/g
+  ' $file_to_fix > /tmp/$base 
+  if cmp $file_to_fix /tmp/$base >/dev/null 2>&1; then \
+    true
+  else
+    echo Fixed $file_to_fix
+    rm -f ${LIB}/$file
+    cp /tmp/$base ${LIB}/$file
+    chmod a+r ${LIB}/$file
+  fi
+  rm -f /tmp/$base
+fi
+
+file=sys/strsubr.h
+base=`basename $file`
+if [ -r ${LIB}/$file ]; then
+  file_to_fix=${LIB}/$file
+else
+  if [ -r ${INPUT}/$file ]; then
+    file_to_fix=${INPUT}/$file
+  else
+    file_to_fix=""
+  fi
+fi
+if [ \! -z "$file_to_fix" ]; then
+  echo Checking $file_to_fix
+  sed -e '
+    s/extern struct strbuf;/struct strbuf;/g
+    s/extern struct uio;/struct uio;/g
+    s/extern struct thread;/struct thread;/g
+    s/extern struct proc;/struct proc;/g
+  ' $file_to_fix > /tmp/$base 
+  if cmp $file_to_fix /tmp/$base >/dev/null 2>&1; then \
+    true
+  else
+    echo Fixed $file_to_fix
+    rm -f ${LIB}/$file
+    cp /tmp/$base ${LIB}/$file
+    chmod a+r ${LIB}/$file
+  fi
+  rm -f /tmp/$base
+fi
+
+# Put storage class at start of decl, to avoid warning.
+file=rpc/types.h
+base=`basename $file`
+if [ -r ${LIB}/$file ]; then
+  file_to_fix=${LIB}/$file
+else
+  if [ -r ${INPUT}/$file ]; then
+    file_to_fix=${INPUT}/$file
+  else
+    file_to_fix=""
+  fi
+fi
+if [ \! -z "$file_to_fix" ]; then
+  echo Checking $file_to_fix
+  sed -e '
+    s/const extern/extern const/g
+  ' $file_to_fix > /tmp/$base 
+  if cmp $file_to_fix /tmp/$base >/dev/null 2>&1; then \
+    true
+  else
+    echo Fixed $file_to_fix
+    rm -f ${LIB}/$file
+    cp /tmp/$base ${LIB}/$file
+    chmod a+r ${LIB}/$file
+  fi
+  rm -f /tmp/$base
+fi
+
+# Convert functions to prototype form, and fix arg names in <sys/stat.h>.
+
+file=sys/stat.h
+base=`basename $file`
+if [ -r ${LIB}/$file ]; then
+  file_to_fix=${LIB}/$file
+else
+  if [ -r ${INPUT}/$file ]; then
+    file_to_fix=${INPUT}/$file
+  else
+    file_to_fix=""
+  fi
+fi
+if [ \! -z "$file_to_fix" ]; then
+  echo Checking $file_to_fix
+  cp $file_to_fix /tmp/$base
+  chmod +w /tmp/$base
+  sed -e '/^stat([ 	]*[^c]/{
+N
+N
+s/(.*)\n/( /
+s/;\n/, /
+s/;$/)/
+}' \
+  -e '/^lstat([ 	]*[^c]/{
+N
+N
+s/(.*)\n/( /
+s/;\n/, /
+s/;$/)/
+}' \
+  -e '/^fstat([ 	]*[^i]/{
+N
+N
+s/(.*)\n/( /
+s/;\n/, /
+s/;$/)/
+}' \
+  -e '/^mknod([ 	]*[^c]/{
+N
+N
+N
+s/(.*)\n/( /
+s/;\n/, /g
+s/;$/)/
+}' \
+  -e '1,$s/\([^A-Za-z]\)path\([^A-Za-z]\)/\1__path\2/g' \
+  -e '1,$s/\([^A-Za-z]\)buf\([^A-Za-z]\)/\1__buf\2/g' \
+  -e '1,$s/\([^A-Za-z]\)fd\([^A-Za-z]\)/\1__fd\2/g' \
+  -e '1,$s/ret\([^u]\)/__ret\1/g' \
+  -e '1,$s/\([^_]\)mode\([^_]\)/\1__mode\2/g' \
+  -e '1,$s/\([^_r]\)dev\([^_]\)/\1__dev\2/g' /tmp/$base > /tmp/$base.sed
+  if cmp $file_to_fix /tmp/$base.sed >/dev/null 2>&1; then \
+    true
+  else
+    echo Fixed $file_to_fix
+    rm -f ${LIB}/$file
+    cp /tmp/$base.sed ${LIB}/$file
+    chmod a+r ${LIB}/$file
+  fi
+  rm -f /tmp/$base /tmp/$base.sed
+fi
+
+# Sony NEWSOS 5.0 does not support the complete ANSI C standard.
+
+if [ -x /bin/sony ]; then
+  if /bin/sony; then
+
+    # Change <stdio.h> to not define __filbuf, __flsbuf, and __iob
+
+    file=stdio.h
+    base=`basename $file`
+    if [ -r ${LIB}/$file ]; then
+      file_to_fix=${LIB}/$file
+    else
+      if [ -r ${INPUT}/$file ]; then
+        file_to_fix=${INPUT}/$file
+      else
+        file_to_fix=""
+      fi
+    fi
+    if [ \! -z "$file_to_fix" ]; then
+      echo Checking $file_to_fix
+      cp $file_to_fix /tmp/$base
+      chmod +w /tmp/$base
+      sed -e '
+        s/__filbuf/_filbuf/g
+        s/__flsbuf/_flsbuf/g
+        s/__iob/_iob/g
+      ' /tmp/$base > /tmp/$base.sed
+      mv /tmp/$base.sed /tmp/$base
+      if cmp $file_to_fix /tmp/$base.sed >/dev/null 2>&1; then
+        true
+      else
+        echo Fixed $file_to_fix
+        rm -f ${LIB}/$file
+        cp /tmp/$base ${LIB}/$file
+        chmod a+r ${LIB}/$file
+      fi
+      rm -f /tmp/$base
+    fi
+
+    # Change <ctype.h> to not define __ctype
+
+    file=ctype.h
+    base=`basename $file`
+    if [ -r ${LIB}/$file ]; then
+      file_to_fix=${LIB}/$file
+    else
+      if [ -r ${INPUT}/$file ]; then
+        file_to_fix=${INPUT}/$file
+      else
+        file_to_fix=""
+      fi
+    fi
+    if [ \! -z "$file_to_fix" ]; then
+      echo Checking $file_to_fix
+      cp $file_to_fix /tmp/$base
+      chmod +w /tmp/$base
+      sed -e '
+        s/__ctype/_ctype/g
+      ' /tmp/$base > /tmp/$base.sed
+      mv /tmp/$base.sed /tmp/$base
+      if cmp $file_to_fix /tmp/$base.sed >/dev/null 2>&1; then
+        true
+      else
+        echo Fixed $file_to_fix
+        rm -f ${LIB}/$file
+        cp /tmp/$base ${LIB}/$file
+        chmod a+r ${LIB}/$file
+      fi
+      rm -f /tmp/$base
+    fi
+  fi
+fi
+
+# In limits.h, put #ifndefs around things that are supposed to be defined
+# in float.h to avoid redefinition errors if float.h is included first.
+# Solaris 2.1 has this problem.
+
+file=limits.h
+base=`basename $file`
+if [ -r ${LIB}/$file ]; then
+  file_to_fix=${LIB}/$file
+else
+  if [ -r ${INPUT}/$file ]; then
+    file_to_fix=${INPUT}/$file
+  else
+    file_to_fix=""
+  fi
+fi
+if [ \! -z "$file_to_fix" ]; then
+  echo Checking $file_to_fix
+  sed -e '/[ 	]FLT_MIN[ 	]/i\
+#ifndef FLT_MIN
+'\
+      -e '/[ 	]FLT_MIN[ 	]/a\
+#endif
+'\
+      -e '/[ 	]FLT_MAX[ 	]/i\
+#ifndef FLT_MAX
+'\
+      -e '/[ 	]FLT_MAX[ 	]/a\
+#endif
+'\
+      -e '/[ 	]FLT_DIG[ 	]/i\
+#ifndef FLT_DIG
+'\
+      -e '/[ 	]FLT_DIG[ 	]/a\
+#endif
+'\
+      -e '/[ 	]DBL_MIN[ 	]/i\
+#ifndef DBL_MIN
+'\
+      -e '/[ 	]DBL_MIN[ 	]/a\
+#endif
+'\
+      -e '/[ 	]DBL_MAX[ 	]/i\
+#ifndef DBL_MAX
+'\
+      -e '/[ 	]DBL_MAX[ 	]/a\
+#endif
+'\
+      -e '/[ 	]DBL_DIG[ 	]/i\
+#ifndef DBL_DIG
+'\
+      -e '/[ 	]DBL_DIG[ 	]/a\
+#endif
+' $file_to_fix > /tmp/$base
+  if cmp $file_to_fix /tmp/$base >/dev/null 2>&1; then \
+    true
+  else
+    echo Fixed $file_to_fix
+    rm -f ${LIB}/$file
+    cp /tmp/$base ${LIB}/$file
+    chmod a+r ${LIB}/$file
+  fi
+  rm -f /tmp/$base
+fi
+
+# Completely replace <sys/varargs.h> with a file that includes gcc's
+# stdarg.h or varargs.h files as appropriate.
+
+file=sys/varargs.h
+if [ -r ${INPUT}/$file ]; then
+  echo Replacing $file
+  cat > ${LIB}/$file << EOF
+/* This file was generated by fixincludes.  */
+#ifndef _SYS_VARARGS_H
+#define _SYS_VARARGS_H
+
+#ifdef __STDC__
+#include <stdarg.h>
+#else
+#include <varargs.h>
+#endif
+
+#endif  /* _SYS_VARARGS_H */
+EOF
+  chmod a+r ${LIB}/$file
+fi
+
+# In math.h, put #ifndefs around things that might be defined in a gcc
+# specific math-*.h file.
+
+file=math.h
+base=`basename $file`
+if [ -r ${LIB}/$file ]; then
+  file_to_fix=${LIB}/$file
+else
+  if [ -r ${INPUT}/$file ]; then
+    file_to_fix=${INPUT}/$file
+  else
+    file_to_fix=""
+  fi
+fi
+if [ \! -z "$file_to_fix" ]; then
+  echo Checking $file_to_fix
+  sed -e '/define[ 	]HUGE_VAL[ 	]/i\
+#ifndef HUGE_VAL
+'\
+      -e '/define[ 	]HUGE_VAL[ 	]/a\
+#endif
+' $file_to_fix > /tmp/$base
+  if cmp $file_to_fix /tmp/$base >/dev/null 2>&1; then \
+    true
+  else
+    echo Fixed $file_to_fix
+    rm -f ${LIB}/$file
+    cp /tmp/$base ${LIB}/$file
+    chmod a+r ${LIB}/$file
+  fi
+  rm -f /tmp/$base
+fi
+
+# Solaris math.h and floatingpoint.h define __P without protection,
+# which conflicts with the fixproto definition.  The fixproto
+# definition and the Solaris definition are used the same way.
+for file in math.h floatingpoint.h; do
+  base=`basename $file`
+  if [ -r ${LIB}/$file ]; then
+    file_to_fix=${LIB}/$file
+  else
+    if [ -r ${INPUT}/$file ]; then
+      file_to_fix=${INPUT}/$file
+    else
+      file_to_fix=""
+    fi
+  fi
+  if [ \! -z "$file_to_fix" ]; then
+    echo Checking $file_to_fix
+    sed -e '/^#define[ 	]*__P/i\
+#ifndef __P
+'\
+        -e '/^#define[ 	]*__P/a\
+#endif
+' $file_to_fix > /tmp/$base
+    if cmp $file_to_fix /tmp/$base >/dev/null 2>&1; then \
+      true
+    else
+      echo Fixed $file_to_fix
+      rm -f ${LIB}/$file
+      cp /tmp/$base ${LIB}/$file
+      chmod a+r ${LIB}/$file
+    fi
+   rm -f /tmp/$base
+  fi
+done
+
+# The Solaris math.h defines struct exception, which conflicts with
+# the class exception defined in the C++ file std/stdexcept.h.  We
+# redefine it to __math_exception.  This is not a great fix, but I
+# haven't been able to think of anything better.
+file=math.h
+base=`basename $file`
+if [ -r ${LIB}/$file ]; then
+  file_to_fix=${LIB}/$file
+else
+  if [ -r ${INPUT}/$file ]; then
+    file_to_fix=${INPUT}/$file
+  else
+    file_to_fix=""
+  fi
+fi
+if [ \! -z "$file_to_fix" ]; then
+  echo Checking $file_to_fix
+  sed -e '/struct exception/i\
+#ifdef __cplusplus\
+#define exception __math_exception\
+#endif'\
+      -e '/struct exception/a\
+#ifdef __cplusplus\
+#undef exception\
+#endif' $file_to_fix > /tmp/$base
+  if cmp $file_to_fix /tmp/$base >/dev/null 2>&1; then \
+    true
+  else
+    echo Fixed $file_to_fix
+    rm -f ${LIB}/$file
+    cp /tmp/$base ${LIB}/$file
+    chmod a+r ${LIB}/$file
+  fi
+  rm -f /tmp/$base
+fi
+
+echo 'Removing unneeded directories:'
+cd $LIB
+files=`find . -type d -print | sort -r`
+for file in $files; do
+  rmdir $LIB/$file > /dev/null 2>&1
+done
+
+if $LINKS; then
+  echo 'Making internal symbolic non-directory links'
+  cd ${INPUT}
+  files=`find . -type l -print`
+  for file in $files; do
+    dest=`ls -ld $file | sed -n 's/.*-> //p'`
+    if expr "$dest" : '[^/].*' > /dev/null; then    
+      target=${LIB}/`echo $file | sed "s|[^/]*\$|$dest|"`
+      if [ -f $target ]; then
+        ln -s $dest ${LIB}/$file >/dev/null 2>&1
+      fi
+    fi
+  done
+fi
+
+cd ${ORIG_DIR}
+
+echo 'Replacing <sys/byteorder.h>'
+if [ \! -d $LIB/sys ]; then
+  mkdir $LIB/sys
+fi
+rm -f ${LIB}/sys/byteorder.h
+cat <<'__EOF__' >${LIB}/sys/byteorder.h
+#ifndef _SYS_BYTEORDER_H
+#define _SYS_BYTEORDER_H
+
+/* Functions to convert `short' and `long' quantities from host byte order
+   to (internet) network byte order (i.e. big-endian).
+
+   Written by Ron Guilmette (rfg@ncd.com).
+
+   This isn't actually used by GCC.  It is installed by fixinc.svr4.
+
+   For big-endian machines these functions are essentially no-ops.
+
+   For little-endian machines, we define the functions using specialized
+   asm sequences in cases where doing so yields better code (e.g. i386).  */
+
+#if !defined (__GNUC__) && !defined (__GNUG__)
+#error You lose!  This file is only useful with GNU compilers.
+#endif
+
+#ifndef __BYTE_ORDER__
+/* Byte order defines.  These are as defined on UnixWare 1.1, but with
+   double underscores added at the front and back.  */
+#define __LITTLE_ENDIAN__   1234
+#define __BIG_ENDIAN__      4321
+#define __PDP_ENDIAN__      3412
+#endif
+
+#ifdef __STDC__
+static __inline__ unsigned long htonl (unsigned long);
+static __inline__ unsigned short htons (unsigned int);
+static __inline__ unsigned long ntohl (unsigned long);
+static __inline__ unsigned short ntohs (unsigned int);
+#endif /* defined (__STDC__) */
+
+#if defined (__i386__)
+
+#ifndef __BYTE_ORDER__
+#define __BYTE_ORDER__ __LITTLE_ENDIAN__
+#endif
+
+/* Convert a host long to a network long.  */
+
+/* We must use a new-style function definition, so that this will also
+   be valid for C++.  */
+static __inline__ unsigned long
+htonl (unsigned long __arg)
+{
+  register unsigned long __result;
+
+  __asm__ ("xchg%B0 %b0,%h0\n\
+	ror%L0 $16,%0\n\
+	xchg%B0 %b0,%h0" : "=q" (__result) : "0" (__arg));
+  return __result;
+}
+
+/* Convert a host short to a network short.  */
+
+static __inline__ unsigned short
+htons (unsigned int __arg)
+{
+  register unsigned short __result;
+
+  __asm__ ("xchg%B0 %b0,%h0" : "=q" (__result) : "0" (__arg));
+  return __result;
+}
+
+#elif ((defined (__i860__) && !defined (__i860_big_endian__))	\
+       || defined (__ns32k__) || defined (__vax__)		\
+       || defined (__spur__) || defined (__arm__))
+
+#ifndef __BYTE_ORDER__
+#define __BYTE_ORDER__ __LITTLE_ENDIAN__
+#endif
+
+/* For other little-endian machines, using C code is just as efficient as
+   using assembly code.  */
+
+/* Convert a host long to a network long.  */
+
+static __inline__ unsigned long
+htonl (unsigned long __arg)
+{
+  register unsigned long __result;
+
+  __result = (__arg >> 24) & 0x000000ff;
+  __result |= (__arg >> 8) & 0x0000ff00;
+  __result |= (__arg << 8) & 0x00ff0000;
+  __result |= (__arg << 24) & 0xff000000;
+  return __result;
+}
+
+/* Convert a host short to a network short.  */
+
+static __inline__ unsigned short
+htons (unsigned int __arg)
+{
+  register unsigned short __result;
+
+  __result = (__arg << 8) & 0xff00;
+  __result |= (__arg >> 8) & 0x00ff;
+  return __result;
+}
+
+#else /* must be a big-endian machine */
+
+#ifndef __BYTE_ORDER__
+#define __BYTE_ORDER__ __BIG_ENDIAN__
+#endif
+
+/* Convert a host long to a network long.  */
+
+static __inline__ unsigned long
+htonl (unsigned long __arg)
+{
+  return __arg;
+}
+
+/* Convert a host short to a network short.  */
+
+static __inline__ unsigned short
+htons (unsigned int __arg)
+{
+  return __arg;
+}
+
+#endif /* big-endian */
+
+/* Convert a network long to a host long.  */
+
+static __inline__ unsigned long
+ntohl (unsigned long __arg)
+{
+  return htonl (__arg);
+}
+
+/* Convert a network short to a host short.  */
+
+static __inline__ unsigned short
+ntohs (unsigned int __arg)
+{
+  return htons (__arg);
+}
+
+__EOF__
+
+if [ -r ${INPUT}/sys/byteorder.h ]; then
+  if grep BYTE_ORDER ${INPUT}/sys/byteorder.h >/dev/null 2>/dev/null; then
+    cat <<'__EOF__' >>${LIB}/sys/byteorder.h
+#ifndef BYTE_ORDER
+#define LITTLE_ENDIAN __LITTLE_ENDIAN__
+#define BIG_ENDIAN __BIG_ENDIAN__
+#define PDP_ENDIAN __PDP_ENDIAN__
+#define BYTE_ORDER __BYTE_ORDER__
+#endif
+
+__EOF__
+  fi
+fi
+
+cat <<'__EOF__' >>${LIB}/sys/byteorder.h
+#endif /* !defined (_SYS_BYTEORDER_H) */
+__EOF__
+
+chmod a+r ${LIB}/sys/byteorder.h
+
+exit 0
+
diff --git a/gcc/fixinc/fixinc.winnt b/gcc/fixinc/fixinc.winnt
new file mode 100644
index 0000000..915ac72
--- /dev/null
+++ b/gcc/fixinc/fixinc.winnt
@@ -0,0 +1,232 @@
+#! sh
+#
+#   fixinc.winnt  --  Install modified versions of Windows NT system include
+#   files.
+#
+#   Based on fixinc.sco script by Ian Lance Taylor (ian@airs.com)).
+#   Modifications by Douglas Rupp (drupp@cs.washington.edu)
+#
+# This file is part of GNU CC.
+# 
+# GNU CC is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+# 
+# GNU CC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GNU CC; see the file COPYING.  If not, write to
+# the Free Software Foundation, 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+#
+#	This script munges the native include files provided with Windows NT
+#	3.5 SDK systems so as to provide a reasonable namespace when
+#	compiling with gcc.  The header files by default do not
+#	provide many essential definitions and declarations if
+#	__STDC__ is 1.  This script modifies the header files to check
+#	for __STRICT_ANSI__ being defined instead.  Once munged, the
+#	resulting new system include files are placed in a directory
+#	that GNU C will search *before* searching the Include
+#	directory.
+#
+#	See README-fixinc for more information.
+
+ORIG_DIR=`pwd`
+
+# Directory containing the original header files.
+cd $2; SEDFILE=`${PWDCMD-pwd}`/fixinc-nt.sed
+echo $SEDFILE
+if [ ! -f $SEDFILE ]
+then echo fixincludes: sed script 'fixinc-nt.sed' not found
+exit 1
+fi
+echo 'Using sed script: ' ${SEDFILE}
+
+cd $ORIG_DIR
+
+INPUT=${INCLUDE}
+echo 'Using the Include environment variable to find header files to fix'
+
+# Fail if no arg to specify a directory for the output.
+if [ x$1 = x ]
+then echo fixincludes: no output directory specified
+exit 1
+fi
+
+# Directory in which to store the results.
+LIB=${1?"fixincludes: output directory not specified"}
+
+# Make sure it exists.
+if [ ! -d $LIB ]; then
+  mkdir $LIB || exit 1
+fi
+
+ORIG_DIR=`pwd`
+
+# Make LIB absolute if it is relative.
+# Don't do this if not necessary, since may screw up automounters.
+case $LIB in
+/*)
+	;;
+*)
+	cd $LIB; LIB=`${PWDCMD-pwd}`
+	;;
+esac
+
+echo 'Building fixincludes in ' ${LIB}
+
+# Determine whether this filesystem has symbolic links.
+if ln -s X $LIB/ShouldNotExist 2>NUL; then
+  rm -f $LIB/ShouldNotExist
+  LINKS=true
+else
+  LINKS=false
+fi
+
+echo 'Making directories:'
+cd ${INPUT}
+if $LINKS; then
+  files=`ls -LR | sed -n s/:$//p`
+else
+  files=`find . -type d -print | sed '/^.$/d'`
+fi
+for file in $files; do
+  rm -rf $LIB/$file
+  if [ ! -d $LIB/$file ]
+  then mkdir $LIB/$file
+  fi
+done
+
+# treetops gets an alternating list
+# of old directories to copy
+# and the new directories to copy to.
+treetops="${INPUT} ${LIB}"
+
+set - $treetops
+while [ $# != 0 ]; do
+  # $1 is an old directory to copy, and $2 is the new directory to copy to.
+  echo "Finding header files in $1:"
+  cd ${INPUT}
+  cd $1
+  files=`find . -name '*.[hH]' -type f -print`
+  echo 'Checking header files:'
+  for file in $files; do
+    echo $file
+    if egrep "!__STDC__" $file >NUL; then
+      if [ -r $file ]; then
+	cp $file $2/$file >NUL 2>&1 || echo "Can't copy $file"
+	chmod +w,a+r $2/$file
+
+# The following have been removed from the sed command below
+# because it is more useful to leave these things in.
+# The only reason to remove them was for -pedantic,
+# which isn't much of a reason. -- rms.
+#	  /^[ 	]*#[ 	]*ident/d
+
+	sed -e '
+	  s/!__STDC__/!defined (__STRICT_ANSI__)/g
+	' $2/$file > $2/$file.sed
+	mv $2/$file.sed $2/$file
+	if cmp $file $2/$file >NUL 2>&1; then
+	   rm $2/$file
+	else
+	   echo Fixed $file
+	fi
+      fi
+    fi
+  done
+  shift; shift
+done
+
+# Fix first broken decl of getcwd present on some svr4 systems.
+
+file=direct.h
+base=`basename $file`
+if [ -r ${LIB}/$file ]; then
+  file_to_fix=${LIB}/$file
+else
+  if [ -r ${INPUT}/$file ]; then
+    file_to_fix=${INPUT}/$file
+  else
+    file_to_fix=""
+  fi
+fi
+if [ \! -z "$file_to_fix" ]; then
+  echo Checking $file_to_fix
+  sed -e 's/getcwd(char \*, int)/getcwd(char *, size_t)/' $file_to_fix > /tmp/$base
+  if cmp $file_to_fix /tmp/$base >NUL 2>&1; then \
+    true
+  else
+    echo Fixed $file_to_fix
+    rm -f ${LIB}/$file
+    cp /tmp/$base ${LIB}/$file
+    chmod a+r ${LIB}/$file
+  fi
+  rm -f /tmp/$base
+fi
+
+file=rpcndr.h
+base=`basename $file`
+if [ -r ${LIB}/$file ]; then
+  file_to_fix=${LIB}/$file
+else
+  if [ -r ${INPUT}/$file ]; then
+    file_to_fix=${INPUT}/$file
+  else
+    file_to_fix=""
+  fi
+fi
+if [ \! -z "$file_to_fix" ]; then
+  echo Checking $file_to_fix
+  sed -e 's/Format\[\]/Format\[1\]/' $file_to_fix > /tmp/$base
+  if cmp $file_to_fix /tmp/$base >NUL 2>&1; then \
+    true
+  else
+    echo Fixed $file_to_fix
+    rm -f ${LIB}/$file
+    cp /tmp/$base ${LIB}/$file
+    chmod a+r ${LIB}/$file
+  fi
+  rm -f /tmp/$base
+fi
+
+file=winnt.h
+base=`basename $file`
+if [ -r ${LIB}/$file ]; then
+  file_to_fix=${LIB}/$file
+else
+  if [ -r ${INPUT}/$file ]; then
+    file_to_fix=${INPUT}/$file
+  else
+    file_to_fix=""
+  fi
+fi
+if [ \! -z "$file_to_fix" ]; then
+  echo Checking $file_to_fix
+  sed -e '
+    s/^#if !defined (__cplusplus)/#if 0/
+    s/^#define DECLSPEC_IMPORT __declspec(dllimport)/#define DECLSPEC_IMPORT/
+  ' $file_to_fix > /tmp/$base
+  if cmp $file_to_fix /tmp/$base >NUL 2>&1; then \
+    true
+  else
+    echo Fixed $file_to_fix
+    rm -f ${LIB}/$file
+    cp /tmp/$base ${LIB}/$file
+    chmod a+r ${LIB}/$file
+  fi
+  rm -f /tmp/$base
+fi
+
+echo 'Removing unneeded directories:'
+cd $LIB
+files=`find . -type d -print | sort -r`
+for file in $files; do
+  rmdir $LIB/$file > NUL 2>&1
+done
+
+exit 0
diff --git a/gcc/fixinc/fixinc.wrap b/gcc/fixinc/fixinc.wrap
new file mode 100755
index 0000000..406c87e
--- /dev/null
+++ b/gcc/fixinc/fixinc.wrap
@@ -0,0 +1,86 @@
+#! /bin/sh
+# Create wrappers for include files instead of replacing them.
+#
+# This script is designed for systems whose include files can be fixed
+# by creating small wrappers around them.
+# An advantage of this method is that if the system include files are changed
+# (e.g. by OS upgrade), you need not re-run fixincludes.
+#
+# See README-fixinc for more information.
+
+# Directory containing the original header files.
+# (This was named INCLUDES, but that conflicts with a name in Makefile.in.)
+INPUT=${2-${INPUT-/usr/include}}
+
+# Directory in which to store the results.
+LIB=${1?"fixincludes: output directory not specified"}
+
+# Make sure it exists.
+if [ ! -d $LIB ]; then
+  mkdir $LIB || exit 1
+fi
+
+echo Building fixed headers in ${LIB}
+
+# Some math.h files define struct exception, which conflicts with
+# the class exception defined in the C++ file std/stdexcept.h.  We
+# redefine it to __math_exception.  This is not a great fix, but I
+# haven't been able to think of anything better.
+file=math.h
+if [ -r $INPUT/$file ]; then
+  echo Checking $INPUT/$file
+  if grep 'struct exception' $INPUT/$file >/dev/null
+  then
+    echo Fixed $file
+    rm -f $LIB/$file
+    cat <<'__EOF__' >$LIB/$file
+#ifndef _MATH_H_WRAPPER
+#ifdef __cplusplus
+# define exception __math_exception
+#endif
+#include_next <math.h>
+#ifdef __cplusplus
+# undef exception
+#endif
+#define _MATH_H_WRAPPER
+#endif /* _MATH_H_WRAPPER */
+__EOF__
+    # Define _MATH_H_WRAPPER at the end of the wrapper, not the start,
+    # so that if #include_next gets another instance of the wrapper,
+    # this will follow the #include_next chain until we arrive at
+    # the real <math.h>.
+    chmod a+r $LIB/$file
+  fi
+fi
+
+# Avoid the definition of the bool type in the Solaris 2.x curses.h when using
+# g++, since it's now an official type in the C++ language.
+file=curses.h
+if [ -r $INPUT/$file ]; then
+  echo Checking $INPUT/$file
+  w='[	 ]'
+  if grep "typedef$w$w*char$w$w*bool$w*;" $INPUT/$file >/dev/null
+  then
+    echo Fixed $file
+    rm -f $LIB/$file
+    cat <<'__EOF__' >$LIB/$file
+#ifndef _CURSES_H_WRAPPER
+#ifdef __cplusplus
+# define bool __curses_bool_t
+#endif
+#include_next <curses.h>
+#ifdef __cplusplus
+# undef bool
+#endif
+#define _CURSES_H_WRAPPER
+#endif /* _CURSES_H_WRAPPER */
+__EOF__
+    # Define _CURSES_H_WRAPPER at the end of the wrapper, not the start,
+    # so that if #include_next gets another instance of the wrapper,
+    # this will follow the #include_next chain until we arrive at
+    # the real <curses.h>.
+    chmod a+r $LIB/$file
+  fi
+fi
+
+exit 0
diff --git a/gcc/fixinc/fixincl.c b/gcc/fixinc/fixincl.c
new file mode 100644
index 0000000..97aae47
--- /dev/null
+++ b/gcc/fixinc/fixincl.c
@@ -0,0 +1,834 @@
+/*
+ * $Id: fixincl.c,v 1.2 1998/12/16 21:19:03 law Exp $
+ *
+ * Install modified versions of certain ANSI-incompatible system header
+ * files which are fixed to work correctly with ANSI C and placed in a
+ * directory that GNU C will search.
+ *
+ * See README-fixinc for more information.
+ *
+ *  fixincl is free software.
+ *  
+ *  You may redistribute it and/or modify it under the terms of the
+ *  GNU General Public License, as published by the Free Software
+ *  Foundation; either version 2, or (at your option) any later version.
+ *  
+ *  fixincl is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *  See the GNU General Public License for more details.
+ *  
+ *  You should have received a copy of the GNU General Public License
+ *  along with fixincl.  See the file "COPYING".  If not,
+ *  write to:  The Free Software Foundation, Inc.,
+ *             59 Temple Place - Suite 330,
+ *             Boston,  MA  02111-1307, USA.
+ */
+
+#include <sys/param.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <signal.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <string.h>
+#include <fcntl.h>
+#include <ctype.h>
+
+#include "regex.h"
+#include "server.h"
+
+#define tSCC static const char
+#define tCC  const char
+#define tSC  static char
+
+typedef int tSuccess;
+
+#define FAILURE  ((tSuccess)-1)
+#define SUCCESS  ((tSuccess) 0)
+#define PROBLEM  ((tSuccess) 1)
+
+#define SUCCEEDED( p )     ((p) == SUCCESS)
+#define SUCCESSFUL( p )    SUCCEEDED( p )
+#define FAILED( p )        ((p) <  SUCCESS)
+#define HADGLITCH( p )     ((p) >  SUCCESS)
+
+#define NUL '\0'
+
+typedef enum
+  {
+    TT_TEST, TT_EGREP, TT_NEGREP
+  }
+teTestType;
+
+typedef struct test_desc tTestDesc;
+
+struct test_desc
+  {
+    teTestType type;
+    const char *pzTest;
+    regex_t *pTestRegex;
+  };
+
+typedef struct patch_desc tPatchDesc;
+
+#define FD_MACH_ONLY      0x0000
+#define FD_MACH_IFNOT     0x0001
+#define FD_SKIP_TEST      0x8000
+
+typedef struct fix_desc tFixDesc;
+struct fix_desc
+  {
+    const char*   pzFixName;     /* Name of the fix */
+    const char*   pzFileList;    /* List of files it applies to */
+    const char**  papzMachs;     /* List of machine/os-es it applies to */
+    regex_t*      pListRegex;
+    int           testCt;
+    int           fdFlags;
+    tTestDesc*    pTestDesc;
+    const char**  papzPatchArgs;
+  };
+
+char *pzDestDir   = (char *) NULL;
+char *pzSrcDir    = (char *) NULL;
+char *pzMachine   = (char *) NULL;
+
+pid_t chainHead = (pid_t) - 1;
+
+const char zInclQuote[] = "^[ \t]*#[ \t]*include[ \t]*\"[^/]";
+regex_t inclQuoteRegex;
+
+char zFileNameBuf[0x8000];
+
+char *loadFile (const char *pzFile);
+void process (char *data, const char *dir, const char *file);
+void runCompiles (void);
+
+#include "fixincl.x"
+
+
+int
+main (argc, argv)
+     int argc;
+     char **argv;
+{
+  static const char zGnuLib[] =
+  "This file is part of the GNU C Library";
+  static const char zVarNotFound[] =
+      "fixincl ERROR:  %s environment variable not defined\n";
+
+#ifndef NO_BOGOSITY_LIMITS
+# define BOGUS_LIMIT 256
+  size_t loopCt;
+#endif
+
+  char *apzNames[BOGUS_LIMIT];
+  size_t fileNameCt;
+
+  if (argc != 1)
+    {
+      if (argc != 2)
+        {
+          fputs ("fixincl ERROR:  too many command line arguments\n", stderr);
+          exit (EXIT_FAILURE);
+        }
+
+      if (strcmp (argv[1], "-v") == 0)
+        {
+          fputs ("$Id: fixincl.c,v 1.2 1998/12/16 21:19:03 law Exp $\n", stderr);
+          exit (EXIT_SUCCESS);
+        }
+
+      freopen (argv[1], "r", stdin);
+    }
+
+  {
+    static const char zVar[] = "TARGET_MACHINE";
+    pzMachine = getenv( zVar );
+    if (pzMachine == (char *)NULL)
+      {
+        fprintf( stderr, zVarNotFound, zVar );
+        exit (EXIT_FAILURE);
+      }
+  }
+
+  {
+    static const char zVar[] = "DESTDIR";
+    pzDestDir = getenv( zVar );
+    if (pzDestDir == (char *)NULL)
+      {
+        fprintf( stderr, zVarNotFound, zVar );
+        exit (EXIT_FAILURE);
+      }
+  }
+
+  {
+    static const char zVar[] = "SRCDIR";
+    pzSrcDir = getenv( zVar );
+    if (pzSrcDir == (char *)NULL)
+      {
+        fprintf( stderr, zVarNotFound, zVar );
+        exit (EXIT_FAILURE);
+      }
+  }
+
+  runCompiles ();
+
+  signal ( SIGQUIT, SIG_IGN );
+  signal ( SIGIOT,  SIG_IGN );
+  signal ( SIGPIPE, SIG_IGN );
+  signal ( SIGALRM, SIG_IGN );
+  signal ( SIGTERM, SIG_IGN );
+  signal ( SIGCHLD, SIG_IGN );
+
+#ifndef NO_BOGOSITY_LIMITS
+  for (;;)
+    {
+      char *pzBuf;
+      pid_t child;
+
+      /*
+       *  Only the parent process can read from stdin without
+       *  confusing the world.  (How does the child tell the
+       *  parent to skip forward?  Pipes and files behave differently.)
+       */
+      for (fileNameCt = 0, pzBuf = zFileNameBuf;
+           (fileNameCt < BOGUS_LIMIT)
+           && (pzBuf
+               < (zFileNameBuf + sizeof (zFileNameBuf) - MAXPATHLEN));
+        )
+        {
+
+          if (fgets (pzBuf, MAXPATHLEN, stdin) == (char *) NULL)
+            break;
+          while (isspace (*pzBuf))
+            pzBuf++;
+          apzNames[fileNameCt++] = pzBuf;
+          pzBuf += strlen (pzBuf);
+          while (isspace (pzBuf[-1]))
+            pzBuf--;
+          *pzBuf++ = '\0';
+        }
+
+      if (fileNameCt == 0)
+        return EXIT_SUCCESS;
+
+      child = fork ();
+      if (child == NULLPROCESS)
+        break;
+
+      if (child == NOPROCESS)
+        {
+          fprintf (stderr, "Error %d (%s) forking in main\n",
+                   errno, strerror (errno));
+          exit (EXIT_FAILURE);
+        }
+
+      waitpid (child, (int *) NULL, 0);
+    }
+#else
+#error "NON-BOGUS LIMITS NOT SUPPORTED?!?!"
+#endif
+
+  /*
+   *  For every file specified in stdandard in
+   *  (except as throttled for bogus reasons)...
+   */
+  for (loopCt = 0; loopCt < fileNameCt; loopCt++)
+    {
+      char *pzData;
+      char *pzFile = apzNames[loopCt];
+
+      if (access (pzFile, R_OK) != 0)
+        {
+          int erno = errno;
+          fprintf (stderr, "Cannot access %s from %s\n\terror %d (%s)\n",
+                   pzFile, getcwd ((char *) NULL, MAXPATHLEN),
+                   erno, strerror (erno));
+        }
+      else if (pzData = loadFile (pzFile),
+               (pzData != (char *) NULL))
+        {
+
+          if (strstr (pzData, zGnuLib) == (char *) NULL)
+            process (pzData, pzDestDir, pzFile);
+
+          free ((void *) pzData);
+        }
+    }
+
+  return EXIT_SUCCESS;
+}
+
+
+char *
+loadFile (pzFile)
+     const char *pzFile;
+{
+  char *pzDta;
+  size_t fileSize;
+
+  {
+    struct stat stbf;
+    if (stat (pzFile, &stbf) != 0)
+      {
+        fprintf (stderr, "error %d (%s) stat-ing %s\n",
+                 errno, strerror (errno), pzFile);
+        return (char *) NULL;
+      }
+    fileSize = stbf.st_size;
+  }
+  if (fileSize == 0)
+    return (char *) NULL;
+
+  pzDta = (char *) malloc ((fileSize + 16) & ~0x00F);
+  if (pzDta == (char *) NULL)
+    {
+      fprintf (stderr, "error:  could not malloc %d bytes\n",
+               fileSize);
+      exit (EXIT_FAILURE);
+    }
+
+  {
+    FILE *fp = fopen (pzFile, "r");
+    size_t sizeLeft = fileSize;
+    char *readPtr = pzDta;
+
+    if (fp == (FILE *) NULL)
+      {
+        fprintf (stderr, "error %d (%s) opening %s\n", errno,
+                 strerror (errno), pzFile);
+        free ((void *) pzDta);
+        return (char *) NULL;
+      }
+
+    do
+      {
+        size_t sizeRead = fread ((void *) readPtr, 1, sizeLeft, fp);
+
+        if (sizeRead == 0)
+          {
+            if (feof (fp))
+              break;
+
+            if (ferror (fp))
+              {
+                fprintf (stderr, "error %d (%s) reading %s\n", errno,
+                         strerror (errno), pzFile);
+                free ((void *) pzDta);
+                fclose (fp);
+                return (char *) NULL;
+              }
+          }
+
+        readPtr += sizeRead;
+        sizeLeft -= sizeRead;
+      }
+    while (sizeLeft != 0);
+
+    *readPtr = '\0';
+    fclose (fp);
+    return pzDta;
+  }
+}
+
+
+void
+runCompiles ()
+{
+  tSCC zBadComp[] = "fixincl ERROR:  cannot compile %s regex for %s\n"
+    "\texpr = `%s'\n" "\terror %s\n";
+  tFixDesc *pFD = fixDescList;
+  int fixCt = FIX_COUNT;
+  tTestDesc *pTD;
+  int tstCt;
+  int reCt = REGEX_COUNT;
+  const char *pzErr;
+  regex_t *pRegex = (regex_t *) malloc (REGEX_COUNT * sizeof (regex_t));
+
+  if (pRegex == (regex_t *) NULL)
+    {
+      fprintf (stderr, "fixincl ERROR:  cannot allocate %d bytes for regex\n",
+               REGEX_COUNT * sizeof (regex_t));
+      exit (EXIT_FAILURE);
+    }
+
+  re_set_syntax (RE_SYNTAX_EGREP);
+  pzErr = re_compile_pattern (zInclQuote, strlen (zInclQuote),
+                              &inclQuoteRegex);
+  if (pzErr != (char *) NULL)
+    {
+      fprintf (stderr, zBadComp, "quoted include", "runCompiles",
+               zInclQuote, pzErr);
+      exit (EXIT_FAILURE);
+    }
+
+  /*
+   *  FOR every fixup, ...
+   */
+  do
+    {
+      pTD = pFD->pTestDesc;
+      tstCt = pFD->testCt;
+
+      if (pFD->papzMachs != (const char**)NULL) {
+        const char** papzMachs = pFD->papzMachs;
+        char*        pz = zFileNameBuf;
+        char*        pzSep = "";
+        tCC*         pzIfTrue;
+        tCC*         pzIfFalse;
+        tSCC         zSkip[] = "skip";
+        tSCC         zRun[]  = "run";
+
+        sprintf( pz, "case %s in\n", pzMachine );
+        pz += strlen( pz );
+
+        if (pFD->fdFlags & FD_MACH_IFNOT) {
+          pzIfTrue  = zSkip;
+          pzIfFalse = zRun;
+        } else {
+          pzIfTrue  = zRun;
+          pzIfFalse = zSkip;
+        }
+
+        for (;;) {
+          const char* pzMach = *(papzMachs++);
+          if (pzMach == (const char*)NULL)
+            break;
+          sprintf( pz, "%s  %s", pzSep, pzMach );
+          pz += strlen( pz );
+          pzSep = " | \\\n";
+        }
+        sprintf( pz, " )\n    echo %s ;;\n  * )\n    echo %s ;;\nesac",
+                 pzIfTrue, pzIfFalse );
+        pz = runShell( zFileNameBuf );
+        if (*pz == 's') {
+          pFD->fdFlags |= FD_SKIP_TEST;
+          continue;
+        }
+      }
+
+      /*
+       *  FOR every test for the fixup, ...
+       */
+      while (--tstCt >= 0)
+        {
+          switch (pTD->type)
+            {
+            case TT_EGREP:
+            case TT_NEGREP:
+              if (--reCt < 0)
+                {
+                  fputs ("out of RE's\n", stderr);
+                  exit (EXIT_FAILURE);
+                }
+
+              pTD->pTestRegex = pRegex++;
+              pzErr = re_compile_pattern (pTD->pzTest,
+                                          strlen (pTD->pzTest),
+                                          pTD->pTestRegex);
+              if (pzErr != (char *) NULL)
+                {
+                  fprintf (stderr, zBadComp, "select test", pFD->pzFixName,
+                           pTD->pzTest, pzErr);
+                  exit (EXIT_FAILURE);
+                }
+            }
+          pTD++;
+        }
+    }
+  while (pFD++, --fixCt > 0);
+}
+
+
+FILE *
+createFile (pzFile)
+     const char *pzFile;
+{
+  int fd;
+  FILE *pf;
+  char fname[MAXPATHLEN];
+
+  sprintf (fname, "%s/%s", pzDestDir, pzFile);
+  unlink (fname);
+
+  fd = open (fname, O_WRONLY | O_CREAT);
+
+  if ((fd < 0) && (errno == ENOENT))
+    {
+      char *pzDir = strchr (fname + 1, '/');
+      struct stat stbf;
+
+      while (pzDir != (char *) NULL)
+        {
+          *pzDir = NUL;
+          if (stat (fname, &stbf) < 0)
+            {
+              mkdir (fname, S_IFDIR | S_IRWXU | S_IRGRP | S_IXGRP
+                     | S_IROTH | S_IXOTH);
+            }
+
+          *pzDir = '/';
+          pzDir = strchr (pzDir + 1, '/');
+        }
+      fd = open (fname, O_WRONLY | O_CREAT);
+    }
+  if (fd < 0)
+    {
+      fprintf (stderr, "Error %d (%s) creating %s\n",
+               errno, strerror (errno), fname);
+      exit (EXIT_FAILURE);
+    }
+  fprintf (stderr, "Fixed:  %s\n", pzFile);
+  pf = fdopen (fd, "w");
+
+#ifdef LATER
+  {
+    static const char zHdr[] =
+    "/*\n"
+    " *  DO NOT EDIT THIS FILE.\n"
+    " *\n"
+    " *  It has been auto-edited by fixincludes from /usr/include/%s\n"
+    " *  This had to be done to correct non-standard usages in the\n"
+    " *  original, manufacturer supplied header file.\n"
+    " */\n\n";
+
+    fprintf (pf, zHdr, pzFile);
+  }
+#endif
+  return pf;
+}
+
+tSuccess
+testTest (pTest, pzFile)
+     tTestDesc *pTest;
+     char*      pzFile;
+{
+  char *pzRes;
+  tSuccess res = FAILURE;
+
+  static char zCmdBuf[4096];
+  tSCC zCmdFmt[] = "file=%s\nif ( test %s ) > /dev/null 2>&1\n"
+  "then echo TRUE\n" "else echo FALSE\n" "fi";
+
+  sprintf (zCmdBuf, zCmdFmt, pzFile, pTest->pzTest);
+  pzRes = runShell (zCmdBuf);
+  if (*pzRes == 'T')
+    res = SUCCESS;
+  free ((void *) pzRes);
+  return res;
+}
+
+
+tSuccess
+egrepTest (pzDta, pTest)
+     char *pzDta;
+     tTestDesc *pTest;
+{
+  regmatch_t match;
+#ifndef NO_BOGOSITY
+  if (pTest->pTestRegex == 0)
+    fprintf (stderr, "fixincl ERROR RE not compiled:  `%s'\n", pTest->pzTest);
+#endif
+  if (regexec (pTest->pTestRegex, pzDta, 1, &match, 0) == 0)
+    return SUCCESS;
+  return FAILURE;
+}
+
+
+
+void
+extractQuotedFiles (pzDta, pzFile, pMatch)
+     char *pzDta;
+     const char *pzFile;
+     regmatch_t *pMatch;
+{
+  char *pzDirEnd = strrchr (pzFile, '/');
+  char *pzInclQuot = pzDta;
+
+  fprintf (stderr, "Quoted includes in %s\n", pzFile);
+
+  /*
+   *  Set "pzFile" to point to the containing subdirectory of the source
+   *  If there is none, then it is in our current direcory, ".".
+   */
+  if (pzDirEnd == (char *) NULL)
+    pzFile = ".";
+  else
+    *pzDirEnd = '\0';
+
+  for (;;)
+    {
+      pzInclQuot += pMatch->rm_so;
+
+      /*
+       *  Skip forward to the included file name
+       */
+      while (isspace (*pzInclQuot))
+        pzInclQuot++;
+      while (isspace (*++pzInclQuot));
+      pzInclQuot += sizeof ("include") - 1;
+      while (*pzInclQuot++ != '"');
+
+      /*
+       *  Print the source directory and the subdirectory of the file
+       *  in question.
+       */
+      printf ("%s  %s/", pzSrcDir, pzFile);
+      pzDirEnd = pzInclQuot;
+
+      /*
+       *  Append to the directory the relative path of the desired file
+       */
+      while (*pzInclQuot != '"')
+        putc (*pzInclQuot++, stdout);
+
+      /*
+       *  Now print the destination directory appended with the relative
+       *  path of the desired file
+       */
+      printf ("  %s/%s/", pzDestDir, pzFile);
+      while (*pzDirEnd != '"')
+        putc (*pzDirEnd++, stdout);
+
+      /*
+       *  End of entry
+       */
+      putc ('\n', stdout);
+
+      /*
+       *  Find the next entry
+       */
+      if (regexec (&inclQuoteRegex, pzInclQuot, 1, pMatch, 0) != 0)
+        break;
+    }
+}
+
+
+/*
+ *  Process the potential fixes for a particular include file
+ */
+void
+process (pzDta, pzDir, pzFile)
+     char *pzDta;
+     const char *pzDir;
+     const char *pzFile;
+{
+  static char zEnvFile[1024] =
+    {"file="};
+  tFixDesc *pFD = fixDescList;
+  int todoCt = FIX_COUNT;
+  tFdPair fdp =
+    {-1, -1};
+
+  /*
+   *  IF this is the first time through,
+   *  THEN put the 'file' environment variable into the environment.
+   *       This is used by some of the subject shell scripts and tests.
+   */
+  if (zEnvFile[5] == NUL)
+    putenv (zEnvFile);
+
+  /*
+   *  Ghastly as it is, this actually updates the value of the variable:
+   *
+   *    putenv(3C)             C Library Functions             putenv(3C)
+   *
+   *    DESCRIPTION
+   *         putenv() makes the value of the  environment  variable  name
+   *         equal  to value by altering an existing variable or creating
+   *         a new one.  In either case, the string pointed to by  string
+   *         becomes part of the environment, so altering the string will
+   *         change the environment.  string points to a  string  of  the
+   *         form  ``name=value.''  The space used by string is no longer
+   *         used once a new string-defining name is passed to putenv().
+   */
+  strcpy (zEnvFile + 5, pzFile);
+  chainHead = NOPROCESS;
+
+  /*
+   *  For every fix in our fix list, ...
+   */
+  for (; todoCt > 0; pFD++, todoCt--)
+    {
+      tTestDesc *pTD;
+      int tstCt;
+      tSuccess egrepRes;
+
+      if (pFD->fdFlags & FD_SKIP_TEST)
+        continue;
+
+      /*
+       *  IF there is a file name restriction,
+       *  THEN ensure the current file name matches one in the pattern
+       */
+      if (pFD->pzFileList != (char *) NULL)
+        {
+          const char *pzFil = pzFile;
+          const char *pzScn = pFD->pzFileList;
+          size_t nmLen;
+
+          while ((pzFil[0] == '.') && (pzFil[1] == '/'))
+            pzFil += 2;
+          nmLen = strlen (pzFil);
+
+          for (;;)
+            {
+              pzScn = strstr (pzScn + 1, pzFil);
+              if (pzScn == (char *) NULL)
+                goto nextFix;
+
+              if ((pzScn[-1] == '|') && (pzScn[nmLen] == '|'))
+                break;
+            }
+        }
+
+      egrepRes = PROBLEM;
+
+      /*
+       *  IF there are no tests
+       *  THEN we always run the fixup
+       */
+      for (pTD = pFD->pTestDesc, tstCt = pFD->testCt;
+           tstCt-- > 0;
+           pTD++)
+        {
+          switch (pTD->type)
+            {
+            case TT_TEST:
+              /*
+               *  IF *any* of the shell tests fail,
+               *  THEN do not process the fix.
+               */
+              if (!SUCCESSFUL (testTest (pTD, pzFile)))
+                goto nextFix;
+              break;
+
+            case TT_EGREP:
+              /*
+               *  IF       we have not had a successful egrep test
+               *    *AND*  this test does not pass,
+               *  THEN mark the egrep test as failing.  It starts
+               *       out as a "PROBLEM", meaning that if we do not
+               *       encounter any egrep tests, then we will let it pass.
+               */
+              if ((!SUCCESSFUL (egrepRes))
+                  && (!SUCCESSFUL (egrepTest (pzDta, pTD))))
+
+                egrepRes = FAILURE;
+
+              break;
+
+            case TT_NEGREP:
+              /*
+               *  IF *any* of the negative egrep tests fail,
+               *  THEN do not process the fix.
+               */
+              if (SUCCESSFUL (egrepTest (pzDta, pTD)))
+                goto nextFix;
+              break;
+            }
+        }
+
+      /*
+       *  IF there were no egrep tests *OR* at least one passed, ...
+       */
+      if (!FAILED (egrepRes))
+        {
+          fprintf (stderr, "Applying %-32s to %s\n",
+                   pFD->pzFixName, pzFile);
+
+          if (fdp.readFd == -1)
+            {
+              fdp.readFd = open (pzFile, O_RDONLY);
+              if (fdp.readFd < 0)
+                {
+                  fprintf (stderr, "Error %d (%s) opening %s\n", errno,
+                           strerror (errno), pzFile);
+                  exit (EXIT_FAILURE);
+                }
+            }
+
+          for (;;)
+            {
+              int newFd = chainOpen (fdp.readFd,
+                                     (tpChar *) pFD->papzPatchArgs,
+                                     (chainHead == -1)
+                                     ? &chainHead : (pid_t *) NULL);
+              if (newFd != -1)
+                {
+                  fdp.readFd = newFd;
+                  break;
+                }
+
+              fprintf (stderr, "Error %d (%s) starting filter process "
+                       "for %s\n", errno, strerror (errno),
+                       pFD->pzFixName);
+
+              if (errno != EAGAIN)
+                exit (EXIT_FAILURE);
+              sleep (1);
+            }
+        }
+
+    nextFix:;
+    }
+
+  /*
+   *  IF after all the tests we did not start any patch programs,
+   *  THEN quit now.
+   */
+  if (fdp.readFd < 0)
+    return;
+
+  {
+    FILE *inFp = fdopen (fdp.readFd, "r");
+    FILE *oFp = (FILE *) NULL;
+    char *pzCmp = pzDta;
+
+    for (;;)
+      {
+        int ch;
+
+        ch = getc (inFp);
+        if (ch == EOF)
+          break;
+
+        if (oFp != (FILE *) NULL)
+          putc (ch, oFp);
+
+        else if (ch != *pzCmp)
+          {
+            oFp = createFile (pzFile);
+            if (pzCmp != pzDta)
+              {
+                char c = *pzCmp;
+                *pzCmp = NUL;
+                fputs (pzDta, oFp);
+                *pzCmp = c;
+              }
+            putc (ch, oFp);
+
+          }
+        else
+          pzCmp++;
+      }
+
+    if (oFp != (FILE *) NULL)
+      {
+        regmatch_t match;
+
+        fchmod (fileno (oFp), S_IRUSR | S_IRGRP | S_IROTH);
+        fclose (oFp);
+        if (regexec (&inclQuoteRegex, pzDta, 1, &match, 0) == 0)
+          extractQuotedFiles (pzDta, pzFile, &match);
+      }
+
+    fclose (inFp);
+  }
+
+  close (fdp.readFd);
+}
diff --git a/gcc/fixinc/fixincl.tpl b/gcc/fixinc/fixincl.tpl
new file mode 100644
index 0000000..04b67ab
--- /dev/null
+++ b/gcc/fixinc/fixincl.tpl
@@ -0,0 +1,169 @@
+[= autogen template -*- Mode: C -*-
+x =]
+/*
+[= _eval "# * " _DNE =]
+ *
+ * Install modified versions of certain ANSI-incompatible system header
+ * files which are fixed to work correctly with ANSI C and placed in a
+ * directory that GNU C will search.
+ *
+ * This script contains [=_eval fix _hilim 1 +=] fixup scripts.
+ *
+ * See README-fixinc for more information.
+ *
+[=_eval inclhack "# *  " _gpl=]
+ *[=
+
+
+_FOR fix =]
+ *
+ *  Description [=_eval _index 1 + "#%3d -" _printf=] [=hackname _Cap=] fix
+ */
+tSCC z[=hackname _cap=]Name[] =
+     [=hackname _cap _str=];
+/*
+ *  File name selection pattern
+ */[=
+
+  _IF files _exist=]
+tSCC z[=hackname _cap=]List[] =[=
+    _FOR files=]
+        "|" [=files _str=][=
+    /files=] "|";[=
+
+  _ELSE =]
+#define z[=hackname _cap=]List (char*)NULL[=
+  _ENDIF "files _exist" =]
+/*
+ *  Machine/OS name selection pattern
+ */[=
+
+  _IF mach _exist=]
+tSCC* apz[=hackname _cap=]Machs[] = {[=
+    _FOR mach =]
+        [=mach _str=],[=
+    /mach=]
+        (const char*)NULL };[=
+
+  _ELSE =]
+#define apz[=hackname _cap=]Machs (const char**)NULL[=
+  _ENDIF "files _exist" =][=
+
+  _IF exesel _exist=]
+
+/*
+ *  content selection pattern
+ */[=
+    _FOR exesel =]
+tSCC z[=hackname _cap=]Select[=_eval _index=][] =
+       [=exesel _str=];[=
+    /exesel =][=
+
+  _ELIF select _exist=]
+
+/*
+ *  content selection pattern
+ */[=
+    _FOR select =]
+tSCC z[=hackname _cap=]Select[=_eval _index=][] =
+       [=select _str=];[=
+    /select =][=
+  _ENDIF =][=
+
+  _IF bypass _exist=]
+
+/*
+ *  content bypass pattern
+ */[=
+    _FOR bypass =]
+tSCC z[=hackname _cap=]Bypass[=_eval _index=][] =
+       [=bypass _str=];[=
+    /bypass =][=
+  _ENDIF =][=
+
+  _IF test _exist=]
+
+/*
+ *  content test pattern.  A shell will deal with it later.
+ */[=
+    _FOR test =]
+tSCC z[=hackname _cap=]Test[=_eval _index=][] =
+       [=test _str=];[=
+    /test =][=
+  _ENDIF =][=
+
+  _IF exesel _exist select _exist bypass _exist test _exist | | |
+=]
+
+#define    [=hackname _up =]_TEST_CT  [=
+    _IF exesel _exist =][=
+       _eval test _count bypass _count exesel _count + + =][=
+    _ELSE =][=
+       _eval test _count bypass _count select _count + + =][=
+    _ENDIF =]
+tTestDesc a[=hackname _cap=]Tests[] = {[=
+
+    _IF test _exist =][=
+      _FOR test=]
+    { TT_TEST,   z[=hackname _cap=]Test[=_eval _index=], 0 /* unused */ },[=
+      /test =][=
+    _ENDIF =][=
+
+    _IF bypass _exist =][=
+      _FOR bypass=]
+    { TT_NEGREP, z[=hackname _cap=]Bypass[=_eval _index=], (regex_t*)NULL },[=
+      /bypass =][=
+    _ENDIF =][=
+
+    _IF exesel _exist =][=
+      _FOR exesel ,=]
+    { TT_EGREP,  z[=hackname _cap=]Select[=_eval _index=], (regex_t*)NULL }[=
+      /exesel =][=
+
+    _ELIF select _exist =][=
+      _FOR select ,=]
+    { TT_EGREP,  z[=hackname _cap=]Select[=_eval _index=], (regex_t*)NULL }[=
+      /select =][=
+    _ENDIF =] };[=
+  _ELSE =]
+#define [=hackname _up=]_TEST_CT  0
+#define a[=hackname _cap=]Tests   (tTestDesc*)NULL[=
+  _ENDIF =]
+
+/*
+ *  Fix Command Arguments for [=hackname _cap=]
+ */
+const char* apz[=hackname _cap=]Patch[] = {[=
+    _IF   sed         _exist =] "sed"[=_FOR sed=],
+    "-e" [=sed _str=][=/sed=][=
+    _ELIF replacement _exist =] "sed",
+    "s@[=select[]=]@[=replacement=]@"[=
+    _ELIF shell       _exist =] "sh", "-c",
+    [=shell _str=][=
+    _ELSE =][=_ERROR hackname _get "Error:  %s has two fixup specifications"
+                 _printf =][=
+    _ENDIF=],
+    (char*)NULL };
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * *[=
+/fix=]
+ *
+ *  List of all fixes
+ */
+#define  REGEX_COUNT  [=_eval fix.select _count
+                              fix.bypass _count + =]
+#define  FIX_COUNT    [=_eval fix _count =]
+tFixDesc fixDescList[ [=_eval fix _count =] ] = {[=
+
+
+_FOR fix ",\n" =]
+  {  z[=hackname _cap=]Name,    z[=hackname _cap=]List,
+     apz[=hackname _cap=]Machs, (regex_t*)NULL,
+     [=hackname  _up=]_TEST_CT, [=
+       _IF not_machine _exist =]FD_MACH_IFNOT[=
+       _ELSE                  =]FD_MACH_ONLY[=
+       _ENDIF =],
+     a[=hackname _cap=]Tests,   apz[=hackname _cap=]Patch }[=
+
+/fix=]
+};
diff --git a/gcc/fixinc/hackshell.tpl b/gcc/fixinc/hackshell.tpl
new file mode 100644
index 0000000..b387a43
--- /dev/null
+++ b/gcc/fixinc/hackshell.tpl
@@ -0,0 +1,186 @@
+[= autogen template include =]
+[=
+# $Id: hackshell.tpl,v 1.2 1998/12/16 21:19:08 law Exp $
+#
+#  This file contanes the shell template replacement for the
+#  fixincl program.  It is the repetitive guts of the fixincludes logic.
+#
+=]
+  if $LINKS; then
+    files=`find . -name '*.h' \( -type f -o -type l \) -print`
+  else
+    files=`find . -name '*.h' -type f -print`
+  fi
+  echo Checking header files
+  for file in $files; do
+
+    if ( test ! -r $file -o \
+    -n "`fgrep 'This file is part of the GNU C Library' $file`" )
+    then continue ; fi
+
+    fixlist=""
+[=
+#
+#  FOR  every fix description,
+#  DO:  emit the shell text to apply the fix to the current file
+#
+# =][=
+
+_FOR fix "\n\n" =]
+    #
+    # Fix [=_eval _index 1 + #%3d _printf=]:  [=hackname _Cap=]
+    #[=
+    _IF files _exist=]
+    case "$file" in [=_FOR files " | \\\n\t"=]./[=files=][=/files=] )[=
+    _ENDIF=][=
+
+    _IF mach _exist=]
+    case "$target_canonical" in [=
+        _FOR mach " | \\\n\t" =][=
+            mach =][=
+        /mach =] )[=
+        _IF mach_unmatched _exist =] : ;;
+    * )[=
+        _ENDIF =][=
+
+    _ENDIF=][=
+
+    #  There are three conditional tests:  select, bypass and test.
+       They may appear as often as desired.  They must all pass for
+       the fix to be applied.  "select" and "bypass" are egrep expressions
+       that must each appear (or not appear) in the target file.
+       "test" is an arbitrary test program expression that must yield
+       true or false.  It is enclosed in parenthesis to avoid
+       precedence problems.  The output looks like this:
+
+       if ( test -n "`egrep 'find-expr' $file`" -a
+                 -z "`egrep 'not-find'  $file`" -a
+                 '(' <some-test-expression> ')'
+          ) > /dev/null 2>&1 ; then
+
+    #  =][=
+
+    _IF select _exist =]
+    if ( test [=
+        _FOR select " -a \\\n              "
+              =]-n [=select _shrstr "#`egrep %s $file`"
+                            _printf _shstr =][=
+        /select=][=
+
+        _IF bypass _exist =][=
+            _FOR bypass=] -a \
+              -z [=bypass _shrstr "#`egrep %s $file`"
+                            _printf _shstr =][=
+            /bypass=][=
+        _ENDIF=][=
+
+        _IF test _exist=][=
+            _FOR test=] -a \
+              '(' [=test=] ')'[=
+            /test=][=
+        _ENDIF=]
+       ) > /dev/null 2>&1 ; then[=
+
+
+    _ELIF test _exist =]
+    if ( test [=
+        _FOR test " -a \\\n              "
+              =]'(' [=test=] ')'[=
+        /test=][=
+
+        _IF bypass _exist=][=
+            _FOR bypass=] -a \
+              -z [=bypass _shrstr "#`egrep %s $file`"
+                            _printf _shstr=][=
+            /bypass=][=
+        _ENDIF=]
+       ) > /dev/null 2>&1 ; then[=
+
+
+    _ELIF bypass _exist =]
+    if ( test [=_FOR bypass " -a \\\n              "
+              =]-z [=bypass _shrstr "#`egrep %s $file`"
+                            _printf _shstr=][=/bypass=]
+       ) > /dev/null 2>&1 ; then[=
+
+      _ENDIF=]
+    fixlist="${fixlist}
+      [=hackname=]"
+    if [ ! -r ${DESTDIR}/$file ]
+    then infile=$file
+    else infile=${DESTDIR}/$file ; fi [=
+
+    _IF sed _exist=][=
+        _IF shell _exist =][=
+          _ERROR hackname _get
+          "fixincludes Error:  %s fix has multiple fixups" _printf=][=
+        _ENDIF=]
+
+    sed [=
+        _FOR sed =]-e [=sed _shrstr=] \
+        [=
+        /sed=]  < $infile > ${DESTDIR}/$file.[=
+
+
+    _ELIF shell _exist =]
+    ( [=shell=] ) < $infile > ${DESTDIR}/$file.
+
+    #  Shell scripts have the potential of removing the output
+    #  We interpret that to mean the file is not to be altered
+    #
+    if test ! -f ${DESTDIR}/$file.
+    then continue ; fi [=
+
+
+    _ELSE=][=
+        _ERROR hackname _get "ERROR:  %s has no fixup" _printf=][=
+
+    _ENDIF=]
+    
+    mv -f ${DESTDIR}/$file. ${DESTDIR}/$file[=
+
+    #  Close off any opened "if" or "case" statements in reverse order
+
+    # =][=
+
+    _IF select _exist test _exist | bypass _exist | =]
+    fi # end of selection 'if'[=
+    _ENDIF =][=
+
+    _IF mach _exist=]
+    ;; # case end for machine type test
+    esac[=
+    _ENDIF =][=
+
+    _IF files _exist=]
+    ;; # case end for file name test
+    esac[=
+    _ENDIF =][=
+
+/fix =][=
+#
+#  DONE with every fix for the current file
+#
+#=]
+    #  IF the output has been removed OR it is unchanged,
+    #  THEN ensure the output is gone
+    #  ELSE look for local directory include syntax
+    #
+    if ( test ! -f ${DESTDIR}/$file || \
+         cmp $file ${DESTDIR}/$file ) > /dev/null 2>&1
+    then
+      rm -f ${DESTDIR}/$file
+    else
+      echo "Fixed $file:${fixlist}"
+
+      # Find any include directives that use "file".
+      #
+      for include in `
+         egrep '^[ 	]*#[ 	]*include[ 	]*"[^/]' ${DESTDIR}/$file |
+     sed -e 's/^[ 	]*#[ 	]*include[ 	]*"\([^"]*\)".*$/\1/'`
+      do
+    dir=`echo $file | sed -e s'|/[^/]*$||'`
+    required="$required ${SRCDIR} $dir/$include ${DESTDIR}/$dir/$include"
+      done
+    fi
+  done # for file in $files
diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def
new file mode 100644
index 0000000..332a3b1
--- /dev/null
+++ b/gcc/fixinc/inclhack.def
@@ -0,0 +1,2340 @@
+/* -*- Mode: C -*-  $Id: inclhack.def,v 1.2 1998/12/16 21:19:09 law Exp $  */
+
+autogen definitions inclhack;
+
+/*
+ *  Define all the fixes we know about for repairing damaged headers
+ */
+
+/*
+ *  sys/wait.h on AIX 3.2.5 puts the declaration of wait3 before the definition
+ *  of struct rusage, so the prototype (added by fixproto) causes havoc.
+ */
+fix = {
+    hackname = aix_syswait;
+    files    = sys/wait.h;
+    select = "bos325,";
+    sed    = "/^extern pid_t wait3();$/i\\\n"
+             "struct rusage;\n";
+};
+
+
+/*
+ *  sys/signal.h on some versions of AIX uses volatile in the typedef of
+ *  sig_atomic_t, which causes gcc to generate a warning about duplicate
+ *  volatile when a sig_atomic_t variable is declared volatile, as
+ *  required by ANSI C.
+ */
+fix = {
+    hackname = aix_volatile;
+    files    = sys/signal.h;
+    select   = "typedef volatile int sig_atomic_t";
+    sed      = "s/typedef volatile int sig_atomic_t"
+                "/typedef int sig_atomic_t/";
+};
+
+
+/*
+ *  Fix getopt declarations in stdio.h and stdlib.h on Alpha OSF/1 and AIX.
+ */
+fix = {
+    hackname = alpha_getopt;
+    files  = "stdio.h";
+    files  = "stdlib.h";
+    select = 'getopt\(int, char \*\[';
+    sed    = 's/getopt(int, char \*\[\],[ ]*char \*)/'
+               'getopt(int, char *const[], const char *)/';
+};
+
+
+/* 
+ * Determine if we're on Interactive Unix 2.2 or later, in which case we
+ * need to fix some additional files.  This is the same test for ISC that
+ * Autoconf uses.  On Interactive 2.2, certain traditional Unix
+ * definitions (notably getc and putc in stdio.h) are omitted if __STDC__
+ * is defined, not just if _POSIX_SOURCE is defined.  This makes it
+ * impossible to compile any nontrivial program except with -posix.
+ */
+fix = {
+    hackname = alpha_parens;
+    files    = sym.h;
+    select   = '#ifndef\(__mips64\)';
+    sed      = "s/#ifndef(__mips64)/#ifndef __mips64/";
+};
+
+
+/*
+ *  Fix return value of sbrk in unistd.h on Alpha OSF/1 V2.0
+ */
+fix = {
+    hackname = alpha_sbrk;
+    files    = unistd.h;
+    select   = "char[ \t]*\\*[\t ]*sbrk[ \t]*\\(";
+    sed  = "s/char\\([ \t]*\\*[\t ]*sbrk[ \t]*(\\)/void\\1/";
+};
+
+
+/*
+ *  Fix this ARM/RISCiX file where ___type is a Compiler
+ *  hint that is specific to the Norcroft compiler.
+ */
+fix = {
+    hackname = arm_norcroft_hint;
+    files    = "X11/Intrinsic.h";
+    sed      = "s/___type p_type/p_type/";
+};
+
+
+/*
+ *  Fix this ARM/RISCiX file to avoid interfering
+ *  with the use of __wchar_t in cc1plus.
+ */
+fix = {
+    hackname = arm_wchar;
+    files  = stdlib.h;
+    select = "#[ \t]*define[ \t]*__wchar_t";
+    sed    = "s/\\(#[ \t]*ifndef[ \t]*\\)__wchar_t/\\1_GCC_WCHAR_T/";
+    sed    = "s/\\(#[ \t]*define[ \t]*\\)__wchar_t/\\1_GCC_WCHAR_T/";
+};
+
+
+/*
+ *  This file in A/UX 3.0.x/3.1.x contains an __asm directive for c89;
+ *  gcc doesn't understand it.
+ */
+fix = {
+    hackname = aux_asm;
+    files    = sys/param.h;
+    select   = "#ifndef NOINLINE";
+    sed      = "s|#ifndef NOINLINE"
+                "|#if !defined(NOINLINE) \\&\\& !defined(__GNUC__)|";
+};
+
+
+/*
+ *  For C++, avoid any typedef or macro definition of bool,
+ *  and use the built in type instead.
+ */
+fix = {
+    hackname = avoid_bool;
+    files    = curses.h;
+    files    = term.h;
+    files    = tinfo.h;
+
+    sed = "/^#[ \t]*define[ \t][ \t]*bool[ \t][ \t]*char[ \t]*$/i\\\n"
+                "#ifndef __cplusplus\n";
+
+    sed = "/^#[ \t]*define[ \t][ \t]*bool[ \t][ \t]*char[ \t]*$/a\\\n"
+                "#endif\n";
+
+    sed = "/^typedef[ \t][ \t]*char[ \t][ \t]*bool[ \t]*;/i\\\n"
+                "#ifndef __cplusplus\n";
+
+    sed = "/^typedef[ \t][ \t]*char[ \t][ \t]*bool[ \t]*;/a\\\n"
+                "#endif\n";
+};
+
+
+/*
+ *  rpc/types.h on OSF1/2.0 is not C++ ready, even though NO_IMPLICIT_EXTERN_C
+ *  is defined for the alpha.  The problem is the declaration of malloc.
+ */
+fix = {
+    hackname = bad_malloc_decl;
+    files    = rpc/types.h;
+    bypass   = '"C"';
+    sed      = "1i\\\n"
+               "#ifdef __cplusplus\\\n"
+               "extern \"C\" {\\\n"
+               "#endif\\\n\n";
+    sed      = "$a\\\n"
+               "#ifdef __cplusplus\\\n"
+               "}\\\n"
+               "#endif\n";
+};
+
+
+/*
+ *  Fix `typedef struct term;' on hppa1.1-hp-hpux9.
+ */
+fix = {
+    hackname = bad_struct_term;
+    files  = curses.h;
+    select = "^[ \t]*typedef[ \t]+struct[ \t]+term[ \t]*;";
+    sed    = "s/^[ \t]*typedef[ \t][ \t]*"
+             "\\(struct[ \t][ \t]*term[ \t]*;[ \t]*\\)$/\\1/";
+};
+
+
+/*
+ *  Fix one other error in this file:
+ *  a mismatched quote not inside a C comment.
+ */
+fix = {
+    hackname = badquote;
+    files    = sundev/vuid_event.h;
+    sed      = "s/doesn't/does not/";
+};
+
+
+/*
+ *  Fix #defines under Alpha OSF/1:
+ *  The following files contain '#pragma extern_prefix "_FOO"' followed by
+ *  a '#define something(x,y,z) _FOOsomething(x,y,z)'.  The intent of these
+ *  statements is to reduce namespace pollution.  While these macros work
+ *  properly in most cases, they don't allow you to take a pointer to the
+ *  "something" being modified.  To get around this limitation, change these
+ *  statements to be of the form '#define something _FOOsomething'.
+ */
+fix = {
+    hackname = bad_lval;
+    select   = "^[ \t]*#[ \t]*pragma[ \t]extern_prefix";
+    files    = libgen.h;
+    files    = dirent.h;
+    files    = ftw.h;
+    files    = grp.h;
+    files    = ndbm.h;
+    files    = pthread.h;
+    files    = pwd.h;
+    files    = signal.h;
+    files    = standards.h;
+    files    = stdlib.h;
+    files    = string.h;
+    files    = stropts.h;
+    files    = time.h;
+    files    = unistd.h;
+    sed      =
+        "s/^[ \t]*#[ \t]*define[ \t]*\\([^(]*\\)\\(([^)]*)\\)[ \t]*"
+               "\\(_.\\)\\1\\2[ \t]*$/#define \\1 \\3\\1/";
+};
+
+
+/*
+ *  check for broken assert.h that needs stdio.h
+ */
+fix = {
+    hackname = broken_assert_stdio;
+    files    = assert.h;
+    select   = stderr;
+    bypass   = "include.*stdio.h";
+    sed      = "1i\\\n"
+               "#include <stdio.h>\n";
+};
+
+
+/*
+ *  check for broken assert.h that needs stdlib.h
+ */
+fix = {
+    hackname = broken_assert_stdlib;
+    files    = assert.h;
+    select   = 'exit *\(|abort *\(';
+    bypass   = "include.*stdlib.h";
+    sed      = "1i\\\n"
+               "#ifdef __cplusplus\\\n"
+               "#include <stdlib.h>\\\n"
+               "#endif\n";
+};
+
+
+/*
+ *  Note that BSD43_* are used on recent MIPS systems.
+ */
+fix = {
+    hackname = bsd43_io_macros;
+    select   = "BSD43__IO";
+    /*
+     *  Put single quotes aroung the character that appears after '('
+     *  and before ',', UNLESS it is a 'c' or 'g' or 'x'.
+     */
+    sed = "/[ \t]BSD43__IO[A-Z]*[ \t]*(/"       's/(\(.\),/(\'\1\',/';
+    sed = "/#[ \t]*define[ \t]*[ \t]BSD43__IO/" 's/\'\([cgx]\)\'/\1/g';
+};
+
+#IFDEF no_more
+/*
+ *  And also with the HP-UX 10 and HP-UX 11 sys/pci.h file
+ */
+fix = {
+    hackname = cxx_cmnt_hpux;
+    files    = sys/pci.h;
+    select   = "System Private Structures";
+    sed      = "s|//.*$||g";
+};
+
+
+/*
+ *  Turning // comments into normal 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.
+ */
+fix = {
+    hackname = cxx_cmnt_irix;
+    files    = fam.h;
+    select   = indigo.esd;
+    sed      = "s|//.*$||g";
+};
+
+
+/*
+ *  Same problem with a file from SunOS 4.1.3 : a header file containing
+ *  the string "//" embedded in "/ * * /"
+ */
+fix = {
+    hackname = cxx_cmnt_sunos;
+    files    = sbusdev/audiovar.h;
+    files    = sys/audiovar.h;
+    sed      = "s|//.*$||g";
+};
+
+
+/*
+ *  There is a similar problem with the VxWorks drv/netif/if_med.h file.
+ */
+fix = {
+    hackname = cxx_cmnt_vxworks;
+    files    = drv/netif/if_med.h;
+    select   = "Wind River";
+    sed      = "s|//.*$||g";
+};
+#endif
+
+/*
+ *  Remove the double-slash comments
+ *  They *must* be removed so it will not create nested comments!!
+ *  However, they will *not* be removed if '++' is in any part of
+ *  the file name, or if the name ends with ".hh" or ".H".
+ *
+ *  There *used* to be a number of similar problems in various OSes:
+
+ *  Turning // comments into normal 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.
+
+ *  Same problem with a file from SunOS 4.1.3 : a header file containing
+ *  the string "//" embedded in "/ * * /"
+
+ *  There is a similar problem with the VxWorks drv/netif/if_med.h file.
+
+ *  And also with the HP-UX 10 and HP-UX 11 sys/pci.h file
+ */
+fix = {
+    hackname = no_double_slash;
+    test     = '-z "`echo ${file}|egrep \'++$|\.hh$|\.H$\'`"';
+    select = '//[^*]';
+    sed    = '/\/\/[^*]/' "s|//.*$||g";
+};
+
+
+/*
+ *  Multiline comment after typedef on IRIX 4.0.1.
+ */
+fix = {
+    hackname = irix_bogus_cxx_cmnt;
+    files  = "elf_abi.h";
+    files  = "elf.h";
+    /*
+     *  This really looks like it is replacing "/ * * /" with "//"
+     *  Shouldn't the replacement really be " ## "?
+     */
+    sed      = 's@"/\*"\*/@"//"@';
+};
+
+
+/*
+ * Fix these Sun OS files to avoid an invalid identifier in an #ifdef.
+ */
+fix = {
+    hackname = ecd_cursor;
+    files  = "sunwindow/win_lock.h";
+    files  = "sunwindow/win_cursor.h";
+    sed    = "s/ecd.cursor/ecd_cursor/";
+};
+
+
+
+/*
+ *  Fix else directives that contain non-commentary text
+ *
+ * The fixinc_eol stuff is to work around a bug in the sed
+ */
+fix = {
+    hackname = else_label;
+    select   = "^[ \t]*#[ \t]*else[ \t]+[!-.0-~]";
+    sed =      ":loop\n"
+               '/\\\\$/'                       "N\n"
+               's/\\\\$/\\\\+++fixinc_eol+++/' "\n"
+               '/\\\\$/'                       "b loop\n"
+               's/\\\\+++fixinc_eol+++/\\\\/g' "\n"
+
+               "s%^\\([ \t]*#[ \t]*else\\)[ \t]*/[^*].*%\\1%\n"
+               "s%^\\([ \t]*#[ \t]*else\\)[ \t]*[^/ \t].*%\\1%";
+};
+
+
+/*
+ *  Fix endif directives that contain non-commentary text
+ */
+fix = {
+    hackname = endif_label;
+    /*
+     *  Select files that contain '#endif' directives with
+     *  some sort of following junk.  (Between the ascii '.'
+     *  and '0' lies the character '/'.  This will *NOT*
+     *  match '#endif / * foo * /', but it also wont match
+     *  '#endif / done' either.
+     *
+     *  We use the pattern [!-.0-z{|}~] instead of [^/ \t] to match a noncomment
+     *  following #else or #endif because some buggy egreps think [^/] matches
+     *  newline, and they thus think `#else ' matches
+     *  `#e[ndiflse]*[ \t]+[^/ \t]'.
+     *  [!-.0-~] does not work properly on AIX 4.1.
+     */
+    select   = "^[ \t]*#[ \t]*endif[ \t]+[!-.0-z\{\|\}\~]";
+
+    /*
+     *  First, join the continued input lines.
+     *  IF the resulting line is an endif preprocessing directive,
+     *  then trim off the following patterns:
+     *  1.  sequences that start with '/' and is *NOT* followed by '*'
+     *  2.  Sequences that start with '*' and is *NOT* followed by '/'
+     *  3.  sequences that do not start with any of '/', '*', '\t' or ' '.
+     *
+     * The fixinc_eol stuff is to work around a bug in the sed
+     */
+    sed =      ":loop\n"
+               '/\\\\$/'                       "N\n"
+               's/\\\\$/\\\\+++fixinc_eol+++/' "\n"
+               '/\\\\$/'                       "b loop\n"
+               's/\\\\+++fixinc_eol+++/\\\\/g' "\n"
+
+               "s%^\\([ \t]*#[ \t]*endif\\)[ \t]*/[^*].*%\\1%\n"
+               "s%^\\([ \t]*#[ \t]*endif\\)[ \t]*\\*[^/].*%\\1%\n"
+               "s%^\\([ \t]*#[ \t]*endif\\)[ \t]*[^/* \t].*%\\1%";
+};
+
+
+/*
+ *  Fix HP's use of ../machine/inline.h to refer to
+ *    /usr/include/machine/inline.h
+ */
+fix = {
+    hackname = hp_inline;
+    files  = sys/spinlock.h;
+    select = 'include.*"\.\./machine/';
+    sed    = "s,\"../machine/inline.h\",<machine/inline.h>,";
+    sed    = "s,\"../machine/psl.h\",<machine/psl.h>,";
+};
+
+
+/*
+ *  Check for (...) in C++ code in HP/UX sys/file.h.
+ */
+fix = {
+    hackname = hp_sysfile;
+    files    = sys/file.h;
+    select   = "HPUX_SOURCE";
+    sed      = 's/(\.\.\.)/(struct file * ...)/';
+};
+
+
+/*
+ *  sys/mman.h on HP/UX is not C++ ready,
+ *  even though NO_IMPLICIT_EXTERN_C is defined on HP/UX.
+ */
+fix = {
+    hackname = hpux_cxx_unready;
+    files    = sys/mman.h;
+    bypass = '"C"|__BEGIN_DECLS';
+
+    sed      = "1i\\\n"
+               "#ifdef __cplusplus\\\n"
+               "extern \"C\" {\\\n"
+               "#endif\\\n\n";
+    sed      = "$a\\\n"
+               "#ifdef __cplusplus\\\n"
+               "}\\\n"
+               "#endif\n";
+};
+
+
+/*
+ *  HPUX 10.x sys/param.h defines MAXINT which clashes with values.h
+ */
+fix = {
+    hackname = hpux_maxint;
+    files    = sys/param.h;
+    sed      = "/^#[ \t]*define[ \t]*MAXINT[ \t]/i\\\n"
+               "#ifndef MAXINT\n";
+
+    sed      = "/^#[ \t]*define[ \t]*MAXINT[ \t]/a\\\n"
+               "#endif\n";
+};
+
+
+/*
+ *  Fix hpux10.20 <sys/time.h> to avoid invalid forward decl
+ */
+fix = {
+    hackname = hpux_systime;
+    files    = sys/time.h;
+    select   = "^extern struct sigevent;";
+    sed      = "s/^extern struct sigevent;/struct sigevent;/";
+};
+
+
+/*
+ *  Fix various _IO* defines, but do *not* quote the characters cgxtf.
+ */
+fix = {
+    hackname = interactv_add1;
+
+    test   = "-d /etc/conf/kconfig.d";
+    test   = '-n "`grep _POSIX_VERSION /usr/include/sys/unistd.h`"';
+
+    files  = "stdio.h";
+    files  = "math.h";
+    files  = "ctype.h";
+    files  = "sys/limits.h";
+    files  = "sys/fcntl.h";
+    files  = "sys/dirent.h";
+
+    sed    = "s/!defined(__STDC__) && !defined(_POSIX_SOURCE)/"
+               "!defined(_POSIX_SOURCE)/";
+};
+
+fix = {
+    hackname = interactv_add2;
+
+    test   = "-d /etc/conf/kconfig.d";
+    test   = '-n "`grep _POSIX_VERSION /usr/include/sys/unistd.h`"';
+
+    files  = math.h;
+    sed    = "s/fmod(double)/fmod(double, double)/";
+};
+
+fix = {
+    hackname = interactv_add3;
+
+    test   = "-d /etc/conf/kconfig.d";
+    test   = '-n "`grep _POSIX_VERSION /usr/include/sys/unistd.h`"';
+
+    files  = sys/limits.h;
+
+    sed    = "/CHILD_MAX/s,/\\* Max, Max,";
+    sed    = "/OPEN_MAX/s,/\\* Max, Max,";
+};
+
+
+/*
+ *  Remove erroneous parentheses in sym.h on Alpha OSF/1.
+ */
+fix = {
+    hackname = io_def_quotes;
+    select = "[ \t]_IO[A-Z]*[ \t]*\\([A-Za-z]";
+    sed = "s/\\([ \t]_IO[A-Z]*[ \t]*(\\)\\([A-Za-z]\\),/\\1'\\2',/";
+    sed = "/#[ \t]*define[ \t]*[ \t]_IO/"
+              "s/'\\([cgxtf]\\)'/\\1/g";
+    sed = "/#[ \t]*define[ \t]*[ \t]DESIOC/"    's/\'\([cdgx]\)\'/\1/g';
+};
+
+
+/*
+ *  Fix CTRL macros
+ */
+fix = {
+    hackname = ioctl_fix_ctrl;
+    select = "CTRL[ \t]";
+
+    sed = "/[^A-Z0-9_]CTRL[ \t]*(/"
+              "s/\\([^']\\))/'\\1')/";
+
+    sed = "/[^A-Z0-9]_CTRL[ \t]*(/"
+              "s/\\([^']\\))/'\\1')/";
+
+    sed = "/#[ \t]*define[ \t]*[ \t]CTRL/"
+              "s/'\\([cgx]\\)'/\\1/g";
+
+    sed = "/#[ \t]*define[ \t]*[ \t]_CTRL/"
+              "s/'\\([cgx]\\)'/\\1/g";
+
+    sed = "/#[ \t]*define[ \t]*[ \t]BSD43_CTRL/"
+              "s/'\\([cgx]\\)'/\\1/g";
+};
+
+
+/*
+ *  Check for missing ';' in struct
+ */
+fix = {
+    hackname = ip_missing_semi;
+    files    = netinet/ip.h;
+    sed      = "/^struct/,/^};/s/}$/};/";
+};
+
+
+/*
+ *  IRIX 4.0.5 <rpc/auth.h> uses struct sockaddr
+ *  in prototype without previous definition.
+ */
+fix = {
+    hackname = irix_multiline_cmnt;
+    files    = sys/types.h;
+
+    sed   = "s@type of the result@type of the result */@";
+    sed   = "s@of the sizeof@/* of the sizeof@";
+};
+
+
+/*
+ *  Some IRIX header files contain the string "//"
+ */
+fix = {
+    hackname = irix_sockaddr;
+    files    = rpc/auth.h;
+    select   = "authdes_create.*struct sockaddr";
+    sed      = "/authdes_create.*struct sockaddr/i\\\n"
+               "struct sockaddr;\n";
+};
+
+
+/*
+ *  IRIX 4.0.5 <rpc/xdr.h> uses struct __file_s
+ *  in prototype without previous definition.
+ */
+fix = {
+    hackname = irix_struct__file;
+    files = rpc/xdr.h;
+    sed   = "/xdrstdio_create.*struct __file_s/i\\\n"
+            "struct __file_s;\n";
+};
+
+
+/*
+ * Fixing ISC fmod declaration
+ */
+fix = {
+    hackname = isc_fmod;
+    files    = math.h;
+    select   = 'fmod\(double\)';
+    sed      = "s/fmod(double)/fmod(double, double)/";
+};
+
+  
+/*
+ * Fix nested comments in Motorola's <limits.h> and <sys/limits.h>
+ */
+fix = {
+    hackname = motorola_nested;
+    files    = limits.h;
+    files    = sys/limits.h;
+    sed = "s@^\\(#undef[ \t][ \t]*PIPE_BUF[ \t]*"
+                   "/\\* max # bytes atomic in write to a\\)$@\\1 */@";
+    sed = "s@\\(/\\*#define\tHUGE_VAL\t3.40282346638528860e+38 \\)"
+          "\\(/\\*error value returned by Math lib\\*/\\)$@\\1*/ \\2@";
+};
+
+  
+/*
+ * Fixing nested comments in ISC <sys/limits.h>
+ */
+fix = {
+    hackname = isc_sys_limits;
+    files  = sys/limits.h;
+    select = CHILD_MAX;
+    sed    = "/CHILD_MAX/s,/\\* Max, Max,";
+    sed    = "/OPEN_MAX/s,/\\* Max, Max,";
+};
+
+
+/*
+ * These files in Sun OS 4.x and ARM/RISCiX and BSD4.3
+ * use / * * / to concatenate tokens.
+ */
+fix = {
+    hackname = kandr_concat;
+    files  = "sparc/asm_linkage.h";
+    files  = "sun3/asm_linkage.h";
+    files  = "sun3x/asm_linkage.h";
+    files  = "sun4/asm_linkage.h";
+    files  = "sun4c/asm_linkage.h";
+    files  = "sun4m/asm_linkage.h";
+    files  = "sun4c/debug/asm_linkage.h";
+    files  = "sun4m/debug/asm_linkage.h";
+    files  = "arm/as_support.h";
+    files  = "arm/mc_type.h";
+    files  = "arm/xcb.h";
+    files  = "dev/chardefmac.h";
+    files  = "dev/ps_irq.h";
+    files  = "dev/screen.h";
+    files  = "dev/scsi.h";
+    files  = "sys/tty.h";
+    files  = "Xm.acorn/XmP.h";
+    files  = bsd43/bsd43_.h;
+    select = '/\*\*/';
+    sed    = 's|/\*\*/| ## |g';
+};
+
+
+/*
+ *  In limits.h, put #ifndefs around things that are supposed to be defined
+ *  in float.h to avoid redefinition errors if float.h is included first.
+ *  On HP/UX this patch does not work, because on HP/UX limits.h uses
+ *  multi line comments and the inserted #endif winds up inside the
+ *  comment.  Fortunately, HP/UX already uses #ifndefs in limits.h; if
+ *  we find a #ifndef FLT_MIN we assume that all the required #ifndefs
+ *  are there, and we do not add them ourselves.
+ *  Also fix a nested comment problem in sys/limits.h on Motorola sysV68 R3V7.1
+ */
+fix = {
+    hackname = limits_ifndefs;
+    files  = "limits.h";
+    bypass = "ifndef[ \t]+FLT_MIN";
+
+    sed  = "/[ \t]FLT_MIN[ \t]/i\\\n#ifndef FLT_MIN\n";
+    sed  = "/[ \t]FLT_MIN[ \t]/a\\\n#endif\n";
+    sed  = "/[ \t]FLT_MAX[ \t]/i\\\n#ifndef FLT_MAX\n";
+    sed  = "/[ \t]FLT_MAX[ \t]/a\\\n#endif\n";
+    sed  = "/[ \t]FLT_DIG[ \t]/i\\\n#ifndef FLT_DIG\n";
+    sed  = "/[ \t]FLT_DIG[ \t]/a\\\n#endif\n";
+    sed  = "/[ \t]DBL_MIN[ \t]/i\\\n#ifndef DBL_MIN\n";
+    sed  = "/[ \t]DBL_MIN[ \t]/a\\\n#endif\n";
+    sed  = "/[ \t]DBL_MAX[ \t]/i\\\n#ifndef DBL_MAX\n";
+    sed  = "/[ \t]DBL_MAX[ \t]/a\\\n#endif\n";
+    sed  = "/[ \t]DBL_DIG[ \t]/i\\\n#ifndef DBL_DIG\n";
+    sed  = "/[ \t]DBL_DIG[ \t]/a\\\n#endif\n";
+    sed  = "/^\\(\\/\\*#define\tHUGE_VAL\t3\\.[0-9e+]* *\\)\\/\\*/s//\\1/";
+};
+
+
+/*
+ *  Delete the '#define void int' line from curses.h on Lynx
+ */
+fix = {
+    hackname = lynx_void_int;
+    files    = curses.h;
+    select   = "#[ \t]*define[ \t]+void[ \t]+int";
+    sed      = "/#[ \t]*define[ \t][ \t]*void[ \t]int/d";
+};
+
+
+/*
+ *  Fix fcntl prototype in fcntl.h on LynxOS.
+ */
+fix = {
+    hackname = lynxos_fcntl_proto;
+    files    = fcntl.h;
+
+  sed = 's/\(fcntl.*(int, int, \)int)/\1...)/';
+};
+
+
+/*
+ *  Fix incorrect S_IF* definitions on m88k-sysv3.
+ */
+fix = {
+    hackname = m88k_bad_hypot_opt;
+    mach     = "m88k-motorola-sysv3*";
+    files    = "math.h";
+
+    sed = "s/extern double floor(), ceil(), fmod(), fabs();/"
+            "extern double floor(), ceil(), fmod(), fabs _PARAMS((double));/";
+
+    sed = "/^extern double hypot();$/a\\\n"
+          "\\/* Workaround a stupid Motorola optimization if one\\\n"
+          "   of x or y is 0.0 and the other is negative!  *\\/\\\n"
+          "#ifdef __STDC__\\\n"
+          "static __inline__ double fake_hypot (double x, double y)\\\n"
+          "#else\\\n"
+          "static __inline__ double fake_hypot (x, y)\\\n"
+          "\tdouble x, y;\\\n"
+          "#endif\\\n"
+          "{\\\n"
+          "\treturn fabs (hypot (x, y));\\\n"
+          "}\\\n"
+          "#define hypot\tfake_hypot\n";
+};
+
+
+/*
+ *  Fix non-ansi machine name defines
+ *  This is split into two parts:  the shell version as a single
+ *  patch, and the program version with each patch separate.
+ *  Each is substantially faster for the particular environment.
+ * You have a dual maintenance problem here.  */
+fix = {
+    hackname = m88k_bad_s_if;
+    mach     = "m88k-*-sysv3*";
+    files    = sys/stat.h;
+    select   = "#define[ \t]+S_IS[A-Z]*(m)[ \t]";
+
+    sed = "s/^\\(#define[ \t]*S_IS[A-Z]*(m)\\)[ \t]*"
+            "(m[ \t]*&[ \t]*\\(S_IF[A-Z][A-Z][A-Z][A-Z]*\\)[ \t]*)/"
+            "\\1 (((m)\\&S_IFMT)==\\2)/";
+
+    sed = "s/^\\(#define[ \t]*S_IS[A-Z]*(m)\\)[ \t]*"
+            "(m[ \t]*&[ \t]*\\(0[0-9]*\\)[ \t]*)/"
+            "\\1 (((m)\\&S_IFMT)==\\2)/";
+};
+
+
+/*
+ * Put cpp wrappers around these include files to avoid redeclaration
+ * errors during multiple inclusion on m88k-tektronix-sysv3.
+ */
+fix = {
+    hackname = m88k_multi_incl;
+    mach     = "m88k-tektronix-sysv3*";
+    files    = "time.h";
+    bypass   = "#ifndef";
+    shell    =
+      "echo Fixing $file, to protect against multiple inclusion. >&2
+      cpp_wrapper=`echo $file | sed -e 's,\\.,_,g' -e 's,/,_,g'`
+      sed -e \"1i\\\n"
+        "#ifndef __GCC_GOT_${cpp_wrapper}_\\\n"
+        "#define __GCC_GOT_${cpp_wrapper}_\\\n\" \\\n"
+                "\t-e \"$a\\\n"
+        "#endif /* ! __GCC_GOT_${cpp_wrapper}_ */\n\"";
+};
+
+
+/*
+ *  libm.a on m88k-motorola-sysv3 contains a stupid optimization for
+ *  function hypot(), which returns the second argument without even
+ *  looking at its value if the other is 0.0 Another drawback is that
+ *  fix-header doesn't fix fabs' prototype, and I have no idea why.
+ */
+fix = {
+    hackname = machine_name;
+    /*
+     *  Select '#if.*' and '#elif" with possible non-ansi symbols
+     *  The only non-ansi symbols we know about start with one of:
+     *     MRS_bhimnprstuv
+     *  If any are added to the substitution list, then add it to
+     *  the selection list as well.  Hopefully we can avoid names
+     *  starting with "d" and "l", because this pattern would then
+     *  match "defined" and "lint" as well.  I suppose we could add
+     *  a "bypass = lint" if we had to though.
+     *
+     * The fixinc_eol stuff is to work around a bug in the sed
+     */
+    select = "^#[ \t]*(if|elif).*"
+             "[^a-zA-Z0-9_](_*[MSRrhim]|[Mbimnpstuv])[a-zA-Z0-9_]";
+    exesel = "^#[ \t]*(if|elif).*[^a-zA-Z0-9_]"
+             "("
+                  "M32"
+                 "|_*("
+                       "MIPSE[LB]"
+                      "|SYSTYPE_[A-Z0-9]"
+                      "|[Rr][34]000"
+                      "|host_mips"
+                      "|i386"
+                      "|mips"
+                    ")($|[^a-zA-Z0-9_])"
+                 "|bsd4"
+                 "|is68k"
+                 "|m[68]8k"
+                 "|mc680"
+                 "|news"
+                 "|ns32000"
+                 "|pdp11"
+                 "|pyr"
+                 "|sel"
+                 "|sony_news"
+                 "|sparc"
+                 "|sun"
+                 "|tahoe"
+                 "|tower"
+                 "|u370"
+                 "|u3b"
+                 "|unix"
+                 "|vax"
+             ")";
+
+    sed =      ":loop\n"
+               '/\\\\$/'                       "N\n"
+               's/\\\\$/\\\\+++fixinc_eol+++/' "\n"
+               '/\\\\$/'                       "b loop\n"
+               's/\\\\+++fixinc_eol+++/\\\\/g' "\n"
+
+          "/#[\t ]*[el]*if/ {\n"
+                "\ts/[a-zA-Z0-9_][a-zA-Z0-9_]*/ & /g\n"
+
+                "\ts/ M32 / __M32__ /g\n"
+                "\ts/ _*MIPSE\\([LB]\\) / __MIPSE\\1__ /g\n"
+                "\ts/ _*SYSTYPE_\\([A-Z0-9]*\\) / __SYSTYPE_\\1__ /g\n"
+                "\ts/ _*\\([Rr][34]\\)000 / __\\1000__ /g\n"
+                "\ts/ _*host_mips / __host_mips__ /g\n"
+                "\ts/ _*i386 / __i386__ /g\n"
+                "\ts/ _*mips / __mips__ /g\n"
+                "\ts/ bsd4\\([0-9]\\) / __bsd4\\1__ /g\n"
+                "\ts/ is68k / __is68k__ /g\n"
+                "\ts/ m68k / __m68k__ /g\n"
+                "\ts/ m88k / __m88k__ /g\n"
+                "\ts/ mc680\\([0-9]\\)0 / __mc680\\10__ /g\n"
+                "\ts/ news\\([0-9]*\\) / __news\\1__ /g\n"
+                "\ts/ ns32000 / __ns32000__ /g\n"
+                "\ts/ pdp11 / __pdp11__ /g\n"
+                "\ts/ pyr / __pyr__ /g\n"
+                "\ts/ sel / __sel__ /g\n"
+                "\ts/ sony_news / __sony_news__ /g\n"
+                "\ts/ sparc / __sparc__ /g\n"
+                "\ts/ sun\\([a-z0-9]*\\) / __sun\\1__ /g\n"
+                "\ts/ tahoe / __tahoe__ /g\n"
+                "\ts/ tower\\([_0-9]*\\) / __tower\\1__ /g\n"
+                "\ts/ u370 / __u370__ /g\n"
+                "\ts/ u3b\\([0-9]*\\) / __u3b\\1__ /g\n"
+                "\ts/ unix / __unix__ /g\n"
+                "\ts/ vax / __vax__ /g\n"
+
+                "\ts/ \\([a-zA-Z0-9_][a-zA-Z0-9_]*\\) /\\1/g\n\t}";
+};
+
+
+/*
+ *  Some math.h files define struct exception, which conflicts with
+ *  the class exception defined in the C++ file std/stdexcept.h.  We
+ *  redefine it to __math_exception.  This is not a great fix, but I
+ *  haven't been able to think of anything better.
+ */
+fix = {
+    hackname = math_exception;
+    files    = math.h;
+    select   = "struct exception";
+    sed      = "/struct exception/i\\\n"
+               "#ifdef __cplusplus\\\n"
+               "#define exception __math_exception\\\n"
+               "#endif\n";
+    sed      = "/struct exception/a\\\n"
+               "#ifdef __cplusplus\\\n"
+               "#undef exception\\\n"
+               "#endif\n";
+
+    sed      = "/matherr/i\\\n"
+               "#ifdef __cplusplus\\\n"
+               "#define exception __math_exception\\\n"
+               "#endif\n";
+
+    sed      = "/matherr/a\\\n"
+               "#ifdef __cplusplus\\\n"
+               "#undef exception\\\n"
+               "#endif\n";
+};
+
+
+/*
+ * In math.h, put #ifndefs around things that might be defined
+ * in a gcc specific math-*.h file.
+ */
+fix = {
+    hackname = math_gcc_ifndefs;
+    files    = math.h;
+    shell    = " dbl_max_def="
+        "\"`egrep 'define[ \t]+DBL_MAX[ \t]+.*' ${SRCDIR}/float.h "
+                "2>/dev/null`\"\n\n"
+
+        "\tif ( test -n \"${dbl_max_def}\" \\\n"
+        "\t\t-a -n \"`egrep '#define[ \t]*HUGE_VAL[ \t]+DBL_MAX' $file`\" \\\n"
+        "\t\t-a -z \"`egrep '#define[ \t]+DBL_MAX[ \t]+' $file`\"\n"
+              "\t   ) > /dev/null 2>&1\n"
+
+        "\tthen sed -e '/define[ \t]HUGE_VAL[ \t]/i\\\n"
+            "#ifndef HUGE_VAL\n' \\\n"
+        "\t-e '/define[ \t]HUGE_VAL[ \t]/a\\\n#endif\n'\\\n"
+        "\t-e \"/define[ \t]HUGE_VAL[ \t]DBL_MAX/s/DBL_MAX/$dbl_max_def/\"\n"
+
+        "\telse sed -e '/define[ \t]HUGE_VAL[ \t]/i\\\n"
+            "#ifndef HUGE_VAL\n' \\\n"
+        "\t-e '/define[ \t]HUGE_VAL[ \t]/a\\\n#endif\n'\n"
+        "\tfi";
+};
+
+
+/*
+ * libm.a on m88k-motorola-sysv3 contains a stupid optimization for
+ * function hypot(), which returns the second argument without even
+ * looking at its value
+ */
+fix = {
+    hackname = motorola_stupid_opt;
+    mach     = "m88k-motorola-sysv3*";
+    files    = math.h;
+    select   = "^extern double hypot();$";
+    sed      =
+          '/^extern double hypot();$/a' "\\\n"
+          '\/* Workaround a stupid Motorola optimization if one' "\\\n"
+          '   of x or y is 0.0 and the other is negative!  *\/' "\\\n"
+          '#ifdef __STDC__' "\\\n"
+          'static __inline__ double fake_hypot (double x, double y)' "\\\n"
+          '#else' "\\\n"
+          'static __inline__ double fake_hypot (x, y)' "\\\n"
+          "\tdouble x, y;\\\n"
+          '#endif' "\\\n"
+          '{' "\\\n"
+          "\treturn fabs (hypot (x, y));\\\n"
+          '}' "\\\n"
+          "#define hypot\tfake_hypot\n";
+};
+
+
+/*
+ *  nested comment
+ */
+fix = {
+    hackname = nested_comment;
+    files    = rpc/rpc.h;
+    sed      = 's@^\(/\*.*rpc/auth_des.h>.*\)/\*@\1*/ /*@';
+};
+
+
+/*
+ *  fix bogus recursive stdlib.h in NEWS-OS 4.0C
+ */
+fix = {
+    hackname = news_os_recursion;
+    files    = stdlib.h;
+    select   = "#include <stdlib.h>";
+    sed      = "/^#include <stdlib.h>/i\\\n"
+                    "#ifdef BOGUS_RECURSION\n";
+    sed      = "/^#include <stdlib.h>/a\\\n"
+                    "#endif\n";
+};
+
+
+/*
+ *  NeXT 3.2 adds const prefix to some math functions.
+ *  These conflict with the built-in functions.
+ */
+fix = {
+    hackname = next_math_prefix;
+    files    = ansi/math.h;
+    select   = "^extern.*double.*__const__.*";
+
+    sed = "/^extern.*double.*__const__.*sqrt(/s/__const__//";
+    sed = "/^extern.*double.*__const__.*fabs(/s/__const__//";
+    sed = "/^extern.*double.*__const__.*cos(/s/__const__//";
+    sed = "/^extern.*double.*__const__.*hypot(/s/__const__//";
+    sed = "/^extern.*double.*__const__.*sin(/s/__const__//";
+};
+
+
+/*
+ *  NeXT 3.2 uses the word "template" as a parameter for some
+ *  functions. GCC reports an invalid use of a reserved key word
+ *  with the built-in functions. NeXT 3.2 includes the keyword
+ *  volatile in the prototype for abort(). This conflicts with
+ *  the built-in definition.
+ */
+fix = {
+    hackname = next_template;
+    files    = bsd/libc.h;
+    select   = template;
+
+    sed = '/\(.*template\)/s/template//';
+    sed = "/extern.*volatile.*void.*abort/s/volatile//";
+};
+
+
+/*
+ *  NeXT 3.2 includes the keyword volatile in the abort() and  exit()
+ *  function prototypes. That conflicts with the  built-in functions.
+ */
+fix = {
+    hackname = next_volitile;
+    files    = ansi/stdlib.h;
+    select   = volatile;
+
+    sed    = "/extern.*volatile.*void.*exit/s/volatile//";
+    sed    = "/extern.*volatile.*void.*abort/s/volatile//";
+};
+
+
+/*
+ *  NeXT 2.0 defines 'int wait(union wait*)', which conflicts with Posix.1.
+ *  Note that version 3 of the NeXT system has wait.h in a different directory,
+ *  so that this code won't do anything.  But wait.h in version 3 has a
+ *  conditional, so it doesn't need this fix.  So everything is okay.
+ */
+fix = {
+    hackname = next_wait_union;
+    files    = sys/wait.h;
+
+    select = 'wait\(union wait';
+
+    sed = "s@wait(union wait@wait(void@";
+};
+
+
+/*
+ *  a missing semi-colon at the end of the nodeent structure definition.
+ */
+fix = {
+    hackname = nodeent_syntax;
+    files    = netdnet/dnetdb.h;
+    sed      = "s/char.*na_addr *$/char *na_addr;/";
+};
+
+
+/*
+ *  sys/lc_core.h on some versions of OSF1/4.x pollutes the namespace by
+ *  defining regex.h related types.  This causes libg++ build and usage
+ *  failures.  Fixing this correctly requires checking and modifying 3 files.
+ */
+fix = {
+    hackname = osf_namespace_a;
+    files    = reg_types.h;
+    files    = sys/lc_core.h;
+    test     =    "-r reg_types.h"
+               "-a -r sys/lc_core.h"
+               "-a -n \"`grep '} regex_t;' reg_types.h`\""
+               "-a -z \"`grep __regex_t regex.h`\"";
+
+    sed      = "s/regex_t/__regex_t/g";
+    sed      = "s/regoff_t/__regoff_t/g";
+    sed      = "s/regmatch_t/__regmatch_t/g";
+};
+
+fix = {
+    hackname = osf_namespace_b;
+    files    = regex.h;
+    test     =    "-r reg_types.h"
+               "-a -r sys/lc_core.h"
+               "-a -n \"`grep '} regex_t;' reg_types.h`\""
+               "-a -z \"`grep __regex_t regex.h`\"";
+    sed      = "/#include <reg_types.h>/a\\\n"
+               "typedef __regex_t\tregex_t;\\\n"
+               "typedef __regoff_t\tregoff_t;\\\n"
+               "typedef __regmatch_t\tregmatch_t;\n";
+};
+
+
+/*
+ *  Fix __page_size* declarations in pthread.h AIX 4.1.[34].
+ *  The original ones fail if uninitialized externs are not common.
+ *  This is the default for all ANSI standard C++ compilers.
+ */
+fix = {
+    hackname = pthread_page_size;
+    files    = pthread.h;
+    select   = "^int __page_size";
+    sed      = "s/^int __page_size/extern int __page_size/";
+};
+
+
+/*
+ *  Fix return type of fread and fwrite on sysV68
+ */
+#ifdef LATER
+fix = {
+    hackname = read_ret_type;
+    files    = stdio.h;
+    sed      = "s/^\\(extern int\tfclose(), fflush()\\), "
+                 "\\(fread(), fwrite()\\)\\(.*\\)$"
+               "/extern unsigned int\t\\2;\\\n\\1\\3/";
+};
+#endif
+
+
+/*
+ *  function class(double x) conflicts with C++ keyword on rs/6000 
+ */
+fix = {
+    hackname = rs6000_double;
+    files    = math.h;
+    select   = '[^a-zA-Z_]class\(';
+    
+    sed   = "/class[(]/i\\\n#ifndef __cplusplus\n";
+    sed   = "/class[(]/a\\\n#endif\n";
+};
+
+
+/*
+ *  Wrong fchmod prototype on RS/6000.
+ */
+fix = {
+    hackname = rs6000_fchmod;
+    files    = sys/stat.h;
+    select   = 'fchmod\(char';
+    sed      = 's/fchmod(char \*/fchmod(int/';
+};
+
+
+/*
+ *  parameters conflict with C++ new on rs/6000 
+ */
+fix = {
+    hackname = rs6000_param;
+    files  = "stdio.h";
+    files  = "unistd.h";
+
+    sed = 's@rename(const char \*old, const char \*new)@'
+            'rename(const char *_old, const char *_new)@';
+};
+
+
+/*
+ *  Sony NEWSOS 5.0 does not support the complete ANSI C standard.
+ */
+#ifdef SONY
+fix = {
+    hackname = sony_ctype;
+    files    = ctype.h;
+    test     = "-x /bin/sony";
+    test     = "! -z \"`if /bin/sony ; then echo true ; fi`\"";
+    sed      = "s/__ctype/_ctype/g";
+};
+#endif
+
+/*
+ *  Incorrect #include in Sony News-OS 3.2.
+ */
+fix = {
+    hackname = sony_include;
+    files    = machine/machparam.h;
+    select   = '"\.\./machine/endian.h"';
+    sed      = 's@"../machine/endian.h"@<machine/endian.h>@';
+};
+
+
+/*
+ *  Sony NEWSOS 5.0 does not support the complete ANSI C standard.
+ */
+#ifdef SONY
+fix = {
+    hackname = sony_stdio;
+    files    = stdio.h;
+    test     = "-x /bin/sony";
+    test     = "! -z \"`if /bin/sony ; then echo true ; fi`\"";
+    sed      = "s/__filbuf/_filbuf/g\n"
+               "s/__flsbuf/_flsbuf/g\n"
+               "s/__iob/_iob/g";
+};
+#endif
+
+/*
+ *  Add a `static' declaration of `getrnge' into <regexp.h>.
+ *
+ *  Don't do this if there is already a `static void getrnge' declaration
+ *  present, since this would cause a redeclaration error.  Solaris 2.x has
+ *  such a declaration.
+ */
+#ifdef SVR4
+fix = {
+    hackname = static_getrnge;
+    files    = regexp.h;
+    bypass   = "static void getrnge";
+    sed      = "/^static int[ \t]*size;/c\\\n"
+               "static int      size ;\\\n\\\n"
+               "static int getrnge ();";
+};
+#endif
+
+/*
+ *  a missing semi-colon at the end of the statsswtch structure definition.
+ */
+fix = {
+    hackname = statsswtch;
+    files    = rpcsvc/rstat.h;
+    select   = "boottime$";
+    sed      = "s/boottime$/boottime;/";
+};
+
+
+/*
+ *  Don't use or define the name va_list in stdio.h.
+ *  This is for ANSI and also to interoperate properly with gcc's varargs.h.
+ *  Arrange for stdio.h to use stdarg.h to define __gnuc_va_list
+ */
+fix = {
+    hackname = stdio_va_list;
+    files    = stdio.h;
+
+    /*
+     * Use __gnuc_va_list in arg types in place of va_list.
+     * On 386BSD use __gnuc_va_list instead of _VA_LIST_.  We're hoping the
+     * trailing parentheses and semicolon save all other systems from this.
+     * Define __va_list__ (something harmless and unused) instead of va_list.
+     * Don't claim to have defined va_list.
+     */
+    shell =
+ "if ( egrep \"__need___va_list\" $file ) > /dev/null 2>&1 ; then
+    :
+  else
+    echo \"#define __need___va_list\"
+    echo \"#include <stdarg.h>\"
+  fi
+
+  sed -e 's@ va_list @ __gnuc_va_list @' \\
+      -e 's@ va_list)@ __gnuc_va_list)@' \\
+      -e 's@ _BSD_VA_LIST_));@ __gnuc_va_list));@' \\
+      -e 's@ _VA_LIST_));@ __gnuc_va_list));@' \\
+      -e 's@ va_list@ __va_list__@' \\
+      -e 's@\\*va_list@*__va_list__@' \\
+      -e 's@ __va_list)@ __gnuc_va_list)@' \\
+      -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@'";
+};
+
+
+/*
+ *  Check for strict ansi compliance
+ */
+#ifdef STRICT_ANSI
+fix = {
+    hackname = strict_ansi;
+    select   = "__STDC__[ \t]*[=!]=[ \t]*[01]";
+    sed      = "s/__STDC__[ \t]*==[ \t]*0/!defined (__STRICT_ANSI__)/g";
+    sed      = "s/__STDC__[ \t]*!=[ \t]*0/defined (__STRICT_ANSI__)/g";
+    sed      = "s/__STDC__[ \t]*==[ \t]*1/defined (__STRICT_ANSI__)/g";
+    sed      = "s/__STDC__[ \t]*!=[ \t]*1/!defined (__STRICT_ANSI__)/g";
+};
+#endif
+
+/*
+ *  Fix bogus #ifdef on SunOS 4.1.
+ */
+fix = {
+    hackname = sun_bogus_ifdef;
+    files  = "hsfs/hsfs_spec.h";
+    files  = "hsfs/iso_spec.h";
+    select = '#ifdef __i386__ || __vax__';
+    sed    = "s/\\#ifdef __i386__ || __vax__/\\#if __i386__ || __vax__/g";
+};
+
+
+/*
+ *  Fix bogus #ifdef on SunOS 4.1.
+ */
+fix = {
+    hackname = sun_bogus_ifdef_sun4c;
+    files  = "hsfs/hsnode.h";
+    select = '#ifdef __i386__ || __sun4c__';
+    sed    = "s/\\#ifdef __i386__ || __sun4c__/\\#if __i386__ || __sun4c__/g";
+};
+
+
+/*
+ *  Fix the CAT macro in SunOS memvar.h.
+ */
+fix = {
+    hackname = sun_catmacro;
+    files  = pixrect/memvar.h;
+    select = "^#define[ \t]+CAT(a,b)";
+    sed    = "/^#define[ \t]CAT(a,b)/ i\\\n"
+                 "#ifdef __STDC__ \\\n"
+                 "#define CAT(a,b) a##b\\\n"
+                 "#else\n";
+
+    sed    = "/^#define[ \t]CAT(a,b)/ a\\\n"
+                 "#endif\n";
+};
+
+
+/*
+ *  Fix return type of free and {c,m,re}alloc in <malloc.h> on SunOS 4.1.
+ *  Also fix return type of {m,re}alloc in <malloc.h> on sysV68
+ */
+fix = {
+    hackname = sun_malloc;
+    files    = malloc.h;
+
+    sed   = "s/typedef[ \t]char \\*\tmalloc_t/typedef void \\*\tmalloc_t/g";
+    sed   = "s/int[ \t][ \t]*free/void\tfree/g";
+    sed   = "s/char\\([ \t]*\\*[ \t]*malloc\\)/void\\1/g";
+    sed   = "s/char\\([ \t]*\\*[ \t]*realloc\\)/void\\1/g";
+};
+
+
+/*
+ *  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.
+ *  To ensure only Sun's is fixed, we grep for a likely unique string.
+ *  Fix also on sysV68 R3V7.1 (head/memory.h\t50.1\t )
+ */
+fix = {
+    hackname = sun_memcpy;
+    files    = memory.h;
+    select = "/\\*\t@\\(#\\)"
+             "(head/memory.h\t50.1\t "
+             "|memory\\.h 1\\.[2-4] 8./../.. SMI; from S5R2 1\\.2\t)\\*/";
+
+    sed    = "1i\\\n/* This file was generated by fixincludes */\\\n"
+             "#ifndef __memory_h__\\\n"
+             "#define __memory_h__\\\n\\\n"
+             "#ifdef __STDC__\\\n"
+             "extern void *memccpy();\\\n"
+             "extern void *memchr();\\\n"
+             "extern void *memcpy();\\\n"
+             "extern void *memset();\\\n"
+             "#else\\\n"
+             "extern char *memccpy();\\\n"
+             "extern char *memchr();\\\n"
+             "extern char *memcpy();\\\n"
+             "extern char *memset();\\\n"
+             "#endif /* __STDC__ */\\\n\\\n"
+             "extern int memcmp();\\\n\\\n"
+             "#endif /* __memory_h__ */\n";
+
+    sed    = "1,$d";
+};
+
+
+/*
+ *  Check for yet more missing ';' in struct (in SunOS 4.0.x)
+ */
+fix = {
+    hackname = sun_rusers_semi;
+    files    = rpcsvc/rusers.h;
+    select   = "_cnt$";
+    sed      = "/^struct/,/^};/s/_cnt$/_cnt;/";
+};
+
+
+/*
+ *  signal.h on SunOS defines signal using (),
+ *  which causes trouble when compiling with g++ -pedantic.
+ */
+fix = {
+    hackname = sun_signal;
+    files    = sys/signal.h;
+    files    = signal.h;
+    select   = "^void\t" '\(\*signal\(\)\)\(\);';
+
+    sed = "/^void\t" '(\*signal())();$/i'  "\\\n"
+          "#ifdef __cplusplus"             "\\\n"
+          "void\t(*signal(...))(...);"     "\\\n"
+          "#else"                          "\n";
+
+    sed = "/^void\t" '(\*signal())();$/a'  "\\\n"
+          '#endif'                         "\n";
+};
+
+
+/*
+ *  On *some* SunOS-es, rpc/auth.h, rpc/clnt.h, rpc/svc.h, and
+ *  rpc/xdr.h need prototypes for its ops function pointers.
+ */
+fix = {
+    hackname = sun_auth_proto;
+    files    = rpc/auth.h;
+    files    = rpc/clnt.h;
+    files    = rpc/svc.h;
+    files    = rpc/xdr.h;
+    mach     = "*-sun-*";
+    /*
+     *  Select those files containing '(*name)()' but *not*
+     *  containing '(*name)(junk)'.  The change would be innocuous
+     *  but there is no point bothering if the fix is not needed.
+     */
+    select   = '\(\*[a-z][a-z_]*\)\(\)';
+    bypass   = '\(\*[a-z][a-z_]*\)\(' "[ \t]*[a-zA-Z.].*" '\)';
+    sed      = 's'
+                '/^\(.*(\*[a-z][a-z_]*)(\)'      '\();.*\)'
+                "/\\\n"
+                    "#ifdef __cplusplus\\\n"
+                    '\1...\2' "\\\n"
+                    "#else\\\n"
+                    '\1\2' "\\\n"
+                    "#endif"
+                "/";
+};
+
+
+/*
+ *  This file on SunOS 4 has a very large macro.  When the sed loop
+ *  tries pull it in, it overflows the pattern space size of the SunOS
+ *  sed (GNU sed does not have this problem).  Since the file does not
+ *  require fixing, we remove it from the fixed directory.
+ */
+fix = {
+    hackname = sunos_large_macro;
+    files    = sundev/ipi_error.h;
+    shell    =
+        "echo \"Removing incorrect fix to SunOS <sundev/ipi_error.h>\" >&2\n"
+         "rm -f ${DESTDIR}/$file ${DESTDIR}/$file.\ncat > /dev/null";
+};
+
+
+/*
+ *  math.h on SunOS 4 puts the declaration of matherr before the definition
+ *  of struct exception, so the prototype (added by fixproto) causes havoc.
+ */
+fix = {
+    hackname = sunos_matherr_decl;
+    files    = math.h;
+    /*
+     *  Find the first occurrance of 'struct exception'.
+     *  If it is the definition, then the file is okay.
+     *  If it is a usage, then the order is wrong and we
+     *  must insert a forward reference.
+     */
+    test = "\"`fgrep 'struct exception' $file | line`\""
+                  " != 'struct exception {'";
+
+    sed = "/matherr/i\\\nstruct exception;\n";
+};
+
+
+/*
+ *  Correct the return type for strlen in strings.h in SunOS 4.
+ */
+fix = {
+    hackname = sunos_strlen;
+    files    = strings.h;
+    sed = "s/int[ \t]*strlen();/__SIZE_TYPE__ strlen();/";
+};
+
+
+/*
+ *  Solaris math.h and floatingpoint.h define __P without protection,
+ *  which conflicts with the fixproto definition.  The fixproto
+ *  definition and the Solaris definition are used the same way.
+ */
+#ifdef SVR4
+fix = {
+    hackname = svr4__p;
+    files    = math.h;
+    files    = floatingpoint.h;
+    select   = "^#define[ \t]*__P";
+    sed      = "/^#define[ \t]*__P/i\\\n#ifndef __P\n";
+    sed      = "/^#define[ \t]*__P/a\\\n#endif\n";
+};
+#endif
+
+/*
+ *  Disable apparent native compiler optimization cruft in SVR4.2 <string.h>
+ *  that is visible to any ANSI compiler using this include.  Simply
+ *  delete the lines that #define some string functions to internal forms.
+ */
+#ifdef SVR4
+fix = {
+    hackname = svr4_disable_opt;
+    files    = string.h;
+    select   = '#define.*__std_hdr_';
+    sed      = '/#define.*__std_hdr_/d';
+};
+#endif
+
+/*
+ *  Conditionalize some of <sys/endian.h> on __GNUC__ and __GNUG__.
+ */
+#ifdef SVR4
+fix = {
+    hackname = svr4_endian;
+    files    = sys/endian.h;
+    bypass   = '__GNUC__';
+
+    sed      = "/#\tifdef\t__STDC__/i\\\n"
+               "#   if !defined (__GNUC__) && !defined (__GNUG__)\n";
+
+    sed      = "/#\t\tinclude\t<sys\\/byteorder.h>/s/\t\t/   /";
+
+    sed      = "/#   include\t<sys\\/byteorder.h>/i\\\n"
+               "#   endif /* !defined (__GNUC__) && !defined (__GNUG__) */\n";
+};
+#endif
+
+/*
+ *  Remove useless extern keyword from struct forward declarations
+ *  in <sys/stream.h> and <sys/strsubr.h>
+ */
+#ifdef SVR4
+fix = {
+    hackname = svr4_extern_struct;
+    files    = sys/stream.h;
+    files    = sys/strsubr.h;
+    select   = 'extern struct [a-z_]*;';
+    sed      = 's/extern struct \([a-z][a-z_]*\)/struct \1/';
+};
+#endif
+
+/*
+ *  Fix declarations of `ftw' and `nftw' in <ftw.h>.  On some/most SVR4
+ *  systems the file <ftw.h> contains extern declarations of these
+ *  functions followed by explicitly `static' definitions of these
+ *  functions... and that's not allowed according to ANSI C.  (Note
+ *  however that on Solaris, this header file glitch has been pre-fixed by
+ *  Sun.  In the Solaris version of <ftw.h> there are no static
+ *  definitions of any function so we don't need to do any of this stuff
+ *  when on Solaris.
+ */
+#ifdef SVR4
+#ifndef SOLARIS
+fix = {
+    hackname = svr4_ftw;
+    files    = ftw.h;
+    select   = '^extern int ftw\(const';
+
+    sed = '/^extern int ftw(const/i' "\\\n"
+            "#if !defined(_STYPES)\\\n"
+            "static\\\n"
+            "#else\\\n"
+            "extern\\\n"
+            "#endif";
+    sed = 's/extern \(int ftw(const.*\)$/\1/';
+    sed = "/^extern int nftw/i\\\n"
+            "#if defined(_STYPES)\\\n"
+            "static\\\n"
+            "#else\\\n"
+            "extern\\\n"
+            "#endif";
+    sed = 's/extern \(int nftw.*\)$/\1/';
+    sed = "/^extern int ftw(),/c\\\n"
+            "#if !defined(_STYPES)\\\n"
+            "static\\\n"
+            "#else\\\n"
+            "extern\\\n"
+            "#endif\\\n"
+            "  int ftw();\\\n"
+            "#if defined(_STYPES)\\\n"
+            "static\\\n"
+            "#else\\\n"
+            "extern\\\n"
+            "#endif\\\n"
+            "  int nftw();";
+};
+#endif
+#endif
+
+
+/*
+ *   Fix broken decl of getcwd present on some svr4 systems.
+ */
+#ifdef SVR4
+fix = {
+    hackname = svr4_getcwd;
+    files    = stdlib.h;
+    files    = unistd.h;
+    select   = 'getcwd\(char \*, int\)';
+
+    sed = 's/getcwd(char \*, int)/getcwd(char *, size_t)/';
+};
+#endif
+
+/*
+ *  set ifdef _KERNEL
+ */
+#ifdef SVR4
+fix = {
+    hackname = svr4_kernel;
+    files    = fs/rfs/rf_cache.h;
+    files    = sys/erec.h;
+    files    = sys/err.h;
+    files    = sys/char.h;
+    files    = sys/getpages.h;
+    files    = sys/map.h;
+    files    = sys/cmn_err.h;
+    files    = sys/kdebugger.h;
+    bypass   = '_KERNEL';
+    sed      = "1i\\\n#ifdef _KERNEL";
+    sed      = "$a\\\n#endif /* _KERNEL */";
+};
+#endif
+
+/*
+ *  Delete any #defines of `__i386' which may be present in <ieeefp.h>.  They
+ *  tend to conflict with the compiler's own definition of this symbol.  (We
+ *  will use the compiler's definition.)
+ *  Likewise __sparc, for Solaris, and __i860, and a few others
+ *  (guessing it is necessary for all of them).
+ */
+#ifdef SVR4
+fix = {
+    hackname = svr4_mach_defines;
+    files    = ieeefp.h;
+    select   = "#define[ \t]*__(i386|i860|mips|sparc|m88k|m68k)[ \t]";
+    sed      = "/#define[ \t]*__\\(i386|i860|mips|sparc|m88k|m68k\\)[ \t]/d";
+};
+#endif
+
+/*
+ *  Fix declarations of `makedev', `major', and `minor' in <sys/mkdev.h>.
+ */
+#ifdef SVR4
+fix = {
+    hackname = svr4_mkdev;
+    files    = sys/mkdev.h;
+
+    sed      = "/^dev_t makedev(const/c\\\n"
+               "static dev_t makedev(const major_t, const minor_t);";
+
+    sed      = "/^dev_t makedev()/c\\\n"
+               "static dev_t makedev();";
+
+    sed      = "/^major_t major(const/c\\\n"
+               "static major_t major(const dev_t);";
+
+    sed      = "/^major_t major()/c\\\n"
+               "static major_t major();";
+
+    sed      = "/^minor_t minor(const/c\\\n"
+               "static minor_t minor(const dev_t);";
+
+    sed      = "/^minor_t minor()/c\\\n"
+               "static minor_t minor();";
+};
+#endif
+
+/*
+ *  Fix reference to NC_NPI_RAW in <sys/netcspace.h>.
+ *  Also fix types of array initializers.
+ */
+#ifdef SVR4
+fix = {
+    hackname = svr4_netcspace;
+    files    = sys/netcspace.h;
+    select   = 'NC_NPI_RAW';
+    sed      = 's/NC_NPI_RAW/NC_TPI_RAW/g';
+    sed      = 's/NC_/(unsigned long) NC_/';
+};
+#endif
+
+/*
+ *  Fix reference to NMSZ in <sys/adv.h>.
+ */
+#ifdef SVR4
+fix = {
+    hackname = svr4_nmsz;
+    files    = sys/adv.h;
+    select   = '\[NMSZ\]';
+    sed      = 's/\[NMSZ\]/\[RFS_NMSZ\]/g';
+};
+#endif
+
+/*
+ *  Completely replace <sys/varargs.h> with a file that includes gcc's
+ *  stdarg.h or varargs.h files as appropriate.
+ */
+#ifdef SVR4
+fix = {
+    hackname = svr4_no_varargs;
+    files    = sys/varargs.h;
+    shell    = "cat > /dev/null\n"
+               "cat << _EOF_\n"
+               "/* This file was generated by fixincludes.  */\n"
+               "#ifndef _SYS_VARARGS_H\n"
+               "#define _SYS_VARARGS_H\n\n"
+
+               "#ifdef __STDC__\n"
+               "#include <stdarg.h>\n"
+               "#else\n"
+               "#include <varargs.h>\n"
+               "#endif\n\n"
+
+               "#endif  /* _SYS_VARARGS_H */\n"
+               "_EOF_";
+};
+#endif
+
+/*
+ *   Fix broken decl of profil present on some svr4 systems.
+ */
+#ifdef SVR4
+fix = {
+    hackname = svr4_profil;
+    files    = stdlib.h;
+    files    = unistd.h;
+
+    sed = 's/profil(unsigned short \*, unsigned int, '
+                         'unsigned int, unsigned int)'
+           '/profil(unsigned short *, size_t, int, unsigned)/';
+};
+#endif
+
+/*
+ *  Convert functions to prototype form, and fix arg names in <sys/stat.h>.
+ */
+#ifdef SVR4
+fix = {
+    hackname = svr4_proto_form;
+    files    = sys/stat.h;
+    select   = 'const extern';
+
+    sed      = "/^stat([ \t]*[^c]/ {\nN\nN\n"
+                   "s/(.*)\\n/( /\n"
+                   "s/;\\n/, /\n"
+                   "s/;$/)/\n"  "}";
+
+    sed      = "/^lstat([ \t]*[^c]/ {\nN\nN\n"
+                   "s/(.*)\\n/( /\n"
+                   "s/;\\n/, /\n"
+                   "s/;$/)/\n"  "}";
+
+    sed      = "/^fstat([ \t]*[^i]/ {\nN\nN\n"
+                   "s/(.*)\\n/( /\n"
+                   "s/;\\n/, /\n"
+                   "s/;$/)/\n"  "}";
+
+    sed      = "/^mknod([ \t]*[^c]/{\nN\nN\nN\n"
+                   "s/(.*)\\n/( /\n"
+                   "s/;\\n/, /g\n"
+                   "s/;$/)/\n"  "}";
+
+    sed      = "1,$s/\\([^A-Za-z]\\)path\\([^A-Za-z]\\)/\\1__path\\2/g";
+    sed      = "1,$s/\\([^A-Za-z]\\)buf\\([^A-Za-z]\\)/\\1__buf\\2/g";
+    sed      = "1,$s/\\([^A-Za-z]\\)fd\\([^A-Za-z]\\)/\\1__fd\\2/g";
+    sed      = "1,$s/ret\\([^u]\\)/__ret\\1/g";
+    sed      = "1,$s/\\([^_]\\)mode\\([^_]\\)/\\1__mode\\2/g";
+    sed      = "1,$s/\\([^_r]\\)dev\\([^_]\\)/\\1__dev\\2/g";
+};
+#endif
+
+/*
+ *  Add a prototyped declaration of mmap to <sys/mman.h>.
+ */
+#ifdef SVR4
+fix = {
+    hackname = svr4_proto_mmap;
+    files    = sys/mman.h;
+    select   = '^extern caddr_t mmap();$';
+    sed = '/^extern caddr_t mmap();$/c' "\\\n"
+          "#ifdef __STDC__\\\n"
+          "extern caddr_t mmap (caddr_t, size_t, int, int, int, off_t);\\\n"
+          "#else /* !defined(__STDC__) */\\\n"
+          "extern caddr_t mmap ();\\\n"
+          "#endif /* !defined(__STDC__) */\\\n";
+};
+#endif
+
+/*
+ *  Add a #define of _SIGACTION_ into <sys/signal.h>.
+ */
+#ifdef SVR4
+fix = {
+    hackname = svr4_sigaction;
+    files    = sys/signal.h;
+    sed      = "/^struct sigaction {/i\\\n"
+               "#define _SIGACTION_";
+    sed      = 's/(void *(\*)())/(void (*)(int))/';
+};
+#endif
+
+/*
+ *  Put storage class at start of decl, to avoid warning.
+ */
+#ifdef SVR4
+fix = {
+    hackname = svr4_storage_class;
+    files    = rpc/types.h;
+    select   = 'const extern';
+    sed      = 's/const extern/extern const/g';
+};
+#endif
+
+/*
+ *  Fix return value of mem{ccpy,chr,cpy,set} and str{len,spn,cspn}
+ *  in string.h on sysV68
+ *  Correct the return type for strlen in string.h on Lynx.
+ *  Correct the argument type for ffs in string.h on Alpha OSF/1 V2.0.
+ *  Add missing const for strdup on OSF/1 V3.0.
+ *  On sysV88 layout is slightly different.
+ */
+fix = {
+    hackname = systypes;
+    files  = "sys/types.h";
+    files  = "stdlib.h";
+    files  = "sys/stdtypes.h";
+    files  = "stddef.h";
+    files  = "memory.h";
+    files  = "unistd.h";
+    select = "typedef[ \t]+[a-z_][ \ta-z_]*[ \t]"
+             "(size|ptrdiff|wchar)_t";
+
+      sed  = "/^[ \t]*\\*[ \t]*typedef unsigned int size_t;/N";
+
+      sed  = "s/^\\([ \t]*\\*[ \t]*typedef unsigned int size_t;\\n"
+               "[ \t]*\\*\\/\\)/\\1\\\n"
+             "#ifndef __SIZE_TYPE__\\\n"
+             "#define __SIZE_TYPE__ long unsigned int\\\n"
+             "#endif\\\n"
+             "typedef __SIZE_TYPE__ size_t;\\\n/";
+
+      sed  = "/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]size_t/i\\\n"
+                   "#ifndef __SIZE_TYPE__\\\n"
+                   "#define __SIZE_TYPE__ long unsigned int\\\n"
+                   "#endif\n";
+
+      sed  = "s/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]size_t/"
+               "typedef __SIZE_TYPE__ size_t/";
+
+      sed  = "/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]ptrdiff_t/i\\\n"
+                   "#ifndef __PTRDIFF_TYPE__\\\n"
+                   "#define __PTRDIFF_TYPE__ long int\\\n"
+                   "#endif\n";
+
+      sed  = "s/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]ptrdiff_t/"
+               "typedef __PTRDIFF_TYPE__ ptrdiff_t/";
+
+      sed  = "/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]wchar_t/i\\\n"
+                   "#ifndef __WCHAR_TYPE__\\\n"
+                   "#define __WCHAR_TYPE__ int\\\n"
+                   "#endif\\\n"
+                   "#ifndef __cplusplus\n";
+
+      sed  = "/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]wchar_t/a\\\n"
+                   "#endif\n";
+
+      sed  = "s/typedef[ \t][ \t]*[a-z_][ \ta-z_]*[ \t]wchar_t/"
+               "typedef __WCHAR_TYPE__ wchar_t/";
+};
+
+
+/*
+ *  Fix return type of exit and abort in <stdlib.h> on SunOS 4.1.
+ *  Also wrap protection around size_t for m88k-sysv3 systems.
+ *  We use a funny name to ensure it follows 'systypes' fix.
+ */
+fix = {
+    hackname = systypes_for_aix;
+    files    = sys/types.h;
+    select   = "typedef[ \t][ \t]*[A-Za-z_][ \tA-Za-z_]*[ \t]size_t";
+    bypass   = "_GCC_SIZE_T";
+
+    sed    = "/typedef[ \t][ \t]*[A-Za-z_][ \tA-Za-z_]*[ \t]size_t/i\\\n"
+                 "#ifndef _GCC_SIZE_T\\\n"
+                 "#define _GCC_SIZE_T\n";
+
+    sed    = "/typedef[ \t][ \t]*[A-Za-z_][ \tA-Za-z_]*[ \t]size_t/a\\\n"
+                 "#endif\n";
+};
+
+
+/*
+ *  if the #if says _cplusplus, not the double underscore __cplusplus
+ *  that it should be
+ */
+fix = {
+    hackname = sysv68_string;
+    files    = string.h;
+
+    sed = "s/extern[ \t]*int[ \t]*strlen();/extern unsigned int strlen();/";
+    sed = "s/extern[ \t]*int[ \t]*ffs[ \t]*(long);/extern int ffs(int);/";
+    sed = "s/strdup(char \\*s1);/strdup(const char *s1);/";
+    sed = "/^extern char$/N";
+    sed = "s/^extern char\\(\\n\t\\*memccpy(),\\)$/extern void\\1/";
+    sed = "/^\tstrncmp(),$/N";
+    sed = "s/^\\(\tstrncmp()\\),\\n\\(\tstrlen(),\\)$/\\1;\\\n"
+          "extern unsigned int\\\n\\2/";
+    sed = "/^extern int$/N";
+    sed = "s/^extern int\\(\\n\tstrlen(),\\)/extern size_t\\1/";
+};
+
+
+/*
+ *  Replace definitions of size_t, ptrdiff_t and wchar_t
+ *  Install the proper definition of the three standard types
+ *  in header files that they come from.
+ */
+fix = {
+    hackname = sysz_stdlib_for_sun;
+    mach     = "*-sun-*";
+    mach     = "m88k-*-sysv3*";
+    files    = stdlib.h;
+
+    sed   = "s/int\tabort/void\tabort/g";
+    sed   = "s/int\tfree/void\tfree/g";
+    sed   = "s/char[ \t]*\\*[ \t]*calloc/void \\*\tcalloc/g";
+    sed   = "s/char[ \t]*\\*[ \t]*malloc/void \\*\tmalloc/g";
+    sed   = "s/char[ \t]*\\*[ \t]*realloc/void \\*\trealloc/g";
+    sed   = "s/int[ \t][ \t]*exit/void\texit/g";
+
+    sed   = "/typedef[ \ta-zA-Z_]*[ \t]size_t[ \t]*;/i\\\n"
+                "#ifndef _GCC_SIZE_T\\\n"
+                "#define _GCC_SIZE_T\n";
+
+    sed   = "/typedef[ \ta-zA-Z_]*[ \t]size_t[ \t]*;/a\\\n"
+                "#endif\n";
+};
+
+
+/*
+ *  Fix this Sun file to avoid interfering with stddef.h.
+ *  We use a funny name to ensure it follows 'systypes' fix.
+ */
+fix = {
+    hackname = sysz_stdtypes_for_sun;
+    files = sys/stdtypes.h;
+    sed   = "/[\t ]size_t.*;/i\\\n"
+              "#ifndef _GCC_SIZE_T\\\n"
+              "#define _GCC_SIZE_T\n";
+
+    sed   = "/[\t ]size_t.*;/a\\\n"
+              "#endif\n";
+
+    sed   = "/[\t ]ptrdiff_t.*;/i\\\n"
+              "#ifndef _GCC_PTRDIFF_T\\\n"
+              "#define _GCC_PTRDIFF_T\n";
+
+    sed   = "/[\t ]ptrdiff_t.*;/a\\\n"
+              "#endif\n";
+
+    sed   = "/[\t ]wchar_t.*;/i\\\n"
+              "#ifndef _GCC_WCHAR_T\\\n"
+              "#define _GCC_WCHAR_T\n";
+
+    sed   = "/[\t ]wchar_t.*;/a\\\n"
+              "#endif\n";
+};
+
+
+/*
+ *  Fix this file to avoid interfering with stddef.h,
+ *  but don't mistakenly match ssize_t present in AIX for the ps/2,
+ *  or typedefs which use (but do not set) size_t.
+ */
+fix = {
+    hackname = tinfo_cplusplus;
+    files    = tinfo.h;
+    sed      = "s/[ \t]_cplusplus/ __cplusplus/";
+};
+
+
+/*
+ *  Cancel out ansi_compat.h on Ultrix.  Replace it with empty file.
+ */
+fix = {
+    hackname = ultrix_ansi_compat;
+    files    = ansi_compat.h;
+    select   = ULTRIX;
+    sed      = "1i\\\n/* This file intentionally left blank. */\n";
+    sed      = "1,$d";
+};
+
+
+/*
+ *  parameter to atof not const on DECstation Ultrix V4.0 and NEWS-OS 4.2R.
+ *  also get rid of bogus inline definitions in HP-UX 8.0
+ */
+fix = {
+    hackname = ultrix_atof_param;
+    files    = math.h;
+
+    sed = "s@atof(\\([ \t]*char[ \t]*\\*[^)]*\\))@atof(const \\1)@";
+    sed = "s@inline int abs(int [a-z][a-z]*) {.*}@extern \"C\" int abs(int);@";
+    sed = "s@inline double abs(double [a-z][a-z]*) {.*}@@";
+    sed = "s@inline int sqr(int [a-z][a-z]*) {.*}@@";
+    sed = "s@inline double sqr(double [a-z][a-z]*) {.*}@@";
+};
+
+
+/*
+ *  parameters not const on DECstation Ultrix V4.0 and OSF/1.
+ */
+fix = {
+    hackname = ultrix_const;
+    files    = stdio.h;
+
+    sed   = 's@perror( char \*__s );@perror( const char *__s );@';
+    sed   = 's@fputs( char \*__s,@fputs( const char *__s,@';
+    sed   = 's@fopen( char \*__filename, char \*__type );@'
+              'fopen( const char *__filename, const char *__type );@';
+    sed   = 's@fwrite( void \*__ptr,@fwrite( const void *__ptr,@';
+    sed   = 's@fscanf( FILE \*__stream, char \*__format,@'
+              'fscanf( FILE *__stream, const char *__format,@';
+    sed   = 's@scanf( char \*__format,@scanf( const char *__format,@';
+    sed   = 's@sscanf( char \*__s, char \*__format,@'
+              'sscanf( const char *__s, const char *__format,@';
+    sed   = 's@popen(char \*, char \*);@popen(const char *, const char *);@';
+    sed   = 's@tempnam(char\*,char\*);@tempnam(const char*,const char*);@';
+};
+
+
+/*
+ *  Check for bad #ifdef line (in Ultrix 4.1)
+ */
+fix = {
+    hackname = ultrix_ifdef;
+    select   = "#ifdef KERNEL";
+    files    = sys/file.h;
+    sed      = "s/#ifdef KERNEL/#if defined(KERNEL)/";
+};
+
+
+/*
+ *  Avoid nested comments on Ultrix 4.3.
+ */
+fix = {
+    hackname = ultrix_nested_cmnt;
+    files    = rpc/svc.h;
+    sed      = "s@^\\( \\*\tint protocol;  \\)/\\*@\\1*/ /*@";
+};
+
+
+/*
+ *  Check for superfluous `static' (in Ultrix 4.2)
+ *  On Ultrix 4.3, includes of other files (r3_cpu.h,r4_cpu.h) is broken.
+ */
+fix = {
+    hackname = ultrix_static;
+    files  = machine/cpu.h;
+    select = '#include "r[34]_cpu';
+    sed    = "s/^static struct tlb_pid_state/struct tlb_pid_state/";
+    sed    = 's/^#include "r3_cpu\.h"$/#include <machine\/r3_cpu\.h>/';
+    sed    = 's/^#include "r4_cpu\.h"$/#include <machine\/r4_cpu\.h>/';
+};
+
+
+/*
+ *  Fix multiple defines for NULL
+ */
+fix = {
+    hackname = undefine_null;
+    select = "^#[ \t]*define[ \t]*[ \t]NULL[ \t]";
+    bypass = "#[ \t]*(ifn|un)def[ \t]*[ \t]NULL($|[ \t])";
+    sed    = "/^#[ \t]*define[ \t][ \t]*NULL[ \t]/i\\\n"
+                "#undef NULL\n";
+};
+
+
+/*
+ *  Fix definitions of macros used by va-i960.h in VxWorks header file.
+ */
+fix = {
+    hackname = va_i960_macro;
+    files    = arch/i960/archI960.h;
+    select   = "__(vsiz|vali|vpad|alignof__)";
+    sed = "s/__vsiz/__vxvsiz/";
+    sed = "s/__vali/__vxvali/";
+    sed = "s/__vpad/__vxvpad/";
+    sed = "s/__alignof__/__vxalignof__/";
+};
+
+
+/*
+ *  AIX headers define NULL to be cast to a void pointer,
+ *  which is illegal in ANSI C++.
+ */
+fix = {
+    hackname = void_null;
+    files    = curses.h;
+    files    = dbm.h;
+    files    = locale.h;
+    files    = stdio.h;
+    files    = stdlib.h;
+    files    = string.h;
+    files    = time.h;
+    files    = unistd.h;
+    files    = sys/dir.h;
+    files    = sys/param.h;
+    files    = sys/types.h;
+    select   = "#[ \t]*define[ \t][ \t]*NULL[ \t].*void";
+    sed      = "s/^#[ \t]*define[ \t]*NULL[ \t]*((void[ \t]*\\*)0)"
+                "/#define NULL 0/";
+};
+
+
+/*
+ *  Make VxWorks header which is almost gcc ready fully gcc ready.
+ */
+fix = {
+    hackname = vxworks_gcc_problem;
+    files    = types/vxTypesBase.h;
+    select   = "__GNUC_TYPEOF_FEATURE_BROKEN_USE_DEFAULT_UNTIL_FIXED__";
+
+    sed = "s/#ifdef __GNUC_TYPEOF_FEATURE_BROKEN_USE_DEFAULT_UNTIL_FIXED__/"
+          "#if 1/";
+
+    sed = "/[ \t]size_t/i\\\n"
+        "#ifndef _GCC_SIZE_T\\\n"
+        "#define _GCC_SIZE_T\n";
+
+    sed = "/[ \t]size_t/a\\\n"
+        "#endif\n";
+
+    sed = "/[ \t]ptrdiff_t/i\\\n"
+        "#ifndef _GCC_PTRDIFF_T\\\n"
+        "#define _GCC_PTRDIFF_T\n";
+
+    sed = "/[ \t]ptrdiff_t/a\\\n"
+        "#endif\n";
+
+    sed = "/[ \t]wchar_t/i\\\n"
+        "#ifndef _GCC_WCHAR_T\\\n"
+        "#define _GCC_WCHAR_T\n";
+
+    sed = "/[ \t]wchar_t/a\\\n"
+        "#endif\n";
+};
+
+
+/*
+ *  Fix VxWorks <time.h> to not require including <vxTypes.h>.
+ */
+fix = {
+    hackname = vxworks_needs_vxtypes;
+    files    = time.h;
+    select   = "uint_t[ \t][ \t]*_clocks_per_sec";
+    sed      = "s/uint_t/unsigned int/";
+};
+
+
+/*
+ *  Fix VxWorks <sys/stat.h> to not require including <vxWorks.h>.
+ */
+fix = {
+    hackname = vxworks_needs_vxworks;
+    files    = sys/stat.h;
+    test     = "-r types/vxTypesOld.h";
+    test     = "-n \"`fgrep '#include' $file`\"";
+    test     = "-n \"`fgrep ULONG $file`\"";
+    select   = "#[ \t]define[ \t][ \t]*__INCstath";
+
+    sed = "/#[ \t]define[ \t][ \t]*__INCstath/a\\\n"
+          "#include <types/vxTypesOld.h>\n";
+};
+
+
+/*
+ *  Another bad dependency in VxWorks 5.2 <time.h>.
+ */
+fix = {
+    hackname = vxworks_time;
+    files    = time.h;
+    select   = "VOIDFUNCPTR";
+    test     = "-r vxWorks.h";
+    sed      = "/VOIDFUNCPTR/i\\\n"
+               "#ifndef __gcc_VOIDFUNCPTR_defined\\\n"
+               "#ifdef __cplusplus\\\n"
+               "typedef void (*__gcc_VOIDFUNCPTR) (...);\\\n"
+               "#else\\\n"
+               "typedef void (*__gcc_VOIDFUNCPTR) ();\\\n"
+               "#endif\\\n"
+               "#define __gcc_VOIDFUNCPTR_defined\\\n"
+               "#endif\n";
+
+    sed      = "s/VOIDFUNCPTR/__gcc_VOIDFUNCPTR/g";
+};
+
+
+/*
+ *  There are several name conflicts with C++ reserved words in X11 header
+ *  files.  These are fixed in some versions, so don't do the fixes if
+ *  we find __cplusplus in the file.  These were found on the RS/6000.
+ */
+fix = {
+    hackname = x11_class;
+    files    = X11/ShellP.h;
+    bypass   = __cplusplus;
+    sed      = "/char \\*class;/i\\\n"
+                   "#ifdef __cplusplus\\\n"
+                   "\tchar *c_class;\\\n"
+                   "#else\n";
+    sed      = "/char \\*class;/a\\\n"
+                   "#endif\n";
+};
+
+
+/*
+ *  class in Xm/BaseClassI.h
+ */
+fix = {
+    hackname = x11_class_usage;
+    files    = Xm/BaseClassI.h;
+    bypass   = "__cplusplus";
+    sed      = "s/ class[)]/ c_class)/g";
+};
+
+
+/*
+ *  new in Xm/Traversal.h
+ */
+fix = {
+    hackname = x11_new;
+    files    = Xm/Traversal.h;
+    bypass   = __cplusplus;
+
+    sed      = "/Widget\told, new;/i\\\n"
+                   "#ifdef __cplusplus\\\n"
+                   "\tWidget\told, c_new;\\\n"
+                   "#else\n";
+
+    sed      = "/Widget\told, new;/a\\\n"
+                   "#endif\n";
+
+    sed      = "s/Widget new,/Widget c_new,/g";
+};
+
+
+/*
+ *  Incorrect sprintf declaration in X11/Xmu.h
+ */
+fix = {
+    hackname = x11_sprintf;
+    files    = X11*/Xmu.h;
+    sed      = "s,^extern char \\*\tsprintf();$,#ifndef __STDC__\\\n"
+               "extern char *\tsprintf();\\\n"
+               "#endif /* !defined __STDC__ */,";
+};
+
+
+/*
+ *  Purge some HP-UX 11 files that are only borken after they are "fixed".
+ */
+fix = {
+    hackname = zzz_ki_iface;
+    files    = sys/ki_iface.h;
+    select   = 'These definitions are for HP Internal developers';
+    shell    =
+        "echo \"Removing incorrect fix to HP-UX <$file>\" >&2\n"
+         "rm -f ${DESTDIR}/$file ${DESTDIR}/$file.\ncat > /dev/null";
+};
+
+
+/*
+ *  Purge some HP-UX 11 files that are only borken after they are "fixed".
+ */
+fix = {
+    hackname = zzz_ki;
+    files    = sys/ki.h;
+    select   = '11.00 HP-UX LP64';
+    shell    =
+        "echo \"Removing incorrect fix to HP-UX <$file>\" >&2\n"
+         "rm -f ${DESTDIR}/$file ${DESTDIR}/$file.\ncat > /dev/null";
+};
+
+
+/*
+ *  Purge some HP-UX 11 files that are only borken after they are "fixed".
+ */
+fix = {
+    hackname = zzz_ki_calls;
+    files    = sys/ki_calls.h;
+    select   = 'KI_MAX_PROCS is an arbitrary number';
+    shell    =
+        "echo \"Removing incorrect fix to HP-UX <$file>\" >&2\n"
+         "rm -f ${DESTDIR}/$file ${DESTDIR}/$file.\ncat > /dev/null";
+};
+
+
+/*
+ *  Purge some HP-UX 11 files that are only borken after they are "fixed".
+ */
+fix = {
+    hackname = zzz_ki_defs;
+    files    = sys/ki_defs.h;
+    select   = 'Kernel Instrumentation Definitions';
+    shell    =
+        "echo \"Removing incorrect fix to HP-UX <$file>\" >&2\n"
+         "rm -f ${DESTDIR}/$file ${DESTDIR}/$file.\ncat > /dev/null";
+};
+
+
+/*
+ *  Purge some HP-UX 11 files that are only borken after they are "fixed".
+ */
+fix = {
+    hackname = zzz_time;
+    files    = sys/time.h;
+    select   = 'For CASPEC, look in';
+    shell    =
+        "echo \"Removing incorrect fix to HP-UX <$file>\" >&2\n"
+         "rm -f ${DESTDIR}/$file ${DESTDIR}/$file.\ncat > /dev/null";
+};
+
+
+/*EOF*/
diff --git a/gcc/fixinc/inclhack.tpl b/gcc/fixinc/inclhack.tpl
new file mode 100644
index 0000000..19cf32e
--- /dev/null
+++ b/gcc/fixinc/inclhack.tpl
@@ -0,0 +1,391 @@
+[= autogen template -*- Mode: ksh -*-
+sh
+#
+#  $Id: inclhack.tpl,v 1.2 1998/12/16 21:19:11 law Exp $
+#
+=]
+#!/bin/sh
+#
+[= _EVAL "## " _DNE =]
+#
+# Install modified versions of certain ANSI-incompatible system header
+# files which are fixed to work correctly with ANSI C and placed in a
+# directory that GNU C will search.
+#
+# This script contains [=_eval fix _count =] fixup scripts.
+#
+# See README-fixinc for more information.
+#
+[=_eval fixincludes "## " _gpl=]
+#
+# # # # # # # # # # # # # # # # # # # # #
+#
+# Directory in which to store the results.
+# Fail if no arg to specify a directory for the output.
+if [ "x$1" = "x" ]
+then echo fixincludes: no output directory specified
+exit 1
+fi
+
+LIB=${1}
+shift
+
+# Make sure it exists.
+if [ ! -d $LIB ]; then
+  mkdir $LIB || {
+    echo fixincludes:  output dir '`'$LIB"' cannot be created"
+    exit 1
+  }
+else
+  ( \cd $LIB && touch DONE && rm DONE ) || {
+    echo fixincludes:  output dir '`'$LIB"' is an invalid directory"
+    exit 1
+  }
+fi
+
+# Define what target system we're fixing.
+#
+if test -r ./Makefile; then
+  target_canonical="`sed -n -e 's,^target[ 	]*=[ 	]*\(.*\)$,\1,p' < Makefile`"
+fi
+
+# If not from the Makefile, then try config.guess
+#
+if test -z "${target_canonical}" ; then
+  if test -x ./config.guess ; then
+    target_canonical="`config.guess`" ; fi
+  test -z "${target_canonical}" && target_canonical=unknown
+fi
+export target_canonical
+
+# # # # # # # # # # # # # # # # # # # # #
+#
+# Define PWDCMD as a command to use to get the working dir
+# in the form that we want.
+PWDCMD=pwd
+
+case "`$PWDCMD`" in
+//*)
+    # On an Apollo, discard everything before `/usr'.
+    PWDCMD="eval pwd | sed -e 's,.*/usr/,/usr/,'"
+    ;;
+esac
+
+# Original directory.
+ORIGDIR=`${PWDCMD}`[=
+_IF PROGRAM _env =]
+FIXINCL=${ORIGDIR}/fixincl
+export FIXINCL[=
+_ENDIF=]
+
+# Make LIB absolute only if needed to avoid problems with the amd.
+case $LIB in
+/*)
+    ;;
+*)
+    cd $LIB; LIB=`${PWDCMD}`
+    ;;
+esac
+
+echo Fixing headers into ${LIB} for ${target_canonical} target
+ 
+# Determine whether this system has symbolic links.
+if ln -s X $LIB/ShouldNotExist 2>/dev/null; then
+  rm -f $LIB/ShouldNotExist
+  LINKS=true
+elif ln -s X /tmp/ShouldNotExist 2>/dev/null; then
+  rm -f /tmp/ShouldNotExist
+  LINKS=true
+else
+  LINKS=false
+fi
+ 
+# # # # # # # # # # # # # # # # # # # # #
+#
+#  Search each input directory for broken header files.
+#  This loop ends near the end of the file.
+#
+if test $# -eq 0
+then
+    INPUTLIST="/usr/include"
+else
+    INPUTLIST="$@"
+fi
+
+for INPUT in ${INPUTLIST} ; do
+
+cd ${ORIGDIR}
+
+cd ${INPUT} || {
+  echo 'fixincludes:  input dir `'$INPUT"' is an invalid directory"
+  exit 1
+}
+
+#
+# # # # # # # # # # # # # # # # # # # # #
+#
+echo Finding directories and links to directories
+
+# Find all directories and all symlinks that point to directories.
+# Put the list in $files.
+# Each time we find a symlink, add it to newdirs
+# so that we do another find within the dir the link points to.
+# Note that $files may have duplicates in it;
+# later parts of this file are supposed to ignore them.
+dirs="."
+levels=2
+while [ -n "$dirs" ] && [ $levels -gt 0 ]
+do
+    levels=`expr $levels - 1`
+    newdirs=
+    for d in $dirs
+    do
+    echo " Searching $INPUT/$d"
+ 
+    # Find all directories under $d, relative to $d, excluding $d itself.
+    # (The /. is needed after $d in case $d is a symlink.)
+    files="$files `find $d/. -type d -print | \
+               sed -e '/\/\.$/d' -e 's@/./@/@g'`"
+    # Find all links to directories.
+    # Using `-exec test -d' in find fails on some systems,
+    # and trying to run test via sh fails on others,
+    # so this is the simplest alternative left.
+    # First find all the links, then test each one.
+    theselinks=
+    $LINKS && \
+      theselinks=`find $d/. -type l -print | sed -e 's@/./@/@g'`
+    for d1 in $theselinks --dummy--
+    do
+        # If the link points to a directory,
+        # add that dir to $newdirs
+        if [ -d $d1 ]
+        then
+        files="$files $d1"
+        if [ "`ls -ld $d1 | sed -n 's/.*-> //p'`" != "." ]
+        then
+            newdirs="$newdirs $d1"
+        fi
+        fi
+    done
+    done
+ 
+    dirs="$newdirs"
+done
+ 
+# # # # # # # # # # # # # # # # # # # # #
+#
+dirs=
+echo "All directories (including links to directories):"
+echo $files
+ 
+for file in $files; do
+  rm -rf $LIB/$file
+  if [ ! -d $LIB/$file ]
+  then mkdir $LIB/$file
+  fi
+done
+mkdir $LIB/root
+ 
+# # # # # # # # # # # # # # # # # # # # #
+#
+# treetops gets an alternating list
+# of old directories to copy
+# and the new directories to copy to.
+treetops="${INPUT} ${LIB}"
+ 
+if $LINKS; then
+  echo 'Making symbolic directory links'
+  for file in $files; do
+    dest=`ls -ld $file | sed -n 's/.*-> //p'`
+    if [ "$dest" ]; then
+      cwd=`${PWDCMD}`
+      # In case $dest is relative, get to $file's dir first.
+      cd ${INPUT}
+      cd `echo ./$file | sed -n 's&[^/]*$&&p'`
+      # Check that the target directory exists.
+      # Redirections changed to avoid bug in sh on Ultrix.
+      (cd $dest) > /dev/null 2>&1
+      if [ $? = 0 ]; then
+    cd $dest
+    # X gets the dir that the link actually leads to.
+    x=`${PWDCMD}`
+    # Canonicalize ${INPUT} now to minimize the time an
+    # automounter has to change the result of ${PWDCMD}.
+    cinput=`cd ${INPUT}; ${PWDCMD}`
+    # If a link points to ., make a similar link to .
+    if [ $x = ${cinput} ]; then
+      echo $file '->' . ': Making link'
+      rm -fr ${LIB}/$file > /dev/null 2>&1
+      ln -s . ${LIB}/$file > /dev/null 2>&1
+    # If link leads back into ${INPUT},
+    # make a similar link here.
+    elif expr $x : "${cinput}/.*" > /dev/null; then
+      # Y gets the actual target dir name, relative to ${INPUT}.
+      y=`echo $x | sed -n "s&${cinput}/&&p"`
+      # DOTS is the relative path from ${LIB}/$file's dir back to ${LIB}.
+      dots=`echo "$file" |
+        sed -e 's@^./@@' -e 's@/./@/@g' -e 's@[^/][^/]*@..@g' -e 's@..$@@'`
+      echo $file '->' $dots$y ': Making link'
+      rm -fr ${LIB}/$file > /dev/null 2>&1
+      ln -s $dots$y ${LIB}/$file > /dev/null 2>&1
+    else
+      # If the link is to a dir $target outside ${INPUT},
+      # repoint the link at ${INPUT}/root$target
+      # and process $target into ${INPUT}/root$target
+      # treat this directory as if it actually contained the files.
+      echo $file '->' root$x ': Making link'
+      if [ -d $LIB/root$x ]
+      then true
+      else
+        dirname=root$x/
+        dirmade=.
+        cd $LIB
+        while [ x$dirname != x ]; do
+          component=`echo $dirname | sed -e 's|/.*$||'`
+          mkdir $component >/dev/null 2>&1
+          cd $component
+          dirmade=$dirmade/$component
+          dirname=`echo $dirname | sed -e 's|[^/]*/||'`
+        done
+      fi
+      # Duplicate directory structure created in ${LIB}/$file in new
+      # root area.
+      for file2 in $files; do
+        case $file2 in
+          $file/*)
+        dupdir=${LIB}/root$x/`echo $file2 | sed -n "s|^${file}/||p"`
+        echo "Duplicating ${file}'s ${dupdir}"
+        if [ -d ${dupdir} ]
+        then true
+        else
+          mkdir ${dupdir}
+        fi
+        ;;
+          *)
+        ;;
+        esac
+          done
+      # Get the path from ${LIB} to $file, accounting for symlinks.
+      parent=`echo "$file" | sed -e 's@/[^/]*$@@'`
+      libabs=`cd ${LIB}; ${PWDCMD}`
+      file2=`cd ${LIB}; cd $parent; ${PWDCMD} | sed -e "s@^${libabs}@@"`
+      # DOTS is the relative path from ${LIB}/$file's dir back to ${LIB}.
+      dots=`echo "$file2" | sed -e 's@/[^/]*@../@g'`
+      rm -fr ${LIB}/$file > /dev/null 2>&1
+      ln -s ${dots}root$x ${LIB}/$file > /dev/null 2>&1
+      treetops="$treetops $x ${LIB}/root$x"
+    fi
+      fi
+      cd $cwd
+    fi
+  done
+fi
+ 
+# # # # # # # # # # # # # # # # # # # # #
+#
+required=
+set x $treetops
+shift
+while [ $# != 0 ]; do
+  # $1 is an old directory to copy, and $2 is the new directory to copy to.
+  #
+  SRCDIR=`cd ${INPUT} ; cd $1 ; ${PWDCMD}`
+  export SRCDIR
+  shift
+
+  DESTDIR=`cd $1;${PWDCMD}`
+  export DESTDIR
+  shift
+
+  # The same dir can appear more than once in treetops.
+  # There's no need to scan it more than once.
+  #
+  if [ -f ${DESTDIR}/DONE ]
+  then continue ; fi
+
+  touch ${DESTDIR}/DONE
+  echo Fixing directory ${SRCDIR} into ${DESTDIR}
+
+  # Check .h files which are symlinks as well as those which are files.
+  # A link to a header file will not be processed by anything but this.
+  #
+  cd ${SRCDIR}
+[=_IF PROGRAM _env ! =][=
+
+    _include hackshell =][=
+
+  _ELSE
+
+=]
+  required="$required `if $LINKS; then
+    find . -name '*.h' \( -type f -o -type l \) -print
+  else
+    find . -name '*.h' -type f -print
+  fi | ${FIXINCL}`"[=
+
+
+  _ENDIF =]
+done
+
+## Make sure that any include files referenced using double quotes
+## exist in the fixed directory.  This comes last since otherwise
+## we might end up deleting some of these files "because they don't
+## need any change."
+set x `echo $required`
+shift
+while [ $# != 0 ]; do
+  newreq=
+  while [ $# != 0 ]; do
+    # $1 is the directory to copy from,
+    # $2 is the unfixed file,
+    # $3 is the fixed file name.
+    #
+    cd ${INPUT}
+    cd $1
+    if [ -r $2 ] && [ ! -r $3 ]; then
+      cp $2 $3 >/dev/null 2>&1 || echo "Can't copy $2" >&2
+      chmod +w $3 2>/dev/null
+      chmod a+r $3 2>/dev/null
+      echo Copied $2
+      for include in `egrep '^[ 	]*#[ 	]*include[ 	]*"[^/]' $3 |
+             sed -e 's/^[ 	]*#[ 	]*include[ 	]*"\([^"]*\)".*$/\1/'`
+      do
+	dir=`echo $2 | sed -e s'|/[^/]*$||'`
+	dir2=`echo $3 | sed -e s'|/[^/]*$||'`
+	newreq="$newreq $1 $dir/$include $dir2/$include"
+      done
+    fi
+    shift; shift; shift
+  done
+  set x $newreq
+  shift
+done
+
+echo 'Cleaning up DONE files.'
+cd $LIB
+find . -name DONE -exec rm -f '{}' ';'
+
+echo 'Removing unneeded directories:'
+cd $LIB
+files=`find . -type d -print | sort -r`
+for file in $files; do
+  rmdir $LIB/$file > /dev/null 2>&1 | :
+done
+
+# # # # # # # # # # # # # # # # # # # # #
+#
+# End of for INPUT directories
+#
+done
+#
+# # # # # # # # # # # # # # # # # # # # #
+
+cd $ORIGDIR
+rm -f include/assert.h
+cp ${EGCS_SRCDIR}/assert.h include/assert.h
+chmod a+r include/assert.h
+[=
+
+#  Make the output file executable
+# =][=
+_eval _outfile "chmod +x %s" _printf _shell=]
diff --git a/gcc/fixinc/mkfixinc.sh b/gcc/fixinc/mkfixinc.sh
new file mode 100755
index 0000000..c0811aa
--- /dev/null
+++ b/gcc/fixinc/mkfixinc.sh
@@ -0,0 +1,116 @@
+#! /bin/sh
+
+machine=$1
+if [ -z "$machine" ]
+then
+	echo No machine name given
+	exit 1
+fi
+
+echo constructing fixinc.sh for $machine
+fixincludes="../fixinc.sh"
+
+case $machine in
+	*-*-gnu*)
+		fixincludes=
+		;;
+
+	*-*-sysv4*)
+		fixincludes=fixinc.svr4
+		;;
+
+	mips-dec-bsd*)
+		:
+		;;
+
+	i[34567]86-*-sysv5* | \
+	i[34567]86-*-udk* | \
+	i[34567]86-*-solaris2.[0-4] | \
+	powerpcle-*-solaris2.[0-4] | \
+	sparc-*-solaris2.[0-4] )
+		fixincludes=fixinc.svr4
+		;;
+
+	*-*-netbsd* | \
+	alpha*-*-linux-gnulibc1* | \
+	i[34567]86-*-freebsd* | \
+	i[34567]86-*-netbsd* | i[34567]86-*-openbsd* | \
+	i[34567]86-*-solaris2* | \
+	sparcv9-*-solaris2* | \
+	powerpcle-*-solaris2*  | \
+	sparc-*-solaris2* )
+		fixincludes=fixinc.wrap
+		;;
+
+	alpha*-*-winnt* | \
+	i[34567]86-*-winnt3*)
+		fixincludes=fixinc.winnt
+		;;
+
+	i[34567]86-sequent-ptx* | i[34567]86-sequent-sysv[34]*)
+		fixincludes=fixinc.ptx
+		;;
+
+	i[34567]86-dg-dgux* | \
+	m88k-dg-dgux*)
+		fixincludes=fixinc.dgux
+		;;
+
+	i[34567]86-*-sco3.2v5* | \
+	i[34567]86-*-sco3.2v4*)
+		fixincludes=fixinc.sco
+		;;
+
+	alpha*-*-linux-gnu* | \
+	alpha*-dec-vms* | \
+	arm-semi-aout | armel-semi-aout | \
+	arm-semi-aof | armel-semi-aof | \
+	arm-*-linux-gnuaout* | \
+	c*-convex-* | \
+	hppa1.1-*-osf* | \
+	hppa1.0-*-osf* | \
+	hppa1.1-*-bsd* | \
+	hppa1.0-*-bsd* | \
+	hppa*-*-lites* | \
+	*-*-linux-gnu* | \
+	i[34567]86-moss-msdos* | i[34567]86-*-moss* | \
+	i[34567]86-*-osf1* | \
+	i[34567]86-*-win32 | \
+	i[34567]86-*-pe | i[34567]86-*-cygwin32 | \
+	i[34567]86-*-mingw32* | \
+	mips-sgi-irix5cross64 | \
+	powerpc-*-eabiaix* | \
+	powerpc-*-eabisim* | \
+	powerpc-*-eabi*    | \
+	powerpc-*-rtems*   | \
+	powerpcle-*-eabisim* | \
+	powerpcle-*-eabi*  | \
+        powerpcle-*-winnt* | \
+	powerpcle-*-pe | powerpcle-*-cygwin32 | \
+	thumb-*-coff* | thumbel-*-coff* )
+		fixincludes=
+		;;
+
+	*-sgi-irix*)
+		fixincludes=fixinc.irix
+		;;
+esac
+
+if test -z "$fixincludes"
+then
+    cat > ../fixinc.sh  <<-	_EOF_
+	#! /bin/sh
+	exit 0
+	_EOF_
+    exit 0
+fi
+
+if test -f "$fixincludes"
+then
+    echo copying $fixincludes to $dest
+    cp $fixincludes $dest
+    exit 0
+fi
+
+echo $MAKE install
+$MAKE install || cp inclhack.sh ..
diff --git a/gcc/fixinc/regex.c b/gcc/fixinc/regex.c
new file mode 100644
index 0000000..adff8a2
--- /dev/null
+++ b/gcc/fixinc/regex.c
@@ -0,0 +1,5058 @@
+/* Extended regular expression matching and search library,
+   version 0.12.
+   (Implements POSIX draft P10003.2/D11.2, except for
+   internationalization features.)
+
+   Copyright (C) 1993 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+
+/* AIX requires this to be the first thing in the file. */
+#if defined (_AIX) && !defined (REGEX_MALLOC)
+  #pragma alloca
+#endif
+
+/* $Id: regex.c,v 1.3 1999/01/11 13:34:23 law Exp $ */
+
+#define _GNU_SOURCE
+
+/* We need this for `regex.h', and perhaps for the Emacs include files.  */
+#ifdef __TANDEM
+/*
+ *  WARN 107:  constant used as logical expression
+ *  Side effect of some complex macros
+ */
+#  pragma NOWARN( 107 )
+
+/*
+ *  WARN 95: prototype function declaration not in scope:
+ *  TANDEM brain damaged C.
+ */
+#  pragma NOWARN( 95 )
+#  include <systype.h>
+#else
+#  include <sys/types.h>
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+/* The `emacs' switch turns on certain matching commands
+   that make sense only in Emacs. */
+#ifdef emacs
+
+#include "lisp.h"
+#include "buffer.h"
+#include "syntax.h"
+
+/* Emacs uses `NULL' as a predicate.  */
+#undef NULL
+
+#else  /* not emacs */
+
+#ifdef __TANDEM
+#  include <string.h>
+#  include <stdlib.h>
+#  ifndef bcmp
+#    define bcmp(s1, s2, n)     memcmp ((s1), (s2), (n))
+#  endif
+#  ifndef bcopy
+#    define bcopy(s, d, n)      memcpy ((d), (s), (n))
+#  endif
+#  ifndef bzero
+#    define bzero(s, n)         memset ((s), 0, (n))
+#  endif
+#  pragma NOWARN( 96 )
+
+#else /* NOT TANDEM */
+
+/* We used to test for `BSTRING' here, but only GCC and Emacs define
+   `BSTRING', as far as I know, and neither of them use this code.  */
+#  if HAVE_STRING_H || STDC_HEADERS
+#    include <string.h>
+#    ifndef bcmp
+#      define bcmp(s1, s2, n)   memcmp ((s1), (s2), (n))
+#    endif
+#    ifndef bcopy
+#      define bcopy(s, d, n)    memcpy ((d), (s), (n))
+#    endif
+#    ifndef bzero
+#      define bzero(s, n)       memset ((s), 0, (n))
+#    endif
+#  else
+#    include <strings.h>
+#  endif
+
+#  ifdef STDC_HEADERS
+#    include <stdlib.h>
+#  else
+     char *malloc ();
+     char *realloc ();
+#  endif
+#endif /* TANDEM */
+
+/* Define the syntax stuff for \<, \>, etc.  */
+
+/* This must be nonzero for the wordchar and notwordchar pattern
+   commands in re_match_2.  */
+#ifndef Sword 
+#define Sword 1
+#endif
+
+#ifdef SYNTAX_TABLE
+
+extern char *re_syntax_table;
+
+#else /* not SYNTAX_TABLE */
+
+/* How many characters in the character set.  */
+#define CHAR_SET_SIZE 256
+
+static char re_syntax_table[CHAR_SET_SIZE];
+
+static void
+init_syntax_once ()
+{
+   register int c;
+   static int done = 0;
+
+   if (done)
+     return;
+
+   bzero (re_syntax_table, sizeof re_syntax_table);
+
+   for (c = 'a'; c <= 'z'; c++)
+     re_syntax_table[c] = Sword;
+
+   for (c = 'A'; c <= 'Z'; c++)
+     re_syntax_table[c] = Sword;
+
+   for (c = '0'; c <= '9'; c++)
+     re_syntax_table[c] = Sword;
+
+   re_syntax_table['_'] = Sword;
+
+   done = 1;
+}
+
+#endif /* not SYNTAX_TABLE */
+
+#define SYNTAX(c) re_syntax_table[c]
+
+#endif /* not emacs */
+
+/* Get the interface, including the syntax bits.  */
+#include "regex.h"
+
+/* isalpha etc. are used for the character classes.  */
+#include <ctype.h>
+
+#ifndef isascii
+#define isascii(c) 1
+#endif
+
+#ifdef isblank
+#define ISBLANK(c) (isascii (c) && isblank (c))
+#else
+#define ISBLANK(c) ((c) == ' ' || (c) == '\t')
+#endif
+#ifdef isgraph
+#define ISGRAPH(c) (isascii (c) && isgraph (c))
+#else
+#define ISGRAPH(c) (isascii (c) && isprint (c) && !isspace (c))
+#endif
+
+#define ISPRINT(c) (isascii (c) && isprint (c))
+#define ISDIGIT(c) (isascii (c) && isdigit (c))
+#define ISALNUM(c) (isascii (c) && isalnum (c))
+#define ISALPHA(c) (isascii (c) && isalpha (c))
+#define ISCNTRL(c) (isascii (c) && iscntrl (c))
+#define ISLOWER(c) (isascii (c) && islower (c))
+#define ISPUNCT(c) (isascii (c) && ispunct (c))
+#define ISSPACE(c) (isascii (c) && isspace (c))
+#define ISUPPER(c) (isascii (c) && isupper (c))
+#define ISXDIGIT(c) (isascii (c) && isxdigit (c))
+
+#ifndef NULL
+#define NULL 0
+#endif
+
+/* We remove any previous definition of `SIGN_EXTEND_CHAR',
+   since ours (we hope) works properly with all combinations of
+   machines, compilers, `char' and `unsigned char' argument types.
+   (Per Bothner suggested the basic approach.)  */
+#undef SIGN_EXTEND_CHAR
+#if __STDC__
+#define SIGN_EXTEND_CHAR(c) ((signed char) (c))
+#else  /* not __STDC__ */
+/* As in Harbison and Steele.  */
+#define SIGN_EXTEND_CHAR(c) ((((unsigned char) (c)) ^ 128) - 128)
+#endif
+
+/* Should we use malloc or alloca?  If REGEX_MALLOC is not defined, we
+   use `alloca' instead of `malloc'.  This is because using malloc in
+   re_search* or re_match* could cause memory leaks when C-g is used in
+   Emacs; also, malloc is slower and causes storage fragmentation.  On
+   the other hand, malloc is more portable, and easier to debug.  
+   
+   Because we sometimes use alloca, some routines have to be macros,
+   not functions -- `alloca'-allocated space disappears at the end of the
+   function it is called in.  */
+
+#ifdef __TANDEM
+#define REGEX_MALLOC 1
+#endif
+
+#ifdef REGEX_MALLOC
+
+#define REGEX_ALLOCATE malloc
+#define DESTINATION_DECL
+#define REGEX_REALLOCATE(source, osize, nsize) realloc (source, nsize)
+
+#else /* not REGEX_MALLOC  */
+
+/* Emacs already defines alloca, sometimes.  */
+#ifndef alloca
+
+/* Make alloca work the best possible way.  */
+#ifdef __GNUC__
+#define alloca __builtin_alloca
+#else /* not __GNUC__ */
+#if HAVE_ALLOCA_H
+#include <alloca.h>
+#else /* not __GNUC__ or HAVE_ALLOCA_H */
+#ifndef _AIX /* Already did AIX, up at the top.  */
+char *alloca ();
+#endif /* not _AIX */
+#endif /* not HAVE_ALLOCA_H */ 
+#endif /* not __GNUC__ */
+
+#endif /* not alloca */
+
+#define REGEX_ALLOCATE alloca
+#define DESTINATION_DECL  char* destination;
+
+/* Assumes a `char *destination' variable.  */
+#define REGEX_REALLOCATE(source, osize, nsize)				\
+  (destination = (char *) alloca (nsize),				\
+   bcopy (source, destination, osize),					\
+   destination)
+
+#endif /* not REGEX_MALLOC */
+
+
+/* True if `size1' is non-NULL and PTR is pointing anywhere inside
+   `string1' or just past its end.  This works if PTR is NULL, which is
+   a good thing.  */
+#define FIRST_STRING_P(ptr) 					\
+  (size1 && string1 <= (ptr) && (ptr) <= string1 + size1)
+
+/* (Re)Allocate N items of type T using malloc, or fail.  */
+#define TALLOC(n, t) ((t *) malloc ((n) * sizeof (t)))
+#define RETALLOC(addr, n, t) ((addr) = (t *) realloc (addr, (n) * sizeof (t)))
+#define REGEX_TALLOC(n, t) ((t *) REGEX_ALLOCATE ((n) * sizeof (t)))
+
+#define BYTEWIDTH 8 /* In bits.  */
+
+#define STREQ(s1, s2) ((strcmp (s1, s2) == 0))
+
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+
+typedef char boolean;
+#define false 0
+#define true 1
+
+/* These are the command codes that appear in compiled regular
+   expressions.  Some opcodes are followed by argument bytes.  A
+   command code can specify any interpretation whatsoever for its
+   arguments.  Zero bytes may appear in the compiled regular expression.
+
+   The value of `exactn' is needed in search.c (search_buffer) in Emacs.
+   So regex.h defines a symbol `RE_EXACTN_VALUE' to be 1; the value of
+   `exactn' we use here must also be 1.  */
+
+typedef enum
+{
+  no_op = 0,
+
+        /* Followed by one byte giving n, then by n literal bytes.  */
+  exactn = 1,
+
+        /* Matches any (more or less) character.  */
+  anychar,
+
+        /* Matches any one char belonging to specified set.  First
+           following byte is number of bitmap bytes.  Then come bytes
+           for a bitmap saying which chars are in.  Bits in each byte
+           are ordered low-bit-first.  A character is in the set if its
+           bit is 1.  A character too large to have a bit in the map is
+           automatically not in the set.  */
+  charset,
+
+        /* Same parameters as charset, but match any character that is
+           not one of those specified.  */
+  charset_not,
+
+        /* Start remembering the text that is matched, for storing in a
+           register.  Followed by one byte with the register number, in
+           the range 0 to one less than the pattern buffer's re_nsub
+           field.  Then followed by one byte with the number of groups
+           inner to this one.  (This last has to be part of the
+           start_memory only because we need it in the on_failure_jump
+           of re_match_2.)  */
+  start_memory,
+
+        /* Stop remembering the text that is matched and store it in a
+           memory register.  Followed by one byte with the register
+           number, in the range 0 to one less than `re_nsub' in the
+           pattern buffer, and one byte with the number of inner groups,
+           just like `start_memory'.  (We need the number of inner
+           groups here because we don't have any easy way of finding the
+           corresponding start_memory when we're at a stop_memory.)  */
+  stop_memory,
+
+        /* Match a duplicate of something remembered. Followed by one
+           byte containing the register number.  */
+  duplicate,
+
+        /* Fail unless at beginning of line.  */
+  begline,
+
+        /* Fail unless at end of line.  */
+  endline,
+
+        /* Succeeds if at beginning of buffer (if emacs) or at beginning
+           of string to be matched (if not).  */
+  begbuf,
+
+        /* Analogously, for end of buffer/string.  */
+  endbuf,
+ 
+        /* Followed by two byte relative address to which to jump.  */
+  jump, 
+
+	/* Same as jump, but marks the end of an alternative.  */
+  jump_past_alt,
+
+        /* Followed by two-byte relative address of place to resume at
+           in case of failure.  */
+  on_failure_jump,
+	
+        /* Like on_failure_jump, but pushes a placeholder instead of the
+           current string position when executed.  */
+  on_failure_keep_string_jump,
+  
+        /* Throw away latest failure point and then jump to following
+           two-byte relative address.  */
+  pop_failure_jump,
+
+        /* Change to pop_failure_jump if know won't have to backtrack to
+           match; otherwise change to jump.  This is used to jump
+           back to the beginning of a repeat.  If what follows this jump
+           clearly won't match what the repeat does, such that we can be
+           sure that there is no use backtracking out of repetitions
+           already matched, then we change it to a pop_failure_jump.
+           Followed by two-byte address.  */
+  maybe_pop_jump,
+
+        /* Jump to following two-byte address, and push a dummy failure
+           point. This failure point will be thrown away if an attempt
+           is made to use it for a failure.  A `+' construct makes this
+           before the first repeat.  Also used as an intermediary kind
+           of jump when compiling an alternative.  */
+  dummy_failure_jump,
+
+	/* Push a dummy failure point and continue.  Used at the end of
+	   alternatives.  */
+  push_dummy_failure,
+
+        /* Followed by two-byte relative address and two-byte number n.
+           After matching N times, jump to the address upon failure.  */
+  succeed_n,
+
+        /* Followed by two-byte relative address, and two-byte number n.
+           Jump to the address N times, then fail.  */
+  jump_n,
+
+        /* Set the following two-byte relative address to the
+           subsequent two-byte number.  The address *includes* the two
+           bytes of number.  */
+  set_number_at,
+
+  wordchar,	/* Matches any word-constituent character.  */
+  notwordchar,	/* Matches any char that is not a word-constituent.  */
+
+  wordbeg,	/* Succeeds if at word beginning.  */
+  wordend,	/* Succeeds if at word end.  */
+
+  wordbound,	/* Succeeds if at a word boundary.  */
+  notwordbound	/* Succeeds if not at a word boundary.  */
+
+#ifdef emacs
+  ,before_dot,	/* Succeeds if before point.  */
+  at_dot,	/* Succeeds if at point.  */
+  after_dot,	/* Succeeds if after point.  */
+
+	/* Matches any character whose syntax is specified.  Followed by
+           a byte which contains a syntax code, e.g., Sword.  */
+  syntaxspec,
+
+	/* Matches any character whose syntax is not that specified.  */
+  notsyntaxspec
+#endif /* emacs */
+} re_opcode_t;
+
+/* Common operations on the compiled pattern.  */
+
+/* Store NUMBER in two contiguous bytes starting at DESTINATION.  */
+
+#define STORE_NUMBER(destination, number)			\
+  do {								\
+    (destination)[0] = (unsigned char)((number) & 0377);	\
+    (destination)[1] = (unsigned char)((number) >> 8);		\
+  } while (0)
+
+/* Same as STORE_NUMBER, except increment DESTINATION to
+   the byte after where the number is stored.  Therefore, DESTINATION
+   must be an lvalue.  */
+
+#define STORE_NUMBER_AND_INCR(destination, number)			\
+  do {									\
+    STORE_NUMBER (destination, number);					\
+    (destination) += 2;							\
+  } while (0)
+
+/* Put into DESTINATION a number stored in two contiguous bytes starting
+   at SOURCE.  */
+
+#define EXTRACT_NUMBER(destination, source)				\
+  do {									\
+    (destination) = *(source) & 0377;					\
+    (destination) += SIGN_EXTEND_CHAR (*((source) + 1)) << 8;		\
+  } while (0)
+
+#ifdef DEBUG
+static void
+extract_number (dest, source)
+    int *dest;
+    unsigned char *source;
+{
+  int temp = SIGN_EXTEND_CHAR (*(source + 1)); 
+  *dest = *source & 0377;
+  *dest += temp << 8;
+}
+
+#ifndef EXTRACT_MACROS /* To debug the macros.  */
+#undef EXTRACT_NUMBER
+#define EXTRACT_NUMBER(dest, src) extract_number (&dest, src)
+#endif /* not EXTRACT_MACROS */
+
+#endif /* DEBUG */
+
+/* Same as EXTRACT_NUMBER, except increment SOURCE to after the number.
+   SOURCE must be an lvalue.  */
+
+#define EXTRACT_NUMBER_AND_INCR(destination, source)			\
+  do {									\
+    EXTRACT_NUMBER (destination, source);				\
+    (source) += 2; 							\
+  } while (0)
+
+#ifdef DEBUG
+static void
+extract_number_and_incr (destination, source)
+    int *destination;
+    unsigned char **source;
+{ 
+  extract_number (destination, *source);
+  *source += 2;
+}
+
+#ifndef EXTRACT_MACROS
+#undef EXTRACT_NUMBER_AND_INCR
+#define EXTRACT_NUMBER_AND_INCR(dest, src) \
+  extract_number_and_incr (&dest, &src)
+#endif /* not EXTRACT_MACROS */
+
+#endif /* DEBUG */
+
+/* If DEBUG is defined, Regex prints many voluminous messages about what
+   it is doing (if the variable `debug' is nonzero).  If linked with the
+   main program in `iregex.c', you can enter patterns and strings
+   interactively.  And if linked with the main program in `main.c' and
+   the other test files, you can run the already-written tests.  */
+
+#ifdef DEBUG
+
+/* We use standard I/O for debugging.  */
+#include <stdio.h>
+
+/* It is useful to test things that ``must'' be true when debugging.  */
+#include <assert.h>
+
+static int debug = 0;
+
+#define DEBUG_STATEMENT(e) e
+#define DEBUG_PRINT1(x) if (debug) printf (x)
+#define DEBUG_PRINT2(x1, x2) if (debug) printf (x1, x2)
+#define DEBUG_PRINT3(x1, x2, x3) if (debug) printf (x1, x2, x3)
+#define DEBUG_PRINT4(x1, x2, x3, x4) if (debug) printf (x1, x2, x3, x4)
+#define DEBUG_PRINT_COMPILED_PATTERN(p, s, e) 				\
+  if (debug) print_partial_compiled_pattern (s, e)
+#define DEBUG_PRINT_DOUBLE_STRING(w, s1, sz1, s2, sz2)			\
+  if (debug) print_double_string (w, s1, sz1, s2, sz2)
+
+
+extern void printchar ();
+
+/* Print the fastmap in human-readable form.  */
+
+void
+print_fastmap (fastmap)
+    char *fastmap;
+{
+  unsigned was_a_range = 0;
+  unsigned i = 0;  
+  
+  while (i < (1 << BYTEWIDTH))
+    {
+      if (fastmap[i++])
+	{
+	  was_a_range = 0;
+          printchar (i - 1);
+          while (i < (1 << BYTEWIDTH)  &&  fastmap[i])
+            {
+              was_a_range = 1;
+              i++;
+            }
+	  if (was_a_range)
+            {
+              printf ("-");
+              printchar (i - 1);
+            }
+        }
+    }
+  putchar ('\n'); 
+}
+
+
+/* Print a compiled pattern string in human-readable form, starting at
+   the START pointer into it and ending just before the pointer END.  */
+
+void
+print_partial_compiled_pattern (start, end)
+    unsigned char *start;
+    unsigned char *end;
+{
+  int mcnt, mcnt2;
+  unsigned char *p = start;
+  unsigned char *pend = end;
+
+  if (start == NULL)
+    {
+      printf ("(null)\n");
+      return;
+    }
+    
+  /* Loop over pattern commands.  */
+  while (p < pend)
+    {
+      switch ((re_opcode_t) *p++)
+	{
+        case no_op:
+          printf ("/no_op");
+          break;
+
+	case exactn:
+	  mcnt = *p++;
+          printf ("/exactn/%d", mcnt);
+          do
+	    {
+              putchar ('/');
+	      printchar (*p++);
+            }
+          while (--mcnt);
+          break;
+
+	case start_memory:
+          mcnt = *p++;
+          printf ("/start_memory/%d/%d", mcnt, *p++);
+          break;
+
+	case stop_memory:
+          mcnt = *p++;
+	  printf ("/stop_memory/%d/%d", mcnt, *p++);
+          break;
+
+	case duplicate:
+	  printf ("/duplicate/%d", *p++);
+	  break;
+
+	case anychar:
+	  printf ("/anychar");
+	  break;
+
+	case charset:
+        case charset_not:
+          {
+            register int c;
+
+            printf ("/charset%s",
+	            (re_opcode_t) *(p - 1) == charset_not ? "_not" : "");
+            
+            assert (p + *p < pend);
+
+            for (c = 0; c < *p; c++)
+              {
+                unsigned bit;
+                unsigned char map_byte = p[1 + c];
+                
+                putchar ('/');
+
+		for (bit = 0; bit < BYTEWIDTH; bit++)
+                  if (map_byte & (1 << bit))
+                    printchar (c * BYTEWIDTH + bit);
+              }
+	    p += 1 + *p;
+	    break;
+	  }
+
+	case begline:
+	  printf ("/begline");
+          break;
+
+	case endline:
+          printf ("/endline");
+          break;
+
+	case on_failure_jump:
+          extract_number_and_incr (&mcnt, &p);
+  	  printf ("/on_failure_jump/0/%d", mcnt);
+          break;
+
+	case on_failure_keep_string_jump:
+          extract_number_and_incr (&mcnt, &p);
+  	  printf ("/on_failure_keep_string_jump/0/%d", mcnt);
+          break;
+
+	case dummy_failure_jump:
+          extract_number_and_incr (&mcnt, &p);
+  	  printf ("/dummy_failure_jump/0/%d", mcnt);
+          break;
+
+	case push_dummy_failure:
+          printf ("/push_dummy_failure");
+          break;
+          
+        case maybe_pop_jump:
+          extract_number_and_incr (&mcnt, &p);
+  	  printf ("/maybe_pop_jump/0/%d", mcnt);
+	  break;
+
+        case pop_failure_jump:
+	  extract_number_and_incr (&mcnt, &p);
+  	  printf ("/pop_failure_jump/0/%d", mcnt);
+	  break;          
+          
+        case jump_past_alt:
+	  extract_number_and_incr (&mcnt, &p);
+  	  printf ("/jump_past_alt/0/%d", mcnt);
+	  break;          
+          
+        case jump:
+	  extract_number_and_incr (&mcnt, &p);
+  	  printf ("/jump/0/%d", mcnt);
+	  break;
+
+        case succeed_n: 
+          extract_number_and_incr (&mcnt, &p);
+          extract_number_and_incr (&mcnt2, &p);
+ 	  printf ("/succeed_n/0/%d/0/%d", mcnt, mcnt2);
+          break;
+        
+        case jump_n: 
+          extract_number_and_incr (&mcnt, &p);
+          extract_number_and_incr (&mcnt2, &p);
+ 	  printf ("/jump_n/0/%d/0/%d", mcnt, mcnt2);
+          break;
+        
+        case set_number_at: 
+          extract_number_and_incr (&mcnt, &p);
+          extract_number_and_incr (&mcnt2, &p);
+ 	  printf ("/set_number_at/0/%d/0/%d", mcnt, mcnt2);
+          break;
+        
+        case wordbound:
+	  printf ("/wordbound");
+	  break;
+
+	case notwordbound:
+	  printf ("/notwordbound");
+          break;
+
+	case wordbeg:
+	  printf ("/wordbeg");
+	  break;
+          
+	case wordend:
+	  printf ("/wordend");
+          
+#ifdef emacs
+	case before_dot:
+	  printf ("/before_dot");
+          break;
+
+	case at_dot:
+	  printf ("/at_dot");
+          break;
+
+	case after_dot:
+	  printf ("/after_dot");
+          break;
+
+	case syntaxspec:
+          printf ("/syntaxspec");
+	  mcnt = *p++;
+	  printf ("/%d", mcnt);
+          break;
+	  
+	case notsyntaxspec:
+          printf ("/notsyntaxspec");
+	  mcnt = *p++;
+	  printf ("/%d", mcnt);
+	  break;
+#endif /* emacs */
+
+	case wordchar:
+	  printf ("/wordchar");
+          break;
+	  
+	case notwordchar:
+	  printf ("/notwordchar");
+          break;
+
+	case begbuf:
+	  printf ("/begbuf");
+          break;
+
+	case endbuf:
+	  printf ("/endbuf");
+          break;
+
+        default:
+          printf ("?%d", *(p-1));
+	}
+    }
+  printf ("/\n");
+}
+
+
+void
+print_compiled_pattern (bufp)
+    struct re_pattern_buffer *bufp;
+{
+  unsigned char *buffer = bufp->buffer;
+
+  print_partial_compiled_pattern (buffer, buffer + bufp->used);
+  printf ("%d bytes used/%d bytes allocated.\n", bufp->used, bufp->allocated);
+
+  if (bufp->fastmap_accurate && bufp->fastmap)
+    {
+      printf ("fastmap: ");
+      print_fastmap (bufp->fastmap);
+    }
+
+  printf ("re_nsub: %d\t", bufp->re_nsub);
+  printf ("regs_alloc: %d\t", bufp->regs_allocated);
+  printf ("can_be_null: %d\t", bufp->can_be_null);
+  printf ("newline_anchor: %d\n", bufp->newline_anchor);
+  printf ("no_sub: %d\t", bufp->no_sub);
+  printf ("not_bol: %d\t", bufp->not_bol);
+  printf ("not_eol: %d\t", bufp->not_eol);
+  printf ("syntax: %d\n", bufp->syntax);
+  /* Perhaps we should print the translate table?  */
+}
+
+
+void
+print_double_string (where, string1, size1, string2, size2)
+    const char *where;
+    const char *string1;
+    const char *string2;
+    int size1;
+    int size2;
+{
+  unsigned this_char;
+  
+  if (where == NULL)
+    printf ("(null)");
+  else
+    {
+      if (FIRST_STRING_P (where))
+        {
+          for (this_char = where - string1; this_char < size1; this_char++)
+            printchar (string1[this_char]);
+
+          where = string2;    
+        }
+
+      for (this_char = where - string2; this_char < size2; this_char++)
+        printchar (string2[this_char]);
+    }
+}
+
+#else /* not DEBUG */
+
+#undef assert
+#define assert(e)
+
+#define DEBUG_STATEMENT(e)
+#define DEBUG_PRINT1(x)
+#define DEBUG_PRINT2(x1, x2)
+#define DEBUG_PRINT3(x1, x2, x3)
+#define DEBUG_PRINT4(x1, x2, x3, x4)
+#define DEBUG_PRINT_COMPILED_PATTERN(p, s, e)
+#define DEBUG_PRINT_DOUBLE_STRING(w, s1, sz1, s2, sz2)
+
+#endif /* not DEBUG */
+
+/* Set by `re_set_syntax' to the current regexp syntax to recognize.  Can
+   also be assigned to arbitrarily: each pattern buffer stores its own
+   syntax, so it can be changed between regex compilations.  */
+reg_syntax_t re_syntax_options = RE_SYNTAX_EMACS;
+
+
+/* Specify the precise syntax of regexps for compilation.  This provides
+   for compatibility for various utilities which historically have
+   different, incompatible syntaxes.
+
+   The argument SYNTAX is a bit mask comprised of the various bits
+   defined in regex.h.  We return the old syntax.  */
+
+reg_syntax_t
+re_set_syntax (syntax)
+    reg_syntax_t syntax;
+{
+  reg_syntax_t ret = re_syntax_options;
+  
+  re_syntax_options = syntax;
+  return ret;
+}
+
+/* This table gives an error message for each of the error codes listed
+   in regex.h.  Obviously the order here has to be same as there.  */
+#define _RERR_(n,t) t,
+static const char *re_error_msg[] = { REG_ERR_TABLE };
+# undef _RERR_
+
+/* Subroutine declarations and macros for regex_compile.  */
+
+/* Fetch the next character in the uncompiled pattern---translating it 
+   if necessary.  Also cast from a signed character in the constant
+   string passed to us by the user to an unsigned char that we can use
+   as an array index (in, e.g., `translate').  */
+#define PATFETCH(c)							\
+  do {if (p == pend) return REG_EEND;					\
+    c = (unsigned char) *p++;						\
+    if (translate) c = translate[c]; 					\
+  } while (0)
+
+/* Fetch the next character in the uncompiled pattern, with no
+   translation.  */
+#define PATFETCH_RAW(c)							\
+  do {if (p == pend) return REG_EEND;					\
+    c = (unsigned char) *p++; 						\
+  } while (0)
+
+/* Go backwards one character in the pattern.  */
+#define PATUNFETCH p--
+
+
+/* If `translate' is non-null, return translate[D], else just D.  We
+   cast the subscript to translate because some data is declared as
+   `char *', to avoid warnings when a string constant is passed.  But
+   when we use a character as a subscript we must make it unsigned.  */
+#define TRANSLATE(d) (translate ? translate[(unsigned char) (d)] : (d))
+
+
+/* Macros for outputting the compiled pattern into `buffer'.  */
+
+/* If the buffer isn't allocated when it comes in, use this.  */
+#define INIT_BUF_SIZE  32
+
+/* Make sure we have at least N more bytes of space in buffer.  */
+#define GET_BUFFER_SPACE(n)						\
+    while (b - bufp->buffer + (n) > bufp->allocated)			\
+      EXTEND_BUFFER ()
+
+/* Make sure we have one more byte of buffer space and then add C to it.  */
+#define BUF_PUSH(c)							\
+  do {									\
+    GET_BUFFER_SPACE (1);						\
+    *b++ = (unsigned char) (c);						\
+  } while (0)
+
+
+/* Ensure we have two more bytes of buffer space and then append C1 and C2.  */
+#define BUF_PUSH_2(c1, c2)						\
+  do {									\
+    GET_BUFFER_SPACE (2);						\
+    *b++ = (unsigned char) (c1);					\
+    *b++ = (unsigned char) (c2);					\
+  } while (0)
+
+
+/* As with BUF_PUSH_2, except for three bytes.  */
+#define BUF_PUSH_3(c1, c2, c3)						\
+  do {									\
+    GET_BUFFER_SPACE (3);						\
+    *b++ = (unsigned char) (c1);					\
+    *b++ = (unsigned char) (c2);					\
+    *b++ = (unsigned char) (c3);					\
+  } while (0)
+
+
+/* Store a jump with opcode OP at LOC to location TO.  We store a
+   relative address offset by the three bytes the jump itself occupies.  */
+#define STORE_JUMP(op, loc, to) \
+  store_op1 (op, loc, (to) - (loc) - 3)
+
+/* Likewise, for a two-argument jump.  */
+#define STORE_JUMP2(op, loc, to, arg) \
+  store_op2 (op, loc, (to) - (loc) - 3, arg)
+
+/* Like `STORE_JUMP', but for inserting.  Assume `b' is the buffer end.  */
+#define INSERT_JUMP(op, loc, to) \
+  insert_op1 (op, loc, (to) - (loc) - 3, b)
+
+/* Like `STORE_JUMP2', but for inserting.  Assume `b' is the buffer end.  */
+#define INSERT_JUMP2(op, loc, to, arg) \
+  insert_op2 (op, loc, (to) - (loc) - 3, arg, b)
+
+
+/* This is not an arbitrary limit: the arguments which represent offsets
+   into the pattern are two bytes long.  So if 2^16 bytes turns out to
+   be too small, many things would have to change.  */
+#define MAX_BUF_SIZE (1L << 16)
+
+
+/* Extend the buffer by twice its current size via realloc and
+   reset the pointers that pointed into the old block to point to the
+   correct places in the new one.  If extending the buffer results in it
+   being larger than MAX_BUF_SIZE, then flag memory exhausted.  */
+#define EXTEND_BUFFER()							\
+  do { 									\
+    unsigned char *old_buffer = bufp->buffer;				\
+    if (bufp->allocated == MAX_BUF_SIZE) 				\
+      return REG_ESIZE;							\
+    bufp->allocated <<= 1;						\
+    if (bufp->allocated > MAX_BUF_SIZE)					\
+      bufp->allocated = MAX_BUF_SIZE; 					\
+    bufp->buffer = (unsigned char *) realloc (bufp->buffer, bufp->allocated);\
+    if (bufp->buffer == NULL)						\
+      return REG_ESPACE;						\
+    /* If the buffer moved, move all the pointers into it.  */		\
+    if (old_buffer != bufp->buffer)					\
+      {									\
+        b = (b - old_buffer) + bufp->buffer;				\
+        begalt = (begalt - old_buffer) + bufp->buffer;			\
+        if (fixup_alt_jump)						\
+          fixup_alt_jump = (fixup_alt_jump - old_buffer) + bufp->buffer;\
+        if (laststart)							\
+          laststart = (laststart - old_buffer) + bufp->buffer;		\
+        if (pending_exact)						\
+          pending_exact = (pending_exact - old_buffer) + bufp->buffer;	\
+      }									\
+  } while (0)
+
+
+/* Since we have one byte reserved for the register number argument to
+   {start,stop}_memory, the maximum number of groups we can report
+   things about is what fits in that byte.  */
+#define MAX_REGNUM 255
+
+/* But patterns can have more than `MAX_REGNUM' registers.  We just
+   ignore the excess.  */
+typedef unsigned regnum_t;
+
+
+/* Macros for the compile stack.  */
+
+/* Since offsets can go either forwards or backwards, this type needs to
+   be able to hold values from -(MAX_BUF_SIZE - 1) to MAX_BUF_SIZE - 1.  */
+typedef int pattern_offset_t;
+
+typedef struct
+{
+  pattern_offset_t begalt_offset;
+  pattern_offset_t fixup_alt_jump;
+  pattern_offset_t inner_group_offset;
+  pattern_offset_t laststart_offset;  
+  regnum_t regnum;
+} compile_stack_elt_t;
+
+
+typedef struct
+{
+  compile_stack_elt_t *stack;
+  unsigned size;
+  unsigned avail;			/* Offset of next open position.  */
+} compile_stack_type;
+
+
+#define INIT_COMPILE_STACK_SIZE 32
+
+#define COMPILE_STACK_EMPTY  (compile_stack.avail == 0)
+#define COMPILE_STACK_FULL  (compile_stack.avail == compile_stack.size)
+
+/* The next available element.  */
+#define COMPILE_STACK_TOP (compile_stack.stack[compile_stack.avail])
+
+#ifdef __TANDEM
+#define TYPED_SET_LIST_BIT(c)                         \
+  (b[(c) / BYTEWIDTH] |= (unsigned char) (1 << ((c) % BYTEWIDTH)))
+
+/* Set the bit for character C in a list.  */
+#define SET_LIST_BIT(c)      TYPED_SET_LIST_BIT((unsigned char)c)
+#else
+/* Set the bit for character C in a list.  */
+#define SET_LIST_BIT(c)                               \
+  (b[((unsigned char) (c)) / BYTEWIDTH]               \
+   |= 1 << (((unsigned char) c) % BYTEWIDTH))
+#endif
+
+/* Get the next unsigned number in the uncompiled pattern.  */
+#define GET_UNSIGNED_NUMBER(num) 					\
+  { if (p != pend)							\
+     {									\
+       PATFETCH (c); 							\
+       while (ISDIGIT (c)) 						\
+         { 								\
+           if (num < 0)							\
+              num = 0;							\
+           num = num * 10 + c - '0'; 					\
+           if (p == pend) 						\
+              break; 							\
+           PATFETCH (c);						\
+         } 								\
+       } 								\
+    }		
+
+#define CHAR_CLASS_MAX_LENGTH  6 /* Namely, `xdigit'.  */
+
+#define IS_CHAR_CLASS(string)						\
+   (STREQ (string, "alpha") || STREQ (string, "upper")			\
+    || STREQ (string, "lower") || STREQ (string, "digit")		\
+    || STREQ (string, "alnum") || STREQ (string, "xdigit")		\
+    || STREQ (string, "space") || STREQ (string, "print")		\
+    || STREQ (string, "punct") || STREQ (string, "graph")		\
+    || STREQ (string, "cntrl") || STREQ (string, "blank"))
+
+static void store_op1 (), store_op2 ();
+static void insert_op1 (), insert_op2 ();
+static boolean at_begline_loc_p (), at_endline_loc_p ();
+#ifndef __TANDEM
+static boolean group_in_compile_stack ();
+#else
+static boolean group_in_compile_stack (compile_stack_type*, regnum_t);
+#endif
+static reg_errcode_t compile_range ();
+
+
+/* `regex_compile' compiles PATTERN (of length SIZE) according to SYNTAX.
+   Returns one of error codes defined in `regex.h', or zero for success.
+
+   Assumes the `allocated' (and perhaps `buffer') and `translate'
+   fields are set in BUFP on entry.
+
+   If it succeeds, results are put in BUFP (if it returns an error, the
+   contents of BUFP are undefined):
+     `buffer' is the compiled pattern;
+     `syntax' is set to SYNTAX;
+     `used' is set to the length of the compiled pattern;
+     `fastmap_accurate' is zero;
+     `re_nsub' is the number of subexpressions in PATTERN;
+     `not_bol' and `not_eol' are zero;
+   
+   The `fastmap' and `newline_anchor' fields are neither
+   examined nor set.  */
+
+static reg_errcode_t
+regex_compile (pattern, size, syntax, bufp)
+     const char *pattern;
+     int size;
+     reg_syntax_t syntax;
+     struct re_pattern_buffer *bufp;
+{
+  /* We fetch characters from PATTERN here.  Even though PATTERN is
+     `char *' (i.e., signed), we declare these variables as unsigned, so
+     they can be reliably used as array indices.  */
+  register unsigned char c, c1;
+  
+  /* A random tempory spot in PATTERN.  */
+  const char *p1;
+
+  /* Points to the end of the buffer, where we should append.  */
+  register unsigned char *b;
+  
+  /* Keeps track of unclosed groups.  */
+  compile_stack_type compile_stack;
+
+  /* Points to the current (ending) position in the pattern.  */
+  const char *p = pattern;
+  const char *pend = pattern + size;
+  
+  /* How to translate the characters in the pattern.  */
+  char *translate = bufp->translate;
+
+  /* Address of the count-byte of the most recently inserted `exactn'
+     command.  This makes it possible to tell if a new exact-match
+     character can be added to that command or if the character requires
+     a new `exactn' command.  */
+  unsigned char *pending_exact = 0;
+
+  /* Address of start of the most recently finished expression.
+     This tells, e.g., postfix * where to find the start of its
+     operand.  Reset at the beginning of groups and alternatives.  */
+  unsigned char *laststart = 0;
+
+  /* Address of beginning of regexp, or inside of last group.  */
+  unsigned char *begalt;
+
+  /* Place in the uncompiled pattern (i.e., the {) to
+     which to go back if the interval is invalid.  */
+  const char *beg_interval;
+                
+  /* Address of the place where a forward jump should go to the end of
+     the containing expression.  Each alternative of an `or' -- except the
+     last -- ends with a forward jump of this sort.  */
+  unsigned char *fixup_alt_jump = 0;
+
+  /* Counts open-groups as they are encountered.  Remembered for the
+     matching close-group on the compile stack, so the same register
+     number is put in the stop_memory as the start_memory.  */
+  regnum_t regnum = 0;
+
+#ifdef DEBUG
+  DEBUG_PRINT1 ("\nCompiling pattern: ");
+  if (debug)
+    {
+      unsigned debug_count;
+      
+      for (debug_count = 0; debug_count < size; debug_count++)
+        printchar (pattern[debug_count]);
+      putchar ('\n');
+    }
+#endif /* DEBUG */
+
+  /* Initialize the compile stack.  */
+  compile_stack.stack = TALLOC (INIT_COMPILE_STACK_SIZE, compile_stack_elt_t);
+  if (compile_stack.stack == NULL)
+    return REG_ESPACE;
+
+  compile_stack.size = INIT_COMPILE_STACK_SIZE;
+  compile_stack.avail = 0;
+
+  /* Initialize the pattern buffer.  */
+  bufp->syntax = syntax;
+  bufp->fastmap_accurate = 0;
+  bufp->not_bol = bufp->not_eol = 0;
+
+  /* Set `used' to zero, so that if we return an error, the pattern
+     printer (for debugging) will think there's no pattern.  We reset it
+     at the end.  */
+  bufp->used = 0;
+  
+  /* Always count groups, whether or not bufp->no_sub is set.  */
+  bufp->re_nsub = 0;				
+
+#if !defined (emacs) && !defined (SYNTAX_TABLE)
+  /* Initialize the syntax table.  */
+#ifdef __TANDEM
+   /*
+    *  How can any compiler be so amazingly brain dead?
+    */
+#pragma NOWARN( 95 )
+#endif
+   init_syntax_once ();
+#endif
+
+  if (bufp->allocated == 0)
+    {
+      if (bufp->buffer)
+	{ /* If zero allocated, but buffer is non-null, try to realloc
+             enough space.  This loses if buffer's address is bogus, but
+             that is the user's responsibility.  */
+          RETALLOC (bufp->buffer, INIT_BUF_SIZE, unsigned char);
+        }
+      else
+        { /* Caller did not allocate a buffer.  Do it for them.  */
+          bufp->buffer = TALLOC (INIT_BUF_SIZE, unsigned char);
+        }
+      if (!bufp->buffer) return REG_ESPACE;
+
+      bufp->allocated = INIT_BUF_SIZE;
+    }
+
+  begalt = b = bufp->buffer;
+
+  /* Loop through the uncompiled pattern until we're at the end.  */
+  while (p != pend)
+    {
+      PATFETCH (c);
+
+      switch (c)
+        {
+        case '^':
+          {
+            if (   /* If at start of pattern, it's an operator.  */
+                   p == pattern + 1
+                   /* If context independent, it's an operator.  */
+                || syntax & RE_CONTEXT_INDEP_ANCHORS
+                   /* Otherwise, depends on what's come before.  */
+                || at_begline_loc_p (pattern, p, syntax))
+              BUF_PUSH (begline);
+            else
+              goto normal_char;
+          }
+          break;
+
+
+        case '$':
+          {
+            if (   /* If at end of pattern, it's an operator.  */
+                   p == pend 
+                   /* If context independent, it's an operator.  */
+                || syntax & RE_CONTEXT_INDEP_ANCHORS
+                   /* Otherwise, depends on what's next.  */
+                || at_endline_loc_p (p, pend, syntax))
+               BUF_PUSH (endline);
+             else
+               goto normal_char;
+           }
+           break;
+
+
+	case '+':
+        case '?':
+          if ((syntax & RE_BK_PLUS_QM)
+              || (syntax & RE_LIMITED_OPS))
+            goto normal_char;
+        handle_plus:
+        case '*':
+          /* If there is no previous pattern... */
+          if (!laststart)
+            {
+              if (syntax & RE_CONTEXT_INVALID_OPS)
+                return REG_BADRPT;
+              else if (!(syntax & RE_CONTEXT_INDEP_OPS))
+                goto normal_char;
+            }
+
+          {
+            /* Are we optimizing this jump?  */
+            boolean keep_string_p = false;
+            
+            /* 1 means zero (many) matches is allowed.  */
+            char zero_times_ok = 0, many_times_ok = 0;
+
+            /* If there is a sequence of repetition chars, collapse it
+               down to just one (the right one).  We can't combine
+               interval operators with these because of, e.g., `a{2}*',
+               which should only match an even number of `a's.  */
+
+            for (;;)
+              {
+                zero_times_ok |= c != '+';
+                many_times_ok |= c != '?';
+
+                if (p == pend)
+                  break;
+
+                PATFETCH (c);
+
+                if (c == '*'
+                    || (!(syntax & RE_BK_PLUS_QM) && (c == '+' || c == '?')))
+                  ;
+
+                else if (syntax & RE_BK_PLUS_QM  &&  c == '\\')
+                  {
+                    if (p == pend) return REG_EESCAPE;
+
+                    PATFETCH (c1);
+                    if (!(c1 == '+' || c1 == '?'))
+                      {
+                        PATUNFETCH;
+                        PATUNFETCH;
+                        break;
+                      }
+
+                    c = c1;
+                  }
+                else
+                  {
+                    PATUNFETCH;
+                    break;
+                  }
+
+                /* If we get here, we found another repeat character.  */
+               }
+
+            /* Star, etc. applied to an empty pattern is equivalent
+               to an empty pattern.  */
+            if (!laststart)  
+              break;
+
+            /* Now we know whether or not zero matches is allowed
+               and also whether or not two or more matches is allowed.  */
+            if (many_times_ok)
+              { /* More than one repetition is allowed, so put in at the
+                   end a backward relative jump from `b' to before the next
+                   jump we're going to put in below (which jumps from
+                   laststart to after this jump).  
+
+                   But if we are at the `*' in the exact sequence `.*\n',
+                   insert an unconditional jump backwards to the .,
+                   instead of the beginning of the loop.  This way we only
+                   push a failure point once, instead of every time
+                   through the loop.  */
+                assert (p - 1 > pattern);
+
+                /* Allocate the space for the jump.  */
+                GET_BUFFER_SPACE (3);
+
+                /* We know we are not at the first character of the pattern,
+                   because laststart was nonzero.  And we've already
+                   incremented `p', by the way, to be the character after
+                   the `*'.  Do we have to do something analogous here
+                   for null bytes, because of RE_DOT_NOT_NULL?  */
+                if (TRANSLATE (*(p - 2)) == TRANSLATE ('.')
+		    && zero_times_ok
+                    && p < pend && TRANSLATE (*p) == TRANSLATE ('\n')
+                    && !(syntax & RE_DOT_NEWLINE))
+                  { /* We have .*\n.  */
+                    STORE_JUMP (jump, b, laststart);
+                    keep_string_p = true;
+                  }
+                else
+                  /* Anything else.  */
+                  STORE_JUMP (maybe_pop_jump, b, laststart - 3);
+
+                /* We've added more stuff to the buffer.  */
+                b += 3;
+              }
+
+            /* On failure, jump from laststart to b + 3, which will be the
+               end of the buffer after this jump is inserted.  */
+            GET_BUFFER_SPACE (3);
+            INSERT_JUMP (keep_string_p ? on_failure_keep_string_jump
+                                       : on_failure_jump,
+                         laststart, b + 3);
+            pending_exact = 0;
+            b += 3;
+
+            if (!zero_times_ok)
+              {
+                /* At least one repetition is required, so insert a
+                   `dummy_failure_jump' before the initial
+                   `on_failure_jump' instruction of the loop. This
+                   effects a skip over that instruction the first time
+                   we hit that loop.  */
+                GET_BUFFER_SPACE (3);
+                INSERT_JUMP (dummy_failure_jump, laststart, laststart + 6);
+                b += 3;
+              }
+            }
+	  break;
+
+
+	case '.':
+          laststart = b;
+          BUF_PUSH (anychar);
+          break;
+
+
+        case '[':
+          {
+            boolean had_char_class = false;
+
+            if (p == pend) return REG_EBRACK;
+
+            /* Ensure that we have enough space to push a charset: the
+               opcode, the length count, and the bitset; 34 bytes in all.  */
+	    GET_BUFFER_SPACE (34);
+
+            laststart = b;
+
+            /* We test `*p == '^' twice, instead of using an if
+               statement, so we only need one BUF_PUSH.  */
+            BUF_PUSH (*p == '^' ? charset_not : charset); 
+            if (*p == '^')
+              p++;
+
+            /* Remember the first position in the bracket expression.  */
+            p1 = p;
+
+            /* Push the number of bytes in the bitmap.  */
+            BUF_PUSH ((1 << BYTEWIDTH) / BYTEWIDTH);
+
+            /* Clear the whole map.  */
+            bzero (b, (1 << BYTEWIDTH) / BYTEWIDTH);
+
+            /* charset_not matches newline according to a syntax bit.  */
+            if ((re_opcode_t) b[-2] == charset_not
+                && (syntax & RE_HAT_LISTS_NOT_NEWLINE))
+              SET_LIST_BIT ('\n');
+
+            /* Read in characters and ranges, setting map bits.  */
+            for (;;)
+              {
+                if (p == pend) return REG_EBRACK;
+
+                PATFETCH (c);
+
+                /* \ might escape characters inside [...] and [^...].  */
+                if ((syntax & RE_BACKSLASH_ESCAPE_IN_LISTS) && c == '\\')
+                  {
+                    if (p == pend) return REG_EESCAPE;
+
+                    PATFETCH (c1);
+                    SET_LIST_BIT (c1);
+                    continue;
+                  }
+
+                /* Could be the end of the bracket expression.  If it's
+                   not (i.e., when the bracket expression is `[]' so
+                   far), the ']' character bit gets set way below.  */
+                if (c == ']' && p != p1 + 1)
+                  break;
+
+                /* Look ahead to see if it's a range when the last thing
+                   was a character class.  */
+                if (had_char_class && c == '-' && *p != ']')
+                  return REG_ERANGE;
+
+                /* Look ahead to see if it's a range when the last thing
+                   was a character: if this is a hyphen not at the
+                   beginning or the end of a list, then it's the range
+                   operator.  */
+                if (c == '-' 
+                    && !(p - 2 >= pattern && p[-2] == '[') 
+                    && !(p - 3 >= pattern && p[-3] == '[' && p[-2] == '^')
+                    && *p != ']')
+                  {
+                    reg_errcode_t ret
+                      = compile_range (&p, pend, translate, syntax, b);
+                    if (ret != REG_NOERROR) return ret;
+                  }
+
+                else if (p[0] == '-' && p[1] != ']')
+                  { /* This handles ranges made up of characters only.  */
+                    reg_errcode_t ret;
+
+		    /* Move past the `-'.  */
+                    PATFETCH (c1);
+                    
+                    ret = compile_range (&p, pend, translate, syntax, b);
+                    if (ret != REG_NOERROR) return ret;
+                  }
+
+                /* See if we're at the beginning of a possible character
+                   class.  */
+
+                else if (syntax & RE_CHAR_CLASSES && c == '[' && *p == ':')
+                  { /* Leave room for the null.  */
+                    char str[CHAR_CLASS_MAX_LENGTH + 1];
+
+                    PATFETCH (c);
+                    c1 = 0;
+
+                    /* If pattern is `[[:'.  */
+                    if (p == pend) return REG_EBRACK;
+
+                    for (;;)
+                      {
+                        PATFETCH (c);
+                        if (c == ':' || c == ']' || p == pend
+                            || c1 == CHAR_CLASS_MAX_LENGTH)
+                          break;
+                        str[c1++] = c;
+                      }
+                    str[c1] = '\0';
+
+                    /* If isn't a word bracketed by `[:' and:`]':
+                       undo the ending character, the letters, and leave 
+                       the leading `:' and `[' (but set bits for them).  */
+                    if (c == ':' && *p == ']')
+                      {
+                        int ch;
+                        boolean is_alnum = STREQ (str, "alnum");
+                        boolean is_alpha = STREQ (str, "alpha");
+                        boolean is_blank = STREQ (str, "blank");
+                        boolean is_cntrl = STREQ (str, "cntrl");
+                        boolean is_digit = STREQ (str, "digit");
+                        boolean is_graph = STREQ (str, "graph");
+                        boolean is_lower = STREQ (str, "lower");
+                        boolean is_print = STREQ (str, "print");
+                        boolean is_punct = STREQ (str, "punct");
+                        boolean is_space = STREQ (str, "space");
+                        boolean is_upper = STREQ (str, "upper");
+                        boolean is_xdigit = STREQ (str, "xdigit");
+                        
+                        if (!IS_CHAR_CLASS (str)) return REG_ECTYPE;
+
+                        /* Throw away the ] at the end of the character
+                           class.  */
+                        PATFETCH (c);					
+
+                        if (p == pend) return REG_EBRACK;
+
+                        for (ch = 0; ch < 1 << BYTEWIDTH; ch++)
+                          {
+                            if (   (is_alnum  && ISALNUM (ch))
+                                || (is_alpha  && ISALPHA (ch))
+                                || (is_blank  && ISBLANK (ch))
+                                || (is_cntrl  && ISCNTRL (ch))
+                                || (is_digit  && ISDIGIT (ch))
+                                || (is_graph  && ISGRAPH (ch))
+                                || (is_lower  && ISLOWER (ch))
+                                || (is_print  && ISPRINT (ch))
+                                || (is_punct  && ISPUNCT (ch))
+                                || (is_space  && ISSPACE (ch))
+                                || (is_upper  && ISUPPER (ch))
+                                || (is_xdigit && ISXDIGIT (ch)))
+                            SET_LIST_BIT (ch);
+                          }
+                        had_char_class = true;
+                      }
+                    else
+                      {
+                        c1++;
+                        while (c1--)    
+                          PATUNFETCH;
+                        SET_LIST_BIT ('[');
+                        SET_LIST_BIT (':');
+                        had_char_class = false;
+                      }
+                  }
+                else
+                  {
+                    had_char_class = false;
+                    SET_LIST_BIT (c);
+                  }
+              }
+
+            /* Discard any (non)matching list bytes that are all 0 at the
+               end of the map.  Decrease the map-length byte too.  */
+            while ((int) b[-1] > 0 && b[b[-1] - 1] == 0) 
+              b[-1]--; 
+            b += b[-1];
+          }
+          break;
+
+
+	case '(':
+          if (syntax & RE_NO_BK_PARENS)
+            goto handle_open;
+          else
+            goto normal_char;
+
+
+        case ')':
+          if (syntax & RE_NO_BK_PARENS)
+            goto handle_close;
+          else
+            goto normal_char;
+
+
+        case '\n':
+          if (syntax & RE_NEWLINE_ALT)
+            goto handle_alt;
+          else
+            goto normal_char;
+
+
+	case '|':
+          if (syntax & RE_NO_BK_VBAR)
+            goto handle_alt;
+          else
+            goto normal_char;
+
+
+        case '{':
+           if (syntax & RE_INTERVALS && syntax & RE_NO_BK_BRACES)
+             goto handle_interval;
+           else
+             goto normal_char;
+
+
+        case '\\':
+          if (p == pend) return REG_EESCAPE;
+
+          /* Do not translate the character after the \, so that we can
+             distinguish, e.g., \B from \b, even if we normally would
+             translate, e.g., B to b.  */
+          PATFETCH_RAW (c);
+
+          switch (c)
+            {
+            case '(':
+              if (syntax & RE_NO_BK_PARENS)
+                goto normal_backslash;
+
+            handle_open:
+              bufp->re_nsub++;
+              regnum++;
+
+              if (COMPILE_STACK_FULL)
+                { 
+                  RETALLOC (compile_stack.stack, compile_stack.size << 1,
+                            compile_stack_elt_t);
+                  if (compile_stack.stack == NULL) return REG_ESPACE;
+
+                  compile_stack.size <<= 1;
+                }
+
+              /* These are the values to restore when we hit end of this
+                 group.  They are all relative offsets, so that if the
+                 whole pattern moves because of realloc, they will still
+                 be valid.  */
+              COMPILE_STACK_TOP.begalt_offset = begalt - bufp->buffer;
+              COMPILE_STACK_TOP.fixup_alt_jump 
+                = fixup_alt_jump ? fixup_alt_jump - bufp->buffer + 1 : 0;
+              COMPILE_STACK_TOP.laststart_offset = b - bufp->buffer;
+              COMPILE_STACK_TOP.regnum = regnum;
+
+              /* We will eventually replace the 0 with the number of
+                 groups inner to this one.  But do not push a
+                 start_memory for groups beyond the last one we can
+                 represent in the compiled pattern.  */
+              if (regnum <= MAX_REGNUM)
+                {
+                  COMPILE_STACK_TOP.inner_group_offset = b - bufp->buffer + 2;
+                  BUF_PUSH_3 (start_memory, regnum, 0);
+                }
+                
+              compile_stack.avail++;
+
+              fixup_alt_jump = 0;
+              laststart = 0;
+              begalt = b;
+	      /* If we've reached MAX_REGNUM groups, then this open
+		 won't actually generate any code, so we'll have to
+		 clear pending_exact explicitly.  */
+	      pending_exact = 0;
+              break;
+
+
+            case ')':
+              if (syntax & RE_NO_BK_PARENS) goto normal_backslash;
+
+              if (COMPILE_STACK_EMPTY)
+                if (syntax & RE_UNMATCHED_RIGHT_PAREN_ORD)
+                  goto normal_backslash;
+                else
+                  return REG_ERPAREN;
+
+            handle_close:
+              if (fixup_alt_jump)
+                { /* Push a dummy failure point at the end of the
+                     alternative for a possible future
+                     `pop_failure_jump' to pop.  See comments at
+                     `push_dummy_failure' in `re_match_2'.  */
+                  BUF_PUSH (push_dummy_failure);
+                  
+                  /* We allocated space for this jump when we assigned
+                     to `fixup_alt_jump', in the `handle_alt' case below.  */
+                  STORE_JUMP (jump_past_alt, fixup_alt_jump, b - 1);
+                }
+
+              /* See similar code for backslashed left paren above.  */
+              if (COMPILE_STACK_EMPTY)
+                if (syntax & RE_UNMATCHED_RIGHT_PAREN_ORD)
+                  goto normal_char;
+                else
+                  return REG_ERPAREN;
+
+              /* Since we just checked for an empty stack above, this
+                 ``can't happen''.  */
+              assert (compile_stack.avail != 0);
+              {
+                /* We don't just want to restore into `regnum', because
+                   later groups should continue to be numbered higher,
+                   as in `(ab)c(de)' -- the second group is #2.  */
+                regnum_t this_group_regnum;
+
+                compile_stack.avail--;		
+                begalt = bufp->buffer + COMPILE_STACK_TOP.begalt_offset;
+                fixup_alt_jump
+                  = COMPILE_STACK_TOP.fixup_alt_jump
+                    ? bufp->buffer + COMPILE_STACK_TOP.fixup_alt_jump - 1 
+                    : 0;
+                laststart = bufp->buffer + COMPILE_STACK_TOP.laststart_offset;
+                this_group_regnum = COMPILE_STACK_TOP.regnum;
+		/* If we've reached MAX_REGNUM groups, then this open
+		   won't actually generate any code, so we'll have to
+		   clear pending_exact explicitly.  */
+		pending_exact = 0;
+
+                /* We're at the end of the group, so now we know how many
+                   groups were inside this one.  */
+                if (this_group_regnum <= MAX_REGNUM)
+                  {
+                    unsigned char *inner_group_loc
+                      = bufp->buffer + COMPILE_STACK_TOP.inner_group_offset;
+
+                    *inner_group_loc = (unsigned char)
+                        (regnum - this_group_regnum);
+                    BUF_PUSH_3 (stop_memory, this_group_regnum,
+                                regnum - this_group_regnum);
+                  }
+              }
+              break;
+
+
+            case '|':					/* `\|'.  */
+              if (syntax & RE_LIMITED_OPS || syntax & RE_NO_BK_VBAR)
+                goto normal_backslash;
+            handle_alt:
+              if (syntax & RE_LIMITED_OPS)
+                goto normal_char;
+
+              /* Insert before the previous alternative a jump which
+                 jumps to this alternative if the former fails.  */
+              GET_BUFFER_SPACE (3);
+              INSERT_JUMP (on_failure_jump, begalt, b + 6);
+              pending_exact = 0;
+              b += 3;
+
+              /* The alternative before this one has a jump after it
+                 which gets executed if it gets matched.  Adjust that
+                 jump so it will jump to this alternative's analogous
+                 jump (put in below, which in turn will jump to the next
+                 (if any) alternative's such jump, etc.).  The last such
+                 jump jumps to the correct final destination.  A picture:
+                          _____ _____ 
+                          |   | |   |   
+                          |   v |   v 
+                         a | b   | c   
+
+                 If we are at `b', then fixup_alt_jump right now points to a
+                 three-byte space after `a'.  We'll put in the jump, set
+                 fixup_alt_jump to right after `b', and leave behind three
+                 bytes which we'll fill in when we get to after `c'.  */
+
+              if (fixup_alt_jump)
+                STORE_JUMP (jump_past_alt, fixup_alt_jump, b);
+
+              /* Mark and leave space for a jump after this alternative,
+                 to be filled in later either by next alternative or
+                 when know we're at the end of a series of alternatives.  */
+              fixup_alt_jump = b;
+              GET_BUFFER_SPACE (3);
+              b += 3;
+
+              laststart = 0;
+              begalt = b;
+              break;
+
+
+            case '{': 
+              /* If \{ is a literal.  */
+              if (!(syntax & RE_INTERVALS)
+                     /* If we're at `\{' and it's not the open-interval 
+                        operator.  */
+                  || ((syntax & RE_INTERVALS) && (syntax & RE_NO_BK_BRACES))
+                  || (p - 2 == pattern  &&  p == pend))
+                goto normal_backslash;
+
+            handle_interval:
+              {
+                /* If got here, then the syntax allows intervals.  */
+
+                /* At least (most) this many matches must be made.  */
+                int lower_bound = -1, upper_bound = -1;
+
+                beg_interval = p - 1;
+
+                if (p == pend)
+                  {
+                    if (syntax & RE_NO_BK_BRACES)
+                      goto unfetch_interval;
+                    else
+                      return REG_EBRACE;
+                  }
+
+                GET_UNSIGNED_NUMBER (lower_bound);
+
+                if (c == ',')
+                  {
+                    GET_UNSIGNED_NUMBER (upper_bound);
+                    if (upper_bound < 0) upper_bound = RE_DUP_MAX;
+                  }
+                else
+                  /* Interval such as `{1}' => match exactly once. */
+                  upper_bound = lower_bound;
+
+                if (lower_bound < 0 || upper_bound > RE_DUP_MAX
+                    || lower_bound > upper_bound)
+                  {
+                    if (syntax & RE_NO_BK_BRACES)
+                      goto unfetch_interval;
+                    else 
+                      return REG_BADBR;
+                  }
+
+                if (!(syntax & RE_NO_BK_BRACES)) 
+                  {
+                    if (c != '\\') return REG_EBRACE;
+
+                    PATFETCH (c);
+                  }
+
+                if (c != '}')
+                  {
+                    if (syntax & RE_NO_BK_BRACES)
+                      goto unfetch_interval;
+                    else 
+                      return REG_BADBR;
+                  }
+
+                /* We just parsed a valid interval.  */
+
+                /* If it's invalid to have no preceding re.  */
+                if (!laststart)
+                  {
+                    if (syntax & RE_CONTEXT_INVALID_OPS)
+                      return REG_BADRPT;
+                    else if (syntax & RE_CONTEXT_INDEP_OPS)
+                      laststart = b;
+                    else
+                      goto unfetch_interval;
+                  }
+
+                /* If the upper bound is zero, don't want to succeed at
+                   all; jump from `laststart' to `b + 3', which will be
+                   the end of the buffer after we insert the jump.  */
+                 if (upper_bound == 0)
+                   {
+                     GET_BUFFER_SPACE (3);
+                     INSERT_JUMP (jump, laststart, b + 3);
+                     b += 3;
+                   }
+
+                 /* Otherwise, we have a nontrivial interval.  When
+                    we're all done, the pattern will look like:
+                      set_number_at <jump count> <upper bound>
+                      set_number_at <succeed_n count> <lower bound>
+                      succeed_n <after jump addr> <succed_n count>
+                      <body of loop>
+                      jump_n <succeed_n addr> <jump count>
+                    (The upper bound and `jump_n' are omitted if
+                    `upper_bound' is 1, though.)  */
+                 else 
+                   { /* If the upper bound is > 1, we need to insert
+                        more at the end of the loop.  */
+                     unsigned nbytes = 10 + (upper_bound > 1) * 10;
+
+                     GET_BUFFER_SPACE (nbytes);
+
+                     /* Initialize lower bound of the `succeed_n', even
+                        though it will be set during matching by its
+                        attendant `set_number_at' (inserted next),
+                        because `re_compile_fastmap' needs to know.
+                        Jump to the `jump_n' we might insert below.  */
+                     INSERT_JUMP2 (succeed_n, laststart,
+                                   b + 5 + (upper_bound > 1) * 5,
+                                   lower_bound);
+                     b += 5;
+
+                     /* Code to initialize the lower bound.  Insert 
+                        before the `succeed_n'.  The `5' is the last two
+                        bytes of this `set_number_at', plus 3 bytes of
+                        the following `succeed_n'.  */
+                     insert_op2 (set_number_at, laststart, 5, lower_bound, b);
+                     b += 5;
+
+                     if (upper_bound > 1)
+                       { /* More than one repetition is allowed, so
+                            append a backward jump to the `succeed_n'
+                            that starts this interval.
+                            
+                            When we've reached this during matching,
+                            we'll have matched the interval once, so
+                            jump back only `upper_bound - 1' times.  */
+                         STORE_JUMP2 (jump_n, b, laststart + 5,
+                                      upper_bound - 1);
+                         b += 5;
+
+                         /* The location we want to set is the second
+                            parameter of the `jump_n'; that is `b-2' as
+                            an absolute address.  `laststart' will be
+                            the `set_number_at' we're about to insert;
+                            `laststart+3' the number to set, the source
+                            for the relative address.  But we are
+                            inserting into the middle of the pattern --
+                            so everything is getting moved up by 5.
+                            Conclusion: (b - 2) - (laststart + 3) + 5,
+                            i.e., b - laststart.
+                            
+                            We insert this at the beginning of the loop
+                            so that if we fail during matching, we'll
+                            reinitialize the bounds.  */
+                         insert_op2 (set_number_at, laststart, b - laststart,
+                                     upper_bound - 1, b);
+                         b += 5;
+                       }
+                   }
+                pending_exact = 0;
+                beg_interval = NULL;
+              }
+              break;
+
+            unfetch_interval:
+              /* If an invalid interval, match the characters as literals.  */
+               assert (beg_interval);
+               p = beg_interval;
+               beg_interval = NULL;
+
+               /* normal_char and normal_backslash need `c'.  */
+               PATFETCH (c);	
+
+               if (!(syntax & RE_NO_BK_BRACES))
+                 {
+                   if (p > pattern  &&  p[-1] == '\\')
+                     goto normal_backslash;
+                 }
+               goto normal_char;
+
+#ifdef emacs
+            /* There is no way to specify the before_dot and after_dot
+               operators.  rms says this is ok.  --karl  */
+            case '=':
+              BUF_PUSH (at_dot);
+              break;
+
+            case 's':	
+              laststart = b;
+              PATFETCH (c);
+              BUF_PUSH_2 (syntaxspec, syntax_spec_code[c]);
+              break;
+
+            case 'S':
+              laststart = b;
+              PATFETCH (c);
+              BUF_PUSH_2 (notsyntaxspec, syntax_spec_code[c]);
+              break;
+#endif /* emacs */
+
+
+            case 'w':
+              laststart = b;
+              BUF_PUSH (wordchar);
+              break;
+
+
+            case 'W':
+              laststart = b;
+              BUF_PUSH (notwordchar);
+              break;
+
+
+            case '<':
+              BUF_PUSH (wordbeg);
+              break;
+
+            case '>':
+              BUF_PUSH (wordend);
+              break;
+
+            case 'b':
+              BUF_PUSH (wordbound);
+              break;
+
+            case 'B':
+              BUF_PUSH (notwordbound);
+              break;
+
+            case '`':
+              BUF_PUSH (begbuf);
+              break;
+
+            case '\'':
+              BUF_PUSH (endbuf);
+              break;
+
+            case '1': case '2': case '3': case '4': case '5':
+            case '6': case '7': case '8': case '9':
+              if (syntax & RE_NO_BK_REFS)
+                goto normal_char;
+
+              c1 = c - '0';
+
+              if (c1 > regnum)
+                return REG_ESUBREG;
+
+              /* Can't back reference to a subexpression if inside of it.  */
+              if (group_in_compile_stack( &compile_stack, c1))
+                goto normal_char;
+
+              laststart = b;
+              BUF_PUSH_2 (duplicate, c1);
+              break;
+
+
+            case '+':
+            case '?':
+              if (syntax & RE_BK_PLUS_QM)
+                goto handle_plus;
+              else
+                goto normal_backslash;
+
+            default:
+            normal_backslash:
+              /* You might think it would be useful for \ to mean
+                 not to translate; but if we don't translate it,
+                 it will never match anything.  */
+              c = TRANSLATE (c);
+              goto normal_char;
+            }
+          break;
+
+
+	default:
+        /* Expects the character in `c'.  */
+	normal_char:
+	      /* If no exactn currently being built.  */
+          if (!pending_exact 
+
+              /* If last exactn not at current position.  */
+              || pending_exact + *pending_exact + 1 != b
+              
+              /* We have only one byte following the exactn for the count.  */
+	      || *pending_exact == (1 << BYTEWIDTH) - 1
+
+              /* If followed by a repetition operator.  */
+              || *p == '*' || *p == '^'
+	      || ((syntax & RE_BK_PLUS_QM)
+		  ? *p == '\\' && (p[1] == '+' || p[1] == '?')
+		  : (*p == '+' || *p == '?'))
+	      || ((syntax & RE_INTERVALS)
+                  && ((syntax & RE_NO_BK_BRACES)
+		      ? *p == '{'
+                      : (p[0] == '\\' && p[1] == '{'))))
+	    {
+	      /* Start building a new exactn.  */
+              
+              laststart = b;
+
+	      BUF_PUSH_2 (exactn, 0);
+	      pending_exact = b - 1;
+            }
+            
+	  BUF_PUSH (c);
+          (*pending_exact)++;
+	  break;
+        } /* switch (c) */
+    } /* while p != pend */
+
+  
+  /* Through the pattern now.  */
+  
+  if (fixup_alt_jump)
+    STORE_JUMP (jump_past_alt, fixup_alt_jump, b);
+
+  if (!COMPILE_STACK_EMPTY) 
+    return REG_EPAREN;
+
+  free (compile_stack.stack);
+
+  /* We have succeeded; set the length of the buffer.  */
+  bufp->used = b - bufp->buffer;
+
+#ifdef DEBUG
+  if (debug)
+    {
+      DEBUG_PRINT1 ("\nCompiled pattern: ");
+      print_compiled_pattern (bufp);
+    }
+#endif /* DEBUG */
+
+  return REG_NOERROR;
+} /* regex_compile */
+
+/* Subroutines for `regex_compile'.  */
+
+/* Store OP at LOC followed by two-byte integer parameter ARG.  */
+
+static void
+store_op1 (op, loc, arg)
+    re_opcode_t op;
+    unsigned char *loc;
+    int arg;
+{
+  *loc = (unsigned char) op;
+  STORE_NUMBER (loc + 1, arg);
+}
+
+
+/* Like `store_op1', but for two two-byte parameters ARG1 and ARG2.  */
+
+static void
+store_op2 (op, loc, arg1, arg2)
+    re_opcode_t op;
+    unsigned char *loc;
+    int arg1, arg2;
+{
+  *loc = (unsigned char) op;
+  STORE_NUMBER (loc + 1, arg1);
+  STORE_NUMBER (loc + 3, arg2);
+}
+
+
+/* Copy the bytes from LOC to END to open up three bytes of space at LOC
+   for OP followed by two-byte integer parameter ARG.  */
+
+static void
+insert_op1 (op, loc, arg, end)
+    re_opcode_t op;
+    unsigned char *loc;
+    int arg;
+    unsigned char *end;    
+{
+  register unsigned char *pfrom = end;
+  register unsigned char *pto = end + 3;
+
+  while (pfrom != loc)
+    *--pto = *--pfrom;
+    
+  store_op1 (op, loc, arg);
+}
+
+
+/* Like `insert_op1', but for two two-byte parameters ARG1 and ARG2.  */
+
+static void
+insert_op2 (op, loc, arg1, arg2, end)
+    re_opcode_t op;
+    unsigned char *loc;
+    int arg1, arg2;
+    unsigned char *end;    
+{
+  register unsigned char *pfrom = end;
+  register unsigned char *pto = end + 5;
+
+  while (pfrom != loc)
+    *--pto = *--pfrom;
+    
+  store_op2 (op, loc, arg1, arg2);
+}
+
+
+/* P points to just after a ^ in PATTERN.  Return true if that ^ comes
+   after an alternative or a begin-subexpression.  We assume there is at
+   least one character before the ^.  */
+
+static boolean
+at_begline_loc_p (pattern, p, syntax)
+    const char *pattern, *p;
+    reg_syntax_t syntax;
+{
+  const char *prev = p - 2;
+# define prev_prev_backslash(p)  (((p) > pattern) && ((p)[-1] == '\\'))
+
+  switch (*prev) {
+  case '(':
+      return (boolean)(
+          prev_prev_backslash(prev) || ((syntax & RE_NO_BK_PARENS) != 0));
+
+  case '|':
+      return (boolean)(
+          prev_prev_backslash(prev) || ((syntax & RE_NO_BK_VBAR) != 0));
+  }
+  return false;
+}
+
+
+/* The dual of at_begline_loc_p.  This one is for $.  We assume there is
+   at least one character after the $, i.e., `P < PEND'.  */
+
+static boolean
+at_endline_loc_p (p, pend, syntax)
+    const char *p, *pend;
+    int syntax;
+{
+  const char *next = p;
+  boolean next_backslash = *next == '\\';
+  const char *next_next = p + 1 < pend ? p + 1 : NULL;
+#ifdef __TANDEM
+# pragma NOWARN( 85 )
+#endif
+  return
+       /* Before a subexpression?  */
+       (syntax & RE_NO_BK_PARENS ? *next == ')'
+        : next_backslash && next_next && *next_next == ')')
+       /* Before an alternative?  */
+    || (syntax & RE_NO_BK_VBAR ? *next == '|'
+        : next_backslash && next_next && *next_next == '|');
+}
+#ifdef __TANDEM
+# pragma WARN( 85 )
+#endif
+
+
+/* Returns true if REGNUM is in one of COMPILE_STACK's elements and 
+   false if it's not.  */
+static boolean
+group_in_compile_stack( compile_stack_type*   compile_stack,
+                        regnum_t              regnum )
+{
+  int this_element;
+
+  for (this_element = compile_stack->avail - 1;  
+       this_element >= 0; 
+       this_element--)
+    if (compile_stack->stack[this_element].regnum == regnum)
+      return true;
+
+  return false;
+}
+#undef CS
+
+/* Read the ending character of a range (in a bracket expression) from the
+   uncompiled pattern *P_PTR (which ends at PEND).  We assume the
+   starting character is in `P[-2]'.  (`P[-1]' is the character `-'.)
+   Then we set the translation of all bits between the starting and
+   ending characters (inclusive) in the compiled pattern B.
+   
+   Return an error code.
+   
+   We use these short variable names so we can use the same macros as
+   `regex_compile' itself.  */
+
+static reg_errcode_t
+compile_range (p_ptr, pend, translate, syntax, b)
+    const char **p_ptr, *pend;
+    char *translate;
+    reg_syntax_t syntax;
+    unsigned char *b;
+{
+  unsigned this_char;
+
+  const char *p = *p_ptr;
+  int range_start, range_end;
+  
+  if (p == pend)
+    return REG_ERANGE;
+
+  /* Even though the pattern is a signed `char *', we need to fetch
+     with unsigned char *'s; if the high bit of the pattern character
+     is set, the range endpoints will be negative if we fetch using a
+     signed char *.
+
+     We also want to fetch the endpoints without translating them; the 
+     appropriate translation is done in the bit-setting loop below.  */
+  range_start = ((unsigned char *) p)[-2];
+  range_end   = ((unsigned char *) p)[0];
+
+  /* Have to increment the pointer into the pattern string, so the
+     caller isn't still at the ending character.  */
+  (*p_ptr)++;
+
+  /* If the start is after the end, the range is empty.  */
+  if (range_start > range_end)
+    return syntax & RE_NO_EMPTY_RANGES ? REG_ERANGE : REG_NOERROR;
+
+  /* Here we see why `this_char' has to be larger than an `unsigned
+     char' -- the range is inclusive, so if `range_end' == 0xff
+     (assuming 8-bit characters), we would otherwise go into an infinite
+     loop, since all characters <= 0xff.  */
+  for (this_char = range_start; this_char <= range_end; this_char++)
+    {
+      SET_LIST_BIT (TRANSLATE (this_char));
+    }
+  
+  return REG_NOERROR;
+}
+
+/* Failure stack declarations and macros; both re_compile_fastmap and
+   re_match_2 use a failure stack.  These have to be macros because of
+   REGEX_ALLOCATE.  */
+   
+
+/* Number of failure points for which to initially allocate space
+   when matching.  If this number is exceeded, we allocate more
+   space, so it is not a hard limit.  */
+#ifndef INIT_FAILURE_ALLOC
+#define INIT_FAILURE_ALLOC 5
+#endif
+
+/* Roughly the maximum number of failure points on the stack.  Would be
+   exactly that if always used MAX_FAILURE_SPACE each time we failed.
+   This is a variable only so users of regex can assign to it; we never
+   change it ourselves.  */
+int re_max_failures = 2000;
+
+typedef const unsigned char *fail_stack_elt_t;
+
+typedef struct
+{
+  fail_stack_elt_t *stack;
+  unsigned size;
+  unsigned avail;			/* Offset of next open position.  */
+} fail_stack_type;
+
+#define FAIL_STACK_EMPTY()     (fail_stack.avail == 0)
+#define FAIL_STACK_PTR_EMPTY() (fail_stack_ptr->avail == 0)
+#define FAIL_STACK_FULL()      (fail_stack.avail == fail_stack.size)
+#define FAIL_STACK_TOP()       (fail_stack.stack[fail_stack.avail])
+
+
+/* Initialize `fail_stack'.  Do `return -2' if the alloc fails.  */
+
+#define INIT_FAIL_STACK()						\
+  do {									\
+    fail_stack.stack = (fail_stack_elt_t *)				\
+      REGEX_ALLOCATE (INIT_FAILURE_ALLOC * sizeof (fail_stack_elt_t));	\
+									\
+    if (fail_stack.stack == NULL)					\
+      return -2;							\
+									\
+    fail_stack.size = INIT_FAILURE_ALLOC;				\
+    fail_stack.avail = 0;						\
+  } while (0)
+
+
+/* Double the size of FAIL_STACK, up to approximately `re_max_failures' items.
+
+   Return 1 if succeeds, and 0 if either ran out of memory
+   allocating space for it or it was already too large.  
+   
+   REGEX_REALLOCATE requires `destination' be declared.   */
+
+#define DOUBLE_FAIL_STACK(fail_stack)					\
+  ((fail_stack).size > re_max_failures * MAX_FAILURE_ITEMS		\
+   ? 0									\
+   : ((fail_stack).stack = (fail_stack_elt_t *)				\
+        REGEX_REALLOCATE ((fail_stack).stack, 				\
+          (fail_stack).size * sizeof (fail_stack_elt_t),		\
+          ((fail_stack).size << 1) * sizeof (fail_stack_elt_t)),	\
+									\
+      (fail_stack).stack == NULL					\
+      ? 0								\
+      : ((fail_stack).size <<= 1, 					\
+         1)))
+
+
+/* Push PATTERN_OP on FAIL_STACK. 
+
+   Return 1 if was able to do so and 0 if ran out of memory allocating
+   space to do so.  */
+#define PUSH_PATTERN_OP(pattern_op, fail_stack)				\
+  ((FAIL_STACK_FULL ()							\
+    && !DOUBLE_FAIL_STACK (fail_stack))					\
+    ? 0									\
+    : ((fail_stack).stack[(fail_stack).avail++] = pattern_op,		\
+       1))
+
+/* This pushes an item onto the failure stack.  Must be a four-byte
+   value.  Assumes the variable `fail_stack'.  Probably should only
+   be called from within `PUSH_FAILURE_POINT'.  */
+#define PUSH_FAILURE_ITEM(item)						\
+  fail_stack.stack[fail_stack.avail++] = (fail_stack_elt_t) item
+
+/* The complement operation.  Assumes `fail_stack' is nonempty.  */
+#define POP_FAILURE_ITEM() fail_stack.stack[--fail_stack.avail]
+
+/* Used to omit pushing failure point id's when we're not debugging.  */
+#ifdef DEBUG
+#define DEBUG_PUSH PUSH_FAILURE_ITEM
+#define DEBUG_POP(item_addr) *(item_addr) = POP_FAILURE_ITEM ()
+#else
+#define DEBUG_PUSH(item)
+#define DEBUG_POP(item_addr)
+#endif
+
+
+/* Push the information about the state we will need
+   if we ever fail back to it.  
+   
+   Requires variables fail_stack, regstart, regend, reg_info, and
+   num_regs be declared.  DOUBLE_FAIL_STACK requires `destination' be
+   declared.
+   
+   Does `return FAILURE_CODE' if runs out of memory.  */
+
+#define PUSH_FAILURE_POINT(pattern_place, string_place, failure_code)   \
+  do {                                                                  \
+    DESTINATION_DECL                                                    \
+    /* Must be int, so when we don't save any registers, the arithmetic \
+       of 0 + -1 isn't done as unsigned.  */                            \
+    int this_reg;                                                       \
+                                                                        \
+    DEBUG_STATEMENT (failure_id++);                                     \
+    DEBUG_STATEMENT (nfailure_points_pushed++);                         \
+    DEBUG_PRINT2 ("\nPUSH_FAILURE_POINT #%u:\n", failure_id);           \
+    DEBUG_PRINT2 ("  Before push, next avail: %d\n", (fail_stack).avail);\
+    DEBUG_PRINT2 ("                     size: %d\n", (fail_stack).size);\
+                                                                        \
+    DEBUG_PRINT2 ("  slots needed: %d\n", NUM_FAILURE_ITEMS);           \
+    DEBUG_PRINT2 ("     available: %d\n", REMAINING_AVAIL_SLOTS);       \
+                                                                        \
+    /* Ensure we have enough space allocated for what we will push.  */ \
+    while (REMAINING_AVAIL_SLOTS < NUM_FAILURE_ITEMS)                   \
+      {                                                                 \
+        if (!DOUBLE_FAIL_STACK (fail_stack))                    \
+          return failure_code;                                          \
+                                                                        \
+        DEBUG_PRINT2 ("\n  Doubled stack; size now: %d\n",              \
+                       (fail_stack).size);                              \
+        DEBUG_PRINT2 ("  slots available: %d\n", REMAINING_AVAIL_SLOTS);\
+      }                                                                 \
+                                                                        \
+    /* Push the info, starting with the registers.  */                  \
+    DEBUG_PRINT1 ("\n");                                                \
+                                                                        \
+    for (this_reg = lowest_active_reg; this_reg <= highest_active_reg;  \
+         this_reg++)                                                    \
+      {                                                                 \
+        DEBUG_PRINT2 ("  Pushing reg: %d\n", this_reg);                 \
+        DEBUG_STATEMENT (num_regs_pushed++);                            \
+                                                                        \
+        DEBUG_PRINT2 ("    start: 0x%x\n", regstart[this_reg]);         \
+        PUSH_FAILURE_ITEM (regstart[this_reg]);                         \
+                                                                        \
+        DEBUG_PRINT2 ("    end: 0x%x\n", regend[this_reg]);             \
+        PUSH_FAILURE_ITEM (regend[this_reg]);                           \
+                                                                        \
+        DEBUG_PRINT2 ("    info: 0x%x\n      ", reg_info[this_reg]);    \
+        DEBUG_PRINT2 (" match_null=%d",                                 \
+                      REG_MATCH_NULL_STRING_P (reg_info[this_reg]));    \
+        DEBUG_PRINT2 (" active=%d", IS_ACTIVE (reg_info[this_reg]));    \
+        DEBUG_PRINT2 (" matched_something=%d",                          \
+                      MATCHED_SOMETHING (reg_info[this_reg]));          \
+        DEBUG_PRINT2 (" ever_matched=%d",                               \
+                      EVER_MATCHED_SOMETHING (reg_info[this_reg]));     \
+        DEBUG_PRINT1 ("\n");                                            \
+        PUSH_FAILURE_ITEM (reg_info[this_reg].word);                    \
+      }                                                                 \
+                                                                        \
+    DEBUG_PRINT2 ("  Pushing  low active reg: %d\n", lowest_active_reg);\
+    PUSH_FAILURE_ITEM (lowest_active_reg);                              \
+                                                                        \
+    DEBUG_PRINT2 ("  Pushing high active reg: %d\n", highest_active_reg);\
+    PUSH_FAILURE_ITEM (highest_active_reg);                             \
+                                                                        \
+    DEBUG_PRINT2 ("  Pushing pattern 0x%x: ", pattern_place);           \
+    DEBUG_PRINT_COMPILED_PATTERN (bufp, pattern_place, pend);           \
+    PUSH_FAILURE_ITEM (pattern_place);                                  \
+                                                                        \
+    DEBUG_PRINT2 ("  Pushing string 0x%x: `", string_place);            \
+    DEBUG_PRINT_DOUBLE_STRING (string_place, string1, size1, string2,   \
+                                 size2);                                \
+    DEBUG_PRINT1 ("'\n");                                               \
+    PUSH_FAILURE_ITEM (string_place);                                   \
+                                                                        \
+    DEBUG_PRINT2 ("  Pushing failure id: %u\n", failure_id);            \
+    DEBUG_PUSH (failure_id);                                            \
+  } while (0)
+
+/* This is the number of items that are pushed and popped on the stack
+   for each register.  */
+#define NUM_REG_ITEMS  3
+
+/* Individual items aside from the registers.  */
+#ifdef DEBUG
+#define NUM_NONREG_ITEMS 5 /* Includes failure point id.  */
+#else
+#define NUM_NONREG_ITEMS 4
+#endif
+
+/* We push at most this many items on the stack.  */
+#define MAX_FAILURE_ITEMS ((num_regs - 1) * NUM_REG_ITEMS + NUM_NONREG_ITEMS)
+
+/* We actually push this many items.  */
+#define NUM_FAILURE_ITEMS						\
+  ((highest_active_reg - lowest_active_reg + 1) * NUM_REG_ITEMS 	\
+    + NUM_NONREG_ITEMS)
+
+/* How many items can still be added to the stack without overflowing it.  */
+#define REMAINING_AVAIL_SLOTS ((fail_stack).size - (fail_stack).avail)
+
+
+/* Pops what PUSH_FAIL_STACK pushes.
+
+   We restore into the parameters, all of which should be lvalues:
+     STR -- the saved data position.
+     PAT -- the saved pattern position.
+     LOW_REG, HIGH_REG -- the highest and lowest active registers.
+     REGSTART, REGEND -- arrays of string positions.
+     REG_INFO -- array of information about each subexpression.
+   
+   Also assumes the variables `fail_stack' and (if debugging), `bufp',
+   `pend', `string1', `size1', `string2', and `size2'.  */
+
+#define POP_FAILURE_POINT(str, pat, low_reg, high_reg, regstart, regend, reg_info)\
+{									\
+  DEBUG_STATEMENT (fail_stack_elt_t failure_id;)			\
+  int this_reg;								\
+  const unsigned char *string_temp;					\
+									\
+  assert (!FAIL_STACK_EMPTY ());					\
+									\
+  /* Remove failure points and point to how many regs pushed.  */	\
+  DEBUG_PRINT1 ("POP_FAILURE_POINT:\n");				\
+  DEBUG_PRINT2 ("  Before pop, next avail: %d\n", fail_stack.avail);	\
+  DEBUG_PRINT2 ("                    size: %d\n", fail_stack.size);	\
+									\
+  assert (fail_stack.avail >= NUM_NONREG_ITEMS);			\
+									\
+  DEBUG_POP (&failure_id);						\
+  DEBUG_PRINT2 ("  Popping failure id: %u\n", failure_id);		\
+									\
+  /* If the saved string location is NULL, it came from an		\
+     on_failure_keep_string_jump opcode, and we want to throw away the	\
+     saved NULL, thus retaining our current position in the string.  */	\
+  string_temp = POP_FAILURE_ITEM ();					\
+  if (string_temp != NULL)						\
+    str = (const char *) string_temp;					\
+									\
+  DEBUG_PRINT2 ("  Popping string 0x%x: `", str);			\
+  DEBUG_PRINT_DOUBLE_STRING (str, string1, size1, string2, size2);	\
+  DEBUG_PRINT1 ("'\n");							\
+									\
+  pat = (unsigned char *) POP_FAILURE_ITEM ();				\
+  DEBUG_PRINT2 ("  Popping pattern 0x%x: ", pat);			\
+  DEBUG_PRINT_COMPILED_PATTERN (bufp, pat, pend);			\
+									\
+  /* Restore register info.  */						\
+  high_reg = (unsigned) POP_FAILURE_ITEM ();				\
+  DEBUG_PRINT2 ("  Popping high active reg: %d\n", high_reg);		\
+									\
+  low_reg = (unsigned) POP_FAILURE_ITEM ();				\
+  DEBUG_PRINT2 ("  Popping  low active reg: %d\n", low_reg);		\
+									\
+  for (this_reg = high_reg; this_reg >= low_reg; this_reg--)		\
+    {									\
+      DEBUG_PRINT2 ("    Popping reg: %d\n", this_reg);			\
+									\
+      reg_info[this_reg].word = POP_FAILURE_ITEM ();			\
+      DEBUG_PRINT2 ("      info: 0x%x\n", reg_info[this_reg]);		\
+									\
+      regend[this_reg] = (const char *) POP_FAILURE_ITEM ();		\
+      DEBUG_PRINT2 ("      end: 0x%x\n", regend[this_reg]);		\
+									\
+      regstart[this_reg] = (const char *) POP_FAILURE_ITEM ();		\
+      DEBUG_PRINT2 ("      start: 0x%x\n", regstart[this_reg]);		\
+    }									\
+									\
+  DEBUG_STATEMENT (nfailure_points_popped++);				\
+} /* POP_FAILURE_POINT */
+
+/* re_compile_fastmap computes a ``fastmap'' for the compiled pattern in
+   BUFP.  A fastmap records which of the (1 << BYTEWIDTH) possible
+   characters can start a string that matches the pattern.  This fastmap
+   is used by re_search to skip quickly over impossible starting points.
+
+   The caller must supply the address of a (1 << BYTEWIDTH)-byte data
+   area as BUFP->fastmap.
+   
+   We set the `fastmap', `fastmap_accurate', and `can_be_null' fields in
+   the pattern buffer.
+
+   Returns 0 if we succeed, -2 if an internal error.   */
+
+int
+re_compile_fastmap (bufp)
+     struct re_pattern_buffer *bufp;
+{
+  int j, k;
+  fail_stack_type fail_stack;
+#ifndef REGEX_MALLOC
+  char *destination;
+#endif
+  /* We don't push any register information onto the failure stack.  */
+  unsigned num_regs = 0;
+  
+  register char *fastmap = bufp->fastmap;
+  unsigned char *pattern = bufp->buffer;
+  unsigned long size = bufp->used;
+  const unsigned char *p = pattern;
+  register unsigned char *pend = pattern + size;
+
+  /* Assume that each path through the pattern can be null until
+     proven otherwise.  We set this false at the bottom of switch
+     statement, to which we get only if a particular path doesn't
+     match the empty string.  */
+  boolean path_can_be_null = true;
+
+  /* We aren't doing a `succeed_n' to begin with.  */
+  boolean succeed_n_p = false;
+
+  assert (fastmap != NULL && p != NULL);
+  
+  INIT_FAIL_STACK ();
+  bzero (fastmap, 1 << BYTEWIDTH);  /* Assume nothing's valid.  */
+  bufp->fastmap_accurate = 1;	    /* It will be when we're done.  */
+  bufp->can_be_null = 0;
+      
+  while (p != pend || !FAIL_STACK_EMPTY ())
+    {
+      if (p == pend)
+        {
+          bufp->can_be_null |= path_can_be_null;
+          
+          /* Reset for next path.  */
+          path_can_be_null = true;
+          
+          p = fail_stack.stack[--fail_stack.avail];
+	}
+
+      /* We should never be about to go beyond the end of the pattern.  */
+      assert (p < pend);
+      
+#ifdef SWITCH_ENUM_BUG
+      switch ((int) ((re_opcode_t) *p++))
+#else
+      switch ((re_opcode_t) *p++)
+#endif
+	{
+
+        /* I guess the idea here is to simply not bother with a fastmap
+           if a backreference is used, since it's too hard to figure out
+           the fastmap for the corresponding group.  Setting
+           `can_be_null' stops `re_search_2' from using the fastmap, so
+           that is all we do.  */
+	case duplicate:
+	  bufp->can_be_null = 1;
+          return 0;
+
+
+      /* Following are the cases which match a character.  These end
+         with `break'.  */
+
+	case exactn:
+          fastmap[p[1]] = 1;
+	  break;
+
+
+        case charset:
+          for (j = *p++ * BYTEWIDTH - 1; j >= 0; j--)
+	    if (p[j / BYTEWIDTH] & (1 << (j % BYTEWIDTH)))
+              fastmap[j] = 1;
+	  break;
+
+
+	case charset_not:
+	  /* Chars beyond end of map must be allowed.  */
+	  for (j = *p * BYTEWIDTH; j < (1 << BYTEWIDTH); j++)
+            fastmap[j] = 1;
+
+	  for (j = *p++ * BYTEWIDTH - 1; j >= 0; j--)
+	    if (!(p[j / BYTEWIDTH] & (1 << (j % BYTEWIDTH))))
+              fastmap[j] = 1;
+          break;
+
+
+	case wordchar:
+	  for (j = 0; j < (1 << BYTEWIDTH); j++)
+	    if (SYNTAX (j) == Sword)
+	      fastmap[j] = 1;
+	  break;
+
+
+	case notwordchar:
+	  for (j = 0; j < (1 << BYTEWIDTH); j++)
+	    if (SYNTAX (j) != Sword)
+	      fastmap[j] = 1;
+	  break;
+
+
+        case anychar:
+          /* `.' matches anything ...  */
+	  for (j = 0; j < (1 << BYTEWIDTH); j++)
+            fastmap[j] = 1;
+
+          /* ... except perhaps newline.  */
+          if (!(bufp->syntax & RE_DOT_NEWLINE))
+            fastmap['\n'] = 0;
+
+          /* Return if we have already set `can_be_null'; if we have,
+             then the fastmap is irrelevant.  Something's wrong here.  */
+	  else if (bufp->can_be_null)
+	    return 0;
+
+          /* Otherwise, have to check alternative paths.  */
+	  break;
+
+
+#ifdef emacs
+        case syntaxspec:
+	  k = *p++;
+	  for (j = 0; j < (1 << BYTEWIDTH); j++)
+	    if (SYNTAX (j) == (enum syntaxcode) k)
+	      fastmap[j] = 1;
+	  break;
+
+
+	case notsyntaxspec:
+	  k = *p++;
+	  for (j = 0; j < (1 << BYTEWIDTH); j++)
+	    if (SYNTAX (j) != (enum syntaxcode) k)
+	      fastmap[j] = 1;
+	  break;
+
+
+      /* All cases after this match the empty string.  These end with
+         `continue'.  */
+
+
+	case before_dot:
+	case at_dot:
+	case after_dot:
+          continue;
+#endif /* not emacs */
+
+
+        case no_op:
+        case begline:
+        case endline:
+	case begbuf:
+	case endbuf:
+	case wordbound:
+	case notwordbound:
+	case wordbeg:
+	case wordend:
+        case push_dummy_failure:
+          continue;
+
+
+	case jump_n:
+        case pop_failure_jump:
+	case maybe_pop_jump:
+	case jump:
+        case jump_past_alt:
+	case dummy_failure_jump:
+          EXTRACT_NUMBER_AND_INCR (j, p);
+	  p += j;	
+	  if (j > 0)
+	    continue;
+            
+          /* Jump backward implies we just went through the body of a
+             loop and matched nothing.  Opcode jumped to should be
+             `on_failure_jump' or `succeed_n'.  Just treat it like an
+             ordinary jump.  For a * loop, it has pushed its failure
+             point already; if so, discard that as redundant.  */
+          if ((re_opcode_t) *p != on_failure_jump
+	      && (re_opcode_t) *p != succeed_n)
+	    continue;
+
+          p++;
+          EXTRACT_NUMBER_AND_INCR (j, p);
+          p += j;		
+	  
+          /* If what's on the stack is where we are now, pop it.  */
+          if (!FAIL_STACK_EMPTY () 
+	      && fail_stack.stack[fail_stack.avail - 1] == p)
+            fail_stack.avail--;
+
+          continue;
+
+
+        case on_failure_jump:
+        case on_failure_keep_string_jump:
+	handle_on_failure_jump:
+          EXTRACT_NUMBER_AND_INCR (j, p);
+
+          /* For some patterns, e.g., `(a?)?', `p+j' here points to the
+             end of the pattern.  We don't want to push such a point,
+             since when we restore it above, entering the switch will
+             increment `p' past the end of the pattern.  We don't need
+             to push such a point since we obviously won't find any more
+             fastmap entries beyond `pend'.  Such a pattern can match
+             the null string, though.  */
+          if (p + j < pend)
+            {
+                /*
+                 *  WARN 191: illegal pointer conversion
+                 *  between CONST and NON-CONST attribute
+                 */
+#             ifdef __TANDEM
+#               pragma NOWARN( 191 )
+#             endif
+              if (!PUSH_PATTERN_OP (p + j, fail_stack))
+                return -2;
+#             ifdef __TANDEM
+#               pragma WARN( 191 )
+#             endif
+            }
+          else
+            bufp->can_be_null = 1;
+
+          if (succeed_n_p)
+            {
+              EXTRACT_NUMBER_AND_INCR (k, p);	/* Skip the n.  */
+              succeed_n_p = false;
+	    }
+
+          continue;
+
+
+	case succeed_n:
+          /* Get to the number of times to succeed.  */
+          p += 2;		
+
+          /* Increment p past the n for when k != 0.  */
+          EXTRACT_NUMBER_AND_INCR (k, p);
+          if (k == 0)
+	    {
+              p -= 4;
+  	      succeed_n_p = true;  /* Spaghetti code alert.  */
+              goto handle_on_failure_jump;
+            }
+          continue;
+
+
+	case set_number_at:
+          p += 4;
+          continue;
+
+
+	case start_memory:
+        case stop_memory:
+	  p += 2;
+	  continue;
+
+
+	default:
+          abort (); /* We have listed all the cases.  */
+        } /* switch *p++ */
+
+      /* Getting here means we have found the possible starting
+         characters for one path of the pattern -- and that the empty
+         string does not match.  We need not follow this path further.
+         Instead, look at the next alternative (remembered on the
+         stack), or quit if no more.  The test at the top of the loop
+         does these things.  */
+      path_can_be_null = false;
+      p = pend;
+    } /* while p */
+
+  /* Set `can_be_null' for the last path (also the first path, if the
+     pattern is empty).  */
+  bufp->can_be_null |= path_can_be_null;
+  return 0;
+} /* re_compile_fastmap */
+
+/* Set REGS to hold NUM_REGS registers, storing them in STARTS and
+   ENDS.  Subsequent matches using PATTERN_BUFFER and REGS will use
+   this memory for recording register information.  STARTS and ENDS
+   must be allocated using the malloc library routine, and must each
+   be at least NUM_REGS * sizeof (regoff_t) bytes long.
+
+   If NUM_REGS == 0, then subsequent matches should allocate their own
+   register data.
+
+   Unless this function is called, the first search or match using
+   PATTERN_BUFFER will allocate its own register data, without
+   freeing the old data.  */
+
+void
+re_set_registers (bufp, regs, num_regs, starts, ends)
+    struct re_pattern_buffer *bufp;
+    struct re_registers *regs;
+    unsigned num_regs;
+    regoff_t *starts, *ends;
+{
+  if (num_regs)
+    {
+      bufp->regs_allocated = REGS_REALLOCATE;
+      regs->num_regs = num_regs;
+      regs->start = starts;
+      regs->end = ends;
+    }
+  else
+    {
+      bufp->regs_allocated = REGS_UNALLOCATED;
+      regs->num_regs = 0;
+      regs->start = regs->end = (regoff_t) 0;
+    }
+}
+
+/* Searching routines.  */
+
+/* Like re_search_2, below, but only one string is specified, and
+   doesn't let you say where to stop matching. */
+
+int
+re_search (bufp, string, size, startpos, range, regs)
+     struct re_pattern_buffer *bufp;
+     const char *string;
+     int size, startpos, range;
+     struct re_registers *regs;
+{
+  return re_search_2 (bufp, NULL, 0, string, size, startpos, range, 
+		      regs, size);
+}
+
+
+/* Using the compiled pattern in BUFP->buffer, first tries to match the
+   virtual concatenation of STRING1 and STRING2, starting first at index
+   STARTPOS, then at STARTPOS + 1, and so on.
+   
+   STRING1 and STRING2 have length SIZE1 and SIZE2, respectively.
+   
+   RANGE is how far to scan while trying to match.  RANGE = 0 means try
+   only at STARTPOS; in general, the last start tried is STARTPOS +
+   RANGE.
+   
+   In REGS, return the indices of the virtual concatenation of STRING1
+   and STRING2 that matched the entire BUFP->buffer and its contained
+   subexpressions.
+   
+   Do not consider matching one past the index STOP in the virtual
+   concatenation of STRING1 and STRING2.
+
+   We return either the position in the strings at which the match was
+   found, -1 if no match, or -2 if error (such as failure
+   stack overflow).  */
+
+int
+re_search_2 (bufp, string1, size1, string2, size2, startpos, range, regs, stop)
+     struct re_pattern_buffer *bufp;
+     const char *string1, *string2;
+     int size1, size2;
+     int startpos;
+     int range;
+     struct re_registers *regs;
+     int stop;
+{
+  int val;
+  register char *fastmap = bufp->fastmap;
+  register char *translate = bufp->translate;
+  int total_size = size1 + size2;
+  int endpos = startpos + range;
+
+  /* Check for out-of-range STARTPOS.  */
+  if (startpos < 0 || startpos > total_size)
+    return -1;
+    
+  /* Fix up RANGE if it might eventually take us outside
+     the virtual concatenation of STRING1 and STRING2.  */
+  if (endpos < -1)
+    range = -1 - startpos;
+  else if (endpos > total_size)
+    range = total_size - startpos;
+
+  /* If the search isn't to be a backwards one, don't waste time in a
+     search for a pattern that must be anchored.  */
+  if (bufp->used > 0 && (re_opcode_t) bufp->buffer[0] == begbuf && range > 0)
+    {
+      if (startpos > 0)
+	return -1;
+      else
+	range = 1;
+    }
+
+  /* Update the fastmap now if not correct already.  */
+  if (fastmap && !bufp->fastmap_accurate)
+    if (re_compile_fastmap (bufp) == -2)
+      return -2;
+  
+  /* Loop through the string, looking for a place to start matching.  */
+  for (;;)
+    { 
+      /* If a fastmap is supplied, skip quickly over characters that
+         cannot be the start of a match.  If the pattern can match the
+         null string, however, we don't need to skip characters; we want
+         the first null string.  */
+      if (fastmap && startpos < total_size && !bufp->can_be_null)
+	{
+	  if (range > 0)	/* Searching forwards.  */
+	    {
+	      register const char *d;
+	      register int lim = 0;
+	      int irange = range;
+
+              if (startpos < size1 && startpos + range >= size1)
+                lim = range - (size1 - startpos);
+
+	      d = (startpos >= size1 ? string2 - size1 : string1) + startpos;
+   
+              /* Written out as an if-else to avoid testing `translate'
+                 inside the loop.  */
+	      if (translate)
+                while (range > lim
+                       && !fastmap[(unsigned char)
+				   translate[(unsigned char) *d++]])
+                  range--;
+	      else
+                while (range > lim && !fastmap[(unsigned char) *d++])
+                  range--;
+
+	      startpos += irange - range;
+	    }
+	  else				/* Searching backwards.  */
+	    {
+	      register char c = (size1 == 0 || startpos >= size1
+                                 ? string2[startpos - size1] 
+                                 : string1[startpos]);
+
+	      if (!fastmap[(unsigned char) TRANSLATE (c)])
+		goto advance;
+	    }
+	}
+
+      /* If can't match the null string, and that's all we have left, fail.  */
+      if (range >= 0 && startpos == total_size && fastmap
+          && !bufp->can_be_null)
+	return -1;
+
+      val = re_match_2 (bufp, string1, size1, string2, size2,
+	                startpos, regs, stop);
+      if (val >= 0)
+	return startpos;
+        
+      if (val == -2)
+	return -2;
+
+    advance:
+      if (!range) 
+        break;
+      else if (range > 0) 
+        {
+          range--; 
+          startpos++;
+        }
+      else
+        {
+          range++; 
+          startpos--;
+        }
+    }
+  return -1;
+} /* re_search_2 */
+
+/* Declarations and macros for re_match_2.  */
+
+static int bcmp_translate ();
+static boolean alt_match_null_string_p (),
+               common_op_match_null_string_p (),
+               group_match_null_string_p ();
+
+/* Structure for per-register (a.k.a. per-group) information.
+   This must not be longer than one word, because we push this value
+   onto the failure stack.  Other register information, such as the
+   starting and ending positions (which are addresses), and the list of
+   inner groups (which is a bits list) are maintained in separate
+   variables.  
+   
+   We are making a (strictly speaking) nonportable assumption here: that
+   the compiler will pack our bit fields into something that fits into
+   the type of `word', i.e., is something that fits into one item on the
+   failure stack.  */
+typedef union
+{
+  fail_stack_elt_t word;
+  struct
+  {
+      /* This field is one if this group can match the empty string,
+         zero if not.  If not yet determined,  `MATCH_NULL_UNSET_VALUE'.  */
+#define MATCH_NULL_UNSET_VALUE 3
+    unsigned match_null_string_p : 2;
+    unsigned is_active : 1;
+    unsigned matched_something : 1;
+    unsigned ever_matched_something : 1;
+  } bits;
+} register_info_type;
+
+#define REG_MATCH_NULL_STRING_P(R)  ((R).bits.match_null_string_p)
+#define IS_ACTIVE(R)  ((R).bits.is_active)
+#define MATCHED_SOMETHING(R)  ((R).bits.matched_something)
+#define EVER_MATCHED_SOMETHING(R)  ((R).bits.ever_matched_something)
+
+
+/* Call this when have matched a real character; it sets `matched' flags
+   for the subexpressions which we are currently inside.  Also records
+   that those subexprs have matched.  */
+#define SET_REGS_MATCHED()						\
+  do									\
+    {									\
+      unsigned r;							\
+      for (r = lowest_active_reg; r <= highest_active_reg; r++)		\
+        {								\
+          MATCHED_SOMETHING (reg_info[r])				\
+            = EVER_MATCHED_SOMETHING (reg_info[r])			\
+            = 1;							\
+        }								\
+    }									\
+  while (0)
+
+
+/* This converts PTR, a pointer into one of the search strings `string1'
+   and `string2' into an offset from the beginning of that string.  */
+#define POINTER_TO_OFFSET(ptr)						\
+  (FIRST_STRING_P (ptr) ? (ptr) - string1 : (ptr) - string2 + size1)
+
+/* Registers are set to a sentinel when they haven't yet matched.  */
+#define REG_UNSET_VALUE ((char *) -1)
+#define REG_UNSET(e) ((e) == REG_UNSET_VALUE)
+
+
+/* Macros for dealing with the split strings in re_match_2.  */
+
+#define MATCHING_IN_FIRST_STRING  (dend == end_match_1)
+
+/* Call before fetching a character with *d.  This switches over to
+   string2 if necessary.  */
+#define PREFETCH()							\
+  while (d == dend)						    	\
+    {									\
+      /* End of string2 => fail.  */					\
+      if (dend == end_match_2) 						\
+        goto fail;							\
+      /* End of string1 => advance to string2.  */ 			\
+      d = string2;						        \
+      dend = end_match_2;						\
+    }
+
+
+/* Test if at very beginning or at very end of the virtual concatenation
+   of `string1' and `string2'.  If only one string, it's `string2'.  */
+#define AT_STRINGS_BEG(d) ((d) == (size1 ? string1 : string2) || !size2)
+#define AT_STRINGS_END(d) ((d) == end2)	
+
+
+/* Test if D points to a character which is word-constituent.  We have
+   two special cases to check for: if past the end of string1, look at
+   the first character in string2; and if before the beginning of
+   string2, look at the last character in string1.  */
+#define WORDCHAR_P(d)							\
+  (SYNTAX ((d) == end1 ? *string2					\
+           : (d) == string2 - 1 ? *(end1 - 1) : *(d))			\
+   == Sword)
+
+/* Test if the character before D and the one at D differ with respect
+   to being word-constituent.  */
+#define AT_WORD_BOUNDARY(d)						\
+  (AT_STRINGS_BEG (d) || AT_STRINGS_END (d)				\
+   || WORDCHAR_P (d - 1) != WORDCHAR_P (d))
+
+
+/* Free everything we malloc.  */
+#ifdef REGEX_MALLOC
+#define FREE_VAR(var) do{if(var){free((void*)var); var = NULL;}}while (0)
+#define FREE_VARIABLES()						\
+  do {									\
+    FREE_VAR (fail_stack.stack);					\
+    FREE_VAR (regstart);						\
+    FREE_VAR (regend);							\
+    FREE_VAR (old_regstart);						\
+    FREE_VAR (old_regend);						\
+    FREE_VAR (best_regstart);						\
+    FREE_VAR (best_regend);						\
+    FREE_VAR (reg_info);						\
+    FREE_VAR (reg_dummy);						\
+    FREE_VAR (reg_info_dummy);						\
+  } while (0)
+#else /* not REGEX_MALLOC */
+/* Some MIPS systems (at least) want this to free alloca'd storage.  */
+#define FREE_VARIABLES() alloca (0)
+#endif /* not REGEX_MALLOC */
+
+
+/* These values must meet several constraints.  They must not be valid
+   register values; since we have a limit of 255 registers (because
+   we use only one byte in the pattern for the register number), we can
+   use numbers larger than 255.  They must differ by 1, because of
+   NUM_FAILURE_ITEMS above.  And the value for the lowest register must
+   be larger than the value for the highest register, so we do not try
+   to actually save any registers when none are active.  */
+#define NO_HIGHEST_ACTIVE_REG (1 << BYTEWIDTH)
+#define NO_LOWEST_ACTIVE_REG (NO_HIGHEST_ACTIVE_REG + 1)
+
+/* Matching routines.  */
+
+#ifndef emacs   /* Emacs never uses this.  */
+/* re_match is like re_match_2 except it takes only a single string.  */
+
+int
+re_match (bufp, string, size, pos, regs)
+     struct re_pattern_buffer *bufp;
+     const char *string;
+     int size, pos;
+     struct re_registers *regs;
+ {
+  return re_match_2 (bufp, NULL, 0, string, size, pos, regs, size); 
+}
+#endif /* not emacs */
+
+
+/* re_match_2 matches the compiled pattern in BUFP against the
+   (virtual) concatenation of STRING1 and STRING2 (of length SIZE1
+   and SIZE2, respectively).  We start matching at POS, and stop
+   matching at STOP.
+   
+   If REGS is non-null and the `no_sub' field of BUFP is nonzero, we
+   store offsets for the substring each group matched in REGS.  See the
+   documentation for exactly how many groups we fill.
+
+   We return -1 if no match, -2 if an internal error (such as the
+   failure stack overflowing).  Otherwise, we return the length of the
+   matched substring.  */
+
+int
+re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop)
+     struct re_pattern_buffer *bufp;
+     const char *string1, *string2;
+     int size1, size2;
+     int pos;
+     struct re_registers *regs;
+     int stop;
+{
+  /* General temporaries.  */
+  int mcnt;
+  unsigned char *p1;
+
+  /* Just past the end of the corresponding string.  */
+  const char *end1, *end2;
+
+  /* Pointers into string1 and string2, just past the last characters in
+     each to consider matching.  */
+  const char *end_match_1, *end_match_2;
+
+  /* Where we are in the data, and the end of the current string.  */
+  const char *d, *dend;
+  
+  /* Where we are in the pattern, and the end of the pattern.  */
+  unsigned char *p = bufp->buffer;
+  register unsigned char *pend = p + bufp->used;
+
+  /* We use this to map every character in the string.  */
+  char *translate = bufp->translate;
+
+  /* Failure point stack.  Each place that can handle a failure further
+     down the line pushes a failure point on this stack.  It consists of
+     restart, regend, and reg_info for all registers corresponding to
+     the subexpressions we're currently inside, plus the number of such
+     registers, and, finally, two char *'s.  The first char * is where
+     to resume scanning the pattern; the second one is where to resume
+     scanning the strings.  If the latter is zero, the failure point is
+     a ``dummy''; if a failure happens and the failure point is a dummy,
+     it gets discarded and the next one is tried.  */
+  fail_stack_type fail_stack;
+#ifdef DEBUG
+  static unsigned failure_id = 0;
+  unsigned nfailure_points_pushed = 0, nfailure_points_popped = 0;
+#endif
+
+  /* We fill all the registers internally, independent of what we
+     return, for use in backreferences.  The number here includes
+     an element for register zero.  */
+  unsigned num_regs = bufp->re_nsub + 1;
+  
+  /* The currently active registers.  */
+  unsigned lowest_active_reg = NO_LOWEST_ACTIVE_REG;
+  unsigned highest_active_reg = NO_HIGHEST_ACTIVE_REG;
+
+  /* Information on the contents of registers. These are pointers into
+     the input strings; they record just what was matched (on this
+     attempt) by a subexpression part of the pattern, that is, the
+     regnum-th regstart pointer points to where in the pattern we began
+     matching and the regnum-th regend points to right after where we
+     stopped matching the regnum-th subexpression.  (The zeroth register
+     keeps track of what the whole pattern matches.)  */
+  const char **regstart, **regend;
+
+  /* If a group that's operated upon by a repetition operator fails to
+     match anything, then the register for its start will need to be
+     restored because it will have been set to wherever in the string we
+     are when we last see its open-group operator.  Similarly for a
+     register's end.  */
+  const char **old_regstart, **old_regend;
+
+  /* The is_active field of reg_info helps us keep track of which (possibly
+     nested) subexpressions we are currently in. The matched_something
+     field of reg_info[reg_num] helps us tell whether or not we have
+     matched any of the pattern so far this time through the reg_num-th
+     subexpression.  These two fields get reset each time through any
+     loop their register is in.  */
+  register_info_type *reg_info; 
+
+  /* The following record the register info as found in the above
+     variables when we find a match better than any we've seen before. 
+     This happens as we backtrack through the failure points, which in
+     turn happens only if we have not yet matched the entire string. */
+  unsigned best_regs_set = false;
+  const char **best_regstart, **best_regend;
+  
+  /* Logically, this is `best_regend[0]'.  But we don't want to have to
+     allocate space for that if we're not allocating space for anything
+     else (see below).  Also, we never need info about register 0 for
+     any of the other register vectors, and it seems rather a kludge to
+     treat `best_regend' differently than the rest.  So we keep track of
+     the end of the best match so far in a separate variable.  We
+     initialize this to NULL so that when we backtrack the first time
+     and need to test it, it's not garbage.  */
+  const char *match_end = NULL;
+
+  /* Used when we pop values we don't care about.  */
+  const char **reg_dummy;
+  register_info_type *reg_info_dummy;
+
+#ifdef DEBUG
+  /* Counts the total number of registers pushed.  */
+  unsigned num_regs_pushed = 0; 	
+#endif
+
+  DEBUG_PRINT1 ("\n\nEntering re_match_2.\n");
+  
+  INIT_FAIL_STACK ();
+  
+  /* Do not bother to initialize all the register variables if there are
+     no groups in the pattern, as it takes a fair amount of time.  If
+     there are groups, we include space for register 0 (the whole
+     pattern), even though we never use it, since it simplifies the
+     array indexing.  We should fix this.  */
+  if (bufp->re_nsub)
+    {
+      regstart = REGEX_TALLOC (num_regs, const char *);
+      regend = REGEX_TALLOC (num_regs, const char *);
+      old_regstart = REGEX_TALLOC (num_regs, const char *);
+      old_regend = REGEX_TALLOC (num_regs, const char *);
+      best_regstart = REGEX_TALLOC (num_regs, const char *);
+      best_regend = REGEX_TALLOC (num_regs, const char *);
+      reg_info = REGEX_TALLOC (num_regs, register_info_type);
+      reg_dummy = REGEX_TALLOC (num_regs, const char *);
+      reg_info_dummy = REGEX_TALLOC (num_regs, register_info_type);
+
+      if (!(regstart && regend && old_regstart && old_regend && reg_info 
+            && best_regstart && best_regend && reg_dummy && reg_info_dummy)) 
+        {
+          FREE_VARIABLES ();
+          return -2;
+        }
+    }
+#ifdef REGEX_MALLOC
+  else
+    {
+      /* We must initialize all our variables to NULL, so that
+         `FREE_VARIABLES' doesn't try to free them.  */
+      regstart = regend = old_regstart = old_regend = best_regstart
+        = best_regend = reg_dummy = NULL;
+      reg_info = reg_info_dummy = (register_info_type *) NULL;
+    }
+#endif /* REGEX_MALLOC */
+
+  /* The starting position is bogus.  */
+  if (pos < 0 || pos > size1 + size2)
+    {
+      FREE_VARIABLES ();
+      return -1;
+    }
+    
+  /* Initialize subexpression text positions to -1 to mark ones that no
+     start_memory/stop_memory has been seen for. Also initialize the
+     register information struct.  */
+  for (mcnt = 1; mcnt < num_regs; mcnt++)
+    {
+      regstart[mcnt] = regend[mcnt] 
+        = old_regstart[mcnt] = old_regend[mcnt] = REG_UNSET_VALUE;
+        
+      REG_MATCH_NULL_STRING_P (reg_info[mcnt]) = MATCH_NULL_UNSET_VALUE;
+      IS_ACTIVE (reg_info[mcnt]) = 0;
+      MATCHED_SOMETHING (reg_info[mcnt]) = 0;
+      EVER_MATCHED_SOMETHING (reg_info[mcnt]) = 0;
+    }
+  
+  /* We move `string1' into `string2' if the latter's empty -- but not if
+     `string1' is null.  */
+  if (size2 == 0 && string1 != NULL)
+    {
+      string2 = string1;
+      size2 = size1;
+      string1 = 0;
+      size1 = 0;
+    }
+  end1 = string1 + size1;
+  end2 = string2 + size2;
+
+  /* Compute where to stop matching, within the two strings.  */
+  if (stop <= size1)
+    {
+      end_match_1 = string1 + stop;
+      end_match_2 = string2;
+    }
+  else
+    {
+      end_match_1 = end1;
+      end_match_2 = string2 + stop - size1;
+    }
+
+  /* `p' scans through the pattern as `d' scans through the data. 
+     `dend' is the end of the input string that `d' points within.  `d'
+     is advanced into the following input string whenever necessary, but
+     this happens before fetching; therefore, at the beginning of the
+     loop, `d' can be pointing at the end of a string, but it cannot
+     equal `string2'.  */
+  if (size1 > 0 && pos <= size1)
+    {
+      d = string1 + pos;
+      dend = end_match_1;
+    }
+  else
+    {
+      d = string2 + pos - size1;
+      dend = end_match_2;
+    }
+
+  DEBUG_PRINT1 ("The compiled pattern is: ");
+  DEBUG_PRINT_COMPILED_PATTERN (bufp, p, pend);
+  DEBUG_PRINT1 ("The string to match is: `");
+  DEBUG_PRINT_DOUBLE_STRING (d, string1, size1, string2, size2);
+  DEBUG_PRINT1 ("'\n");
+  
+  /* This loops over pattern commands.  It exits by returning from the
+     function if the match is complete, or it drops through if the match
+     fails at this starting point in the input data.  */
+  for (;;)
+    {
+      DEBUG_PRINT2 ("\n0x%x: ", p);
+
+      if (p == pend)
+	{ /* End of pattern means we might have succeeded.  */
+          DEBUG_PRINT1 ("end of pattern ... ");
+          
+	  /* If we haven't matched the entire string, and we want the
+             longest match, try backtracking.  */
+          if (d != end_match_2)
+	    {
+              DEBUG_PRINT1 ("backtracking.\n");
+              
+              if (!FAIL_STACK_EMPTY ())
+                { /* More failure points to try.  */
+                  boolean same_str_p = (FIRST_STRING_P (match_end) 
+	        	                == MATCHING_IN_FIRST_STRING);
+
+                  /* If exceeds best match so far, save it.  */
+                  if (!best_regs_set
+                      || (same_str_p && d > match_end)
+                      || (!same_str_p && !MATCHING_IN_FIRST_STRING))
+                    {
+                      best_regs_set = true;
+                      match_end = d;
+                      
+                      DEBUG_PRINT1 ("\nSAVING match as best so far.\n");
+                      
+                      for (mcnt = 1; mcnt < num_regs; mcnt++)
+                        {
+                          best_regstart[mcnt] = regstart[mcnt];
+                          best_regend[mcnt] = regend[mcnt];
+                        }
+                    }
+                  goto fail;	       
+                }
+
+              /* If no failure points, don't restore garbage.  */
+              else if (best_regs_set)   
+                {
+  	        restore_best_regs:
+                  /* Restore best match.  It may happen that `dend ==
+                     end_match_1' while the restored d is in string2.
+                     For example, the pattern `x.*y.*z' against the
+                     strings `x-' and `y-z-', if the two strings are
+                     not consecutive in memory.  */
+                  DEBUG_PRINT1 ("Restoring best registers.\n");
+                  
+                  d = match_end;
+                  dend = ((d >= string1 && d <= end1)
+		           ? end_match_1 : end_match_2);
+
+		  for (mcnt = 1; mcnt < num_regs; mcnt++)
+		    {
+		      regstart[mcnt] = best_regstart[mcnt];
+		      regend[mcnt] = best_regend[mcnt];
+		    }
+                }
+            } /* d != end_match_2 */
+
+          DEBUG_PRINT1 ("Accepting match.\n");
+
+          /* If caller wants register contents data back, do it.  */
+          if (regs && !bufp->no_sub)
+	    {
+              /* Have the register data arrays been allocated?  */
+              if (bufp->regs_allocated == REGS_UNALLOCATED)
+                { /* No.  So allocate them with malloc.  We need one
+                     extra element beyond `num_regs' for the `-1' marker
+                     GNU code uses.  */
+                  regs->num_regs = MAX (RE_NREGS, num_regs + 1);
+                  regs->start = TALLOC (regs->num_regs, regoff_t);
+                  regs->end = TALLOC (regs->num_regs, regoff_t);
+                  if (regs->start == NULL || regs->end == NULL)
+                    return -2;
+                  bufp->regs_allocated = REGS_REALLOCATE;
+                }
+              else if (bufp->regs_allocated == REGS_REALLOCATE)
+                { /* Yes.  If we need more elements than were already
+                     allocated, reallocate them.  If we need fewer, just
+                     leave it alone.  */
+                  if (regs->num_regs < num_regs + 1)
+                    {
+                      regs->num_regs = num_regs + 1;
+                      RETALLOC (regs->start, regs->num_regs, regoff_t);
+                      RETALLOC (regs->end, regs->num_regs, regoff_t);
+                      if (regs->start == NULL || regs->end == NULL)
+                        return -2;
+                    }
+                }
+              else
+                assert (bufp->regs_allocated == REGS_FIXED);
+
+              /* Convert the pointer data in `regstart' and `regend' to
+                 indices.  Register zero has to be set differently,
+                 since we haven't kept track of any info for it.  */
+              if (regs->num_regs > 0)
+                {
+                  regs->start[0] = pos;
+                  regs->end[0] = (MATCHING_IN_FIRST_STRING ? d - string1
+			          : d - string2 + size1);
+                }
+              
+              /* Go through the first `min (num_regs, regs->num_regs)'
+                 registers, since that is all we initialized.  */
+	      for (mcnt = 1; mcnt < MIN (num_regs, regs->num_regs); mcnt++)
+		{
+                  if (REG_UNSET (regstart[mcnt]) || REG_UNSET (regend[mcnt]))
+                    regs->start[mcnt] = regs->end[mcnt] = -1;
+                  else
+                    {
+		      regs->start[mcnt] = POINTER_TO_OFFSET (regstart[mcnt]);
+                      regs->end[mcnt] = POINTER_TO_OFFSET (regend[mcnt]);
+                    }
+		}
+              
+              /* If the regs structure we return has more elements than
+                 were in the pattern, set the extra elements to -1.  If
+                 we (re)allocated the registers, this is the case,
+                 because we always allocate enough to have at least one
+                 -1 at the end.  */
+              for (mcnt = num_regs; mcnt < regs->num_regs; mcnt++)
+                regs->start[mcnt] = regs->end[mcnt] = -1;
+	    } /* regs && !bufp->no_sub */
+
+          FREE_VARIABLES ();
+          DEBUG_PRINT4 ("%u failure points pushed, %u popped (%u remain).\n",
+                        nfailure_points_pushed, nfailure_points_popped,
+                        nfailure_points_pushed - nfailure_points_popped);
+          DEBUG_PRINT2 ("%u registers pushed.\n", num_regs_pushed);
+
+          mcnt = d - pos - (MATCHING_IN_FIRST_STRING 
+			    ? string1 
+			    : string2 - size1);
+
+          DEBUG_PRINT2 ("Returning %d from re_match_2.\n", mcnt);
+
+          return mcnt;
+        }
+
+      /* Otherwise match next pattern command.  */
+#ifdef SWITCH_ENUM_BUG
+      switch ((int) ((re_opcode_t) *p++))
+#else
+      switch ((re_opcode_t) *p++)
+#endif
+	{
+        /* Ignore these.  Used to ignore the n of succeed_n's which
+           currently have n == 0.  */
+        case no_op:
+          DEBUG_PRINT1 ("EXECUTING no_op.\n");
+          break;
+
+
+        /* Match the next n pattern characters exactly.  The following
+           byte in the pattern defines n, and the n bytes after that
+           are the characters to match.  */
+	case exactn:
+	  mcnt = *p++;
+          DEBUG_PRINT2 ("EXECUTING exactn %d.\n", mcnt);
+
+          /* This is written out as an if-else so we don't waste time
+             testing `translate' inside the loop.  */
+          if (translate)
+	    {
+	      do
+		{
+		  PREFETCH ();
+		  if (translate[(unsigned char) *d++] != (char) *p++)
+                    goto fail;
+		}
+	      while (--mcnt);
+	    }
+	  else
+	    {
+	      do
+		{
+		  PREFETCH ();
+		  if (*d++ != (char) *p++) goto fail;
+		}
+	      while (--mcnt);
+	    }
+	  SET_REGS_MATCHED ();
+          break;
+
+
+        /* Match any character except possibly a newline or a null.  */
+	case anychar:
+          DEBUG_PRINT1 ("EXECUTING anychar.\n");
+
+          PREFETCH ();
+
+          if ((!(bufp->syntax & RE_DOT_NEWLINE) && TRANSLATE (*d) == '\n')
+              || (bufp->syntax & RE_DOT_NOT_NULL && TRANSLATE (*d) == '\000'))
+	    goto fail;
+
+          SET_REGS_MATCHED ();
+          DEBUG_PRINT2 ("  Matched `%d'.\n", *d);
+          d++;
+	  break;
+
+
+	case charset:
+	case charset_not:
+	  {
+	    register unsigned char c;
+	    boolean not = (re_opcode_t) *(p - 1) == charset_not;
+
+            DEBUG_PRINT2 ("EXECUTING charset%s.\n", not ? "_not" : "");
+
+	    PREFETCH ();
+	    c = TRANSLATE (*d); /* The character to match.  */
+
+            /* Cast to `unsigned' instead of `unsigned char' in case the
+               bit list is a full 32 bytes long.  */
+	    if (c < (unsigned) (*p * BYTEWIDTH)
+		&& p[1 + c / BYTEWIDTH] & (1 << (c % BYTEWIDTH)))
+	      not = !not;
+
+	    p += 1 + *p;
+
+	    if (!not) goto fail;
+            
+	    SET_REGS_MATCHED ();
+            d++;
+	    break;
+	  }
+
+
+        /* The beginning of a group is represented by start_memory.
+           The arguments are the register number in the next byte, and the
+           number of groups inner to this one in the next.  The text
+           matched within the group is recorded (in the internal
+           registers data structure) under the register number.  */
+        case start_memory:
+	  DEBUG_PRINT3 ("EXECUTING start_memory %d (%d):\n", *p, p[1]);
+
+          /* Find out if this group can match the empty string.  */
+	  p1 = p;		/* To send to group_match_null_string_p.  */
+          
+          if (REG_MATCH_NULL_STRING_P (reg_info[*p]) == MATCH_NULL_UNSET_VALUE)
+            REG_MATCH_NULL_STRING_P (reg_info[*p]) 
+              = group_match_null_string_p (&p1, pend, reg_info);
+
+          /* Save the position in the string where we were the last time
+             we were at this open-group operator in case the group is
+             operated upon by a repetition operator, e.g., with `(a*)*b'
+             against `ab'; then we want to ignore where we are now in
+             the string in case this attempt to match fails.  */
+          old_regstart[*p] = REG_MATCH_NULL_STRING_P (reg_info[*p])
+                             ? REG_UNSET (regstart[*p]) ? d : regstart[*p]
+                             : regstart[*p];
+	  DEBUG_PRINT2 ("  old_regstart: %d\n", 
+			 POINTER_TO_OFFSET (old_regstart[*p]));
+
+          regstart[*p] = d;
+	  DEBUG_PRINT2 ("  regstart: %d\n", POINTER_TO_OFFSET (regstart[*p]));
+
+          IS_ACTIVE (reg_info[*p]) = 1;
+          MATCHED_SOMETHING (reg_info[*p]) = 0;
+          
+          /* This is the new highest active register.  */
+          highest_active_reg = *p;
+          
+          /* If nothing was active before, this is the new lowest active
+             register.  */
+          if (lowest_active_reg == NO_LOWEST_ACTIVE_REG)
+            lowest_active_reg = *p;
+
+          /* Move past the register number and inner group count.  */
+          p += 2;
+          break;
+
+
+        /* The stop_memory opcode represents the end of a group.  Its
+           arguments are the same as start_memory's: the register
+           number, and the number of inner groups.  */
+	case stop_memory:
+	  DEBUG_PRINT3 ("EXECUTING stop_memory %d (%d):\n", *p, p[1]);
+             
+          /* We need to save the string position the last time we were at
+             this close-group operator in case the group is operated
+             upon by a repetition operator, e.g., with `((a*)*(b*)*)*'
+             against `aba'; then we want to ignore where we are now in
+             the string in case this attempt to match fails.  */
+          old_regend[*p] = REG_MATCH_NULL_STRING_P (reg_info[*p])
+                           ? REG_UNSET (regend[*p]) ? d : regend[*p]
+			   : regend[*p];
+	  DEBUG_PRINT2 ("      old_regend: %d\n", 
+			 POINTER_TO_OFFSET (old_regend[*p]));
+
+          regend[*p] = d;
+	  DEBUG_PRINT2 ("      regend: %d\n", POINTER_TO_OFFSET (regend[*p]));
+
+          /* This register isn't active anymore.  */
+          IS_ACTIVE (reg_info[*p]) = 0;
+          
+          /* If this was the only register active, nothing is active
+             anymore.  */
+          if (lowest_active_reg == highest_active_reg)
+            {
+              lowest_active_reg = NO_LOWEST_ACTIVE_REG;
+              highest_active_reg = NO_HIGHEST_ACTIVE_REG;
+            }
+          else
+            { /* We must scan for the new highest active register, since
+                 it isn't necessarily one less than now: consider
+                 (a(b)c(d(e)f)g).  When group 3 ends, after the f), the
+                 new highest active register is 1.  */
+              unsigned char r = *p - 1;
+              while (r > 0 && !IS_ACTIVE (reg_info[r]))
+                r--;
+              
+              /* If we end up at register zero, that means that we saved
+                 the registers as the result of an `on_failure_jump', not
+                 a `start_memory', and we jumped to past the innermost
+                 `stop_memory'.  For example, in ((.)*) we save
+                 registers 1 and 2 as a result of the *, but when we pop
+                 back to the second ), we are at the stop_memory 1.
+                 Thus, nothing is active.  */
+	      if (r == 0)
+                {
+                  lowest_active_reg = NO_LOWEST_ACTIVE_REG;
+                  highest_active_reg = NO_HIGHEST_ACTIVE_REG;
+                }
+              else
+                highest_active_reg = r;
+            }
+          
+          /* If just failed to match something this time around with a
+             group that's operated on by a repetition operator, try to
+             force exit from the ``loop'', and restore the register
+             information for this group that we had before trying this
+             last match.  */
+          if ((!MATCHED_SOMETHING (reg_info[*p])
+               || (re_opcode_t) p[-3] == start_memory)
+	      && (p + 2) < pend)              
+            {
+              boolean is_a_jump_n = false;
+              
+              p1 = p + 2;
+              mcnt = 0;
+              switch ((re_opcode_t) *p1++)
+                {
+                  case jump_n:
+		    is_a_jump_n = true;
+                  case pop_failure_jump:
+		  case maybe_pop_jump:
+		  case jump:
+		  case dummy_failure_jump:
+                    EXTRACT_NUMBER_AND_INCR (mcnt, p1);
+		    if (is_a_jump_n)
+		      p1 += 2;
+                    break;
+                  
+                  default:
+                    /* do nothing */ ;
+                }
+	      p1 += mcnt;
+        
+              /* If the next operation is a jump backwards in the pattern
+	         to an on_failure_jump right before the start_memory
+                 corresponding to this stop_memory, exit from the loop
+                 by forcing a failure after pushing on the stack the
+                 on_failure_jump's jump in the pattern, and d.  */
+              if (mcnt < 0 && (re_opcode_t) *p1 == on_failure_jump
+                  && (re_opcode_t) p1[3] == start_memory && p1[4] == *p)
+		{
+                  /* If this group ever matched anything, then restore
+                     what its registers were before trying this last
+                     failed match, e.g., with `(a*)*b' against `ab' for
+                     regstart[1], and, e.g., with `((a*)*(b*)*)*'
+                     against `aba' for regend[3].
+                     
+                     Also restore the registers for inner groups for,
+                     e.g., `((a*)(b*))*' against `aba' (register 3 would
+                     otherwise get trashed).  */
+                     
+                  if (EVER_MATCHED_SOMETHING (reg_info[*p]))
+		    {
+		      unsigned r; 
+        
+                      EVER_MATCHED_SOMETHING (reg_info[*p]) = 0;
+                      
+		      /* Restore this and inner groups' (if any) registers.  */
+                      for (r = *p; r < *p + *(p + 1); r++)
+                        {
+                          regstart[r] = old_regstart[r];
+
+                          /* xx why this test?  */
+                          if ((int) old_regend[r] >= (int) regstart[r])
+                            regend[r] = old_regend[r];
+                        }     
+                    }
+		  p1++;
+                  EXTRACT_NUMBER_AND_INCR (mcnt, p1);
+                  /*
+                   *  WARN 191: illegal pointer conversion
+                   *  between CONST and NON-CONST attribute
+                   */
+#                 ifdef __TANDEM
+#                   pragma NOWARN( 191 )
+#                 endif
+                  PUSH_FAILURE_POINT (p1 + mcnt, d, -2);
+#                 ifdef __TANDEM
+#                   pragma WARN( 191 )
+#                 endif
+
+                  goto fail;
+                }
+            }
+          
+          /* Move past the register number and the inner group count.  */
+          p += 2;
+          break;
+
+
+	/* \<digit> has been turned into a `duplicate' command which is
+           followed by the numeric value of <digit> as the register number.  */
+        case duplicate:
+	  {
+	    register const char *d2, *dend2;
+	    int regno = *p++;   /* Get which register to match against.  */
+	    DEBUG_PRINT2 ("EXECUTING duplicate %d.\n", regno);
+
+	    /* Can't back reference a group which we've never matched.  */
+            if (REG_UNSET (regstart[regno]) || REG_UNSET (regend[regno]))
+              goto fail;
+              
+            /* Where in input to try to start matching.  */
+            d2 = regstart[regno];
+            
+            /* Where to stop matching; if both the place to start and
+               the place to stop matching are in the same string, then
+               set to the place to stop, otherwise, for now have to use
+               the end of the first string.  */
+
+            dend2 = ((FIRST_STRING_P (regstart[regno]) 
+		      == FIRST_STRING_P (regend[regno]))
+		     ? regend[regno] : end_match_1);
+	    for (;;)
+	      {
+		/* If necessary, advance to next segment in register
+                   contents.  */
+		while (d2 == dend2)
+		  {
+		    if (dend2 == end_match_2) break;
+		    if (dend2 == regend[regno]) break;
+
+                    /* End of string1 => advance to string2. */
+                    d2 = string2;
+                    dend2 = regend[regno];
+		  }
+		/* At end of register contents => success */
+		if (d2 == dend2) break;
+
+		/* If necessary, advance to next segment in data.  */
+		PREFETCH ();
+
+		/* How many characters left in this segment to match.  */
+		mcnt = dend - d;
+                
+		/* Want how many consecutive characters we can match in
+                   one shot, so, if necessary, adjust the count.  */
+                if (mcnt > dend2 - d2)
+		  mcnt = dend2 - d2;
+                  
+		/* Compare that many; failure if mismatch, else move
+                   past them.  */
+		if (translate 
+                    ? bcmp_translate (d, d2, mcnt, translate) 
+                    : bcmp (d, d2, mcnt))
+		  goto fail;
+		d += mcnt, d2 += mcnt;
+	      }
+	  }
+	  break;
+
+
+        /* begline matches the empty string at the beginning of the string
+           (unless `not_bol' is set in `bufp'), and, if
+           `newline_anchor' is set, after newlines.  */
+	case begline:
+          DEBUG_PRINT1 ("EXECUTING begline.\n");
+          
+          if (AT_STRINGS_BEG (d))
+            {
+              if (!bufp->not_bol) break;
+            }
+          else if (d[-1] == '\n' && bufp->newline_anchor)
+            {
+              break;
+            }
+          /* In all other cases, we fail.  */
+          goto fail;
+
+
+        /* endline is the dual of begline.  */
+	case endline:
+          DEBUG_PRINT1 ("EXECUTING endline.\n");
+
+          if (AT_STRINGS_END (d))
+            {
+              if (!bufp->not_eol) break;
+            }
+          
+          /* We have to ``prefetch'' the next character.  */
+          else if ((d == end1 ? *string2 : *d) == '\n'
+                   && bufp->newline_anchor)
+            {
+              break;
+            }
+          goto fail;
+
+
+	/* Match at the very beginning of the data.  */
+        case begbuf:
+          DEBUG_PRINT1 ("EXECUTING begbuf.\n");
+          if (AT_STRINGS_BEG (d))
+            break;
+          goto fail;
+
+
+	/* Match at the very end of the data.  */
+        case endbuf:
+          DEBUG_PRINT1 ("EXECUTING endbuf.\n");
+	  if (AT_STRINGS_END (d))
+	    break;
+          goto fail;
+
+
+        /* on_failure_keep_string_jump is used to optimize `.*\n'.  It
+           pushes NULL as the value for the string on the stack.  Then
+           `pop_failure_point' will keep the current value for the
+           string, instead of restoring it.  To see why, consider
+           matching `foo\nbar' against `.*\n'.  The .* matches the foo;
+           then the . fails against the \n.  But the next thing we want
+           to do is match the \n against the \n; if we restored the
+           string value, we would be back at the foo.
+           
+           Because this is used only in specific cases, we don't need to
+           check all the things that `on_failure_jump' does, to make
+           sure the right things get saved on the stack.  Hence we don't
+           share its code.  The only reason to push anything on the
+           stack at all is that otherwise we would have to change
+           `anychar's code to do something besides goto fail in this
+           case; that seems worse than this.  */
+        case on_failure_keep_string_jump:
+          DEBUG_PRINT1 ("EXECUTING on_failure_keep_string_jump");
+          
+          EXTRACT_NUMBER_AND_INCR (mcnt, p);
+          DEBUG_PRINT3 (" %d (to 0x%x):\n", mcnt, p + mcnt);
+
+          /*
+           *  WARN 191: illegal pointer conversion
+           *  between CONST and NON-CONST attribute
+           */
+#         ifdef __TANDEM
+#           pragma NOWARN( 191 )
+#         endif
+          PUSH_FAILURE_POINT (p + mcnt, NULL, -2);
+#         ifdef __TANDEM
+#           pragma WARN( 191 )
+#         endif
+          break;
+
+
+	/* Uses of on_failure_jump:
+        
+           Each alternative starts with an on_failure_jump that points
+           to the beginning of the next alternative.  Each alternative
+           except the last ends with a jump that in effect jumps past
+           the rest of the alternatives.  (They really jump to the
+           ending jump of the following alternative, because tensioning
+           these jumps is a hassle.)
+
+           Repeats start with an on_failure_jump that points past both
+           the repetition text and either the following jump or
+           pop_failure_jump back to this on_failure_jump.  */
+	case on_failure_jump:
+        on_failure:
+          DEBUG_PRINT1 ("EXECUTING on_failure_jump");
+
+          EXTRACT_NUMBER_AND_INCR (mcnt, p);
+          DEBUG_PRINT3 (" %d (to 0x%x)", mcnt, p + mcnt);
+
+          /* If this on_failure_jump comes right before a group (i.e.,
+             the original * applied to a group), save the information
+             for that group and all inner ones, so that if we fail back
+             to this point, the group's information will be correct.
+             For example, in \(a*\)*\1, we need the preceding group,
+             and in \(\(a*\)b*\)\2, we need the inner group.  */
+
+          /* We can't use `p' to check ahead because we push
+             a failure point to `p + mcnt' after we do this.  */
+          p1 = p;
+
+          /* We need to skip no_op's before we look for the
+             start_memory in case this on_failure_jump is happening as
+             the result of a completed succeed_n, as in \(a\)\{1,3\}b\1
+             against aba.  */
+          while (p1 < pend && (re_opcode_t) *p1 == no_op)
+            p1++;
+
+          if (p1 < pend && (re_opcode_t) *p1 == start_memory)
+            {
+              /* We have a new highest active register now.  This will
+                 get reset at the start_memory we are about to get to,
+                 but we will have saved all the registers relevant to
+                 this repetition op, as described above.  */
+              highest_active_reg = *(p1 + 1) + *(p1 + 2);
+              if (lowest_active_reg == NO_LOWEST_ACTIVE_REG)
+                lowest_active_reg = *(p1 + 1);
+            }
+
+          DEBUG_PRINT1 (":\n");
+          /*
+           *  WARN 191: illegal pointer conversion
+           *  between CONST and NON-CONST attribute
+           */
+#         ifdef __TANDEM
+#           pragma NOWARN( 191 )
+#         endif
+          PUSH_FAILURE_POINT (p + mcnt, d, -2);
+#         ifdef __TANDEM
+#           pragma WARN( 191 )
+#         endif
+          break;
+
+
+        /* A smart repeat ends with `maybe_pop_jump'.
+	   We change it to either `pop_failure_jump' or `jump'.  */
+        case maybe_pop_jump:
+          EXTRACT_NUMBER_AND_INCR (mcnt, p);
+          DEBUG_PRINT2 ("EXECUTING maybe_pop_jump %d.\n", mcnt);
+          {
+	    register unsigned char *p2 = p;
+
+            /* Compare the beginning of the repeat with what in the
+               pattern follows its end. If we can establish that there
+               is nothing that they would both match, i.e., that we
+               would have to backtrack because of (as in, e.g., `a*a')
+               then we can change to pop_failure_jump, because we'll
+               never have to backtrack.
+               
+               This is not true in the case of alternatives: in
+               `(a|ab)*' we do need to backtrack to the `ab' alternative
+               (e.g., if the string was `ab').  But instead of trying to
+               detect that here, the alternative has put on a dummy
+               failure point which is what we will end up popping.  */
+
+	    /* Skip over open/close-group commands.  */
+	    while (p2 + 2 < pend
+		   && ((re_opcode_t) *p2 == stop_memory
+		       || (re_opcode_t) *p2 == start_memory))
+	      p2 += 3;			/* Skip over args, too.  */
+
+            /* If we're at the end of the pattern, we can change.  */
+            if (p2 == pend)
+	      {
+		/* Consider what happens when matching ":\(.*\)"
+		   against ":/".  I don't really understand this code
+		   yet.  */
+  	        p[-3] = (unsigned char) pop_failure_jump;
+                DEBUG_PRINT1
+                  ("  End of pattern: change to `pop_failure_jump'.\n");
+              }
+
+            else if ((re_opcode_t) *p2 == exactn
+		     || (bufp->newline_anchor && (re_opcode_t) *p2 == endline))
+	      {
+		register unsigned char c
+                  = *p2 == (unsigned char) endline ? '\n' : p2[2];
+		p1 = p + mcnt;
+
+                /* p1[0] ... p1[2] are the `on_failure_jump' corresponding
+                   to the `maybe_finalize_jump' of this case.  Examine what 
+                   follows.  */
+                if ((re_opcode_t) p1[3] == exactn && p1[5] != c)
+                  {
+  		    p[-3] = (unsigned char) pop_failure_jump;
+                    DEBUG_PRINT3 ("  %c != %c => pop_failure_jump.\n",
+                                  c, p1[5]);
+                  }
+                  
+		else if ((re_opcode_t) p1[3] == charset
+			 || (re_opcode_t) p1[3] == charset_not)
+		  {
+		    int not = (re_opcode_t) p1[3] == charset_not;
+                    
+		    if (c < (unsigned char) (p1[4] * BYTEWIDTH)
+			&& p1[5 + c / BYTEWIDTH] & (1 << (c % BYTEWIDTH)))
+		      not = !not;
+
+                    /* `not' is equal to 1 if c would match, which means
+                        that we can't change to pop_failure_jump.  */
+		    if (!not)
+                      {
+  		        p[-3] = (unsigned char) pop_failure_jump;
+                        DEBUG_PRINT1 ("  No match => pop_failure_jump.\n");
+                      }
+		  }
+	      }
+	  }
+	  p -= 2;		/* Point at relative address again.  */
+	  if ((re_opcode_t) p[-1] != pop_failure_jump)
+	    {
+	      p[-1] = (unsigned char) jump;
+              DEBUG_PRINT1 ("  Match => jump.\n");
+	      goto unconditional_jump;
+	    }
+        /* Note fall through.  */
+
+
+	/* The end of a simple repeat has a pop_failure_jump back to
+           its matching on_failure_jump, where the latter will push a
+           failure point.  The pop_failure_jump takes off failure
+           points put on by this pop_failure_jump's matching
+           on_failure_jump; we got through the pattern to here from the
+           matching on_failure_jump, so didn't fail.  */
+        case pop_failure_jump:
+          {
+            /* We need to pass separate storage for the lowest and
+               highest registers, even though we don't care about the
+               actual values.  Otherwise, we will restore only one
+               register from the stack, since lowest will == highest in
+               `pop_failure_point'.  */
+            unsigned dummy_low_reg, dummy_high_reg;
+            unsigned char *pdummy;
+            const char *sdummy;
+
+            DEBUG_PRINT1 ("EXECUTING pop_failure_jump.\n");
+            POP_FAILURE_POINT (sdummy, pdummy,
+                               dummy_low_reg, dummy_high_reg,
+                               reg_dummy, reg_dummy, reg_info_dummy);
+          }
+          /* Note fall through.  */
+
+          
+        /* Unconditionally jump (without popping any failure points).  */
+        case jump:
+	unconditional_jump:
+	  EXTRACT_NUMBER_AND_INCR (mcnt, p);	/* Get the amount to jump.  */
+          DEBUG_PRINT2 ("EXECUTING jump %d ", mcnt);
+	  p += mcnt;				/* Do the jump.  */
+          DEBUG_PRINT2 ("(to 0x%x).\n", p);
+	  break;
+
+	
+        /* We need this opcode so we can detect where alternatives end
+           in `group_match_null_string_p' et al.  */
+        case jump_past_alt:
+          DEBUG_PRINT1 ("EXECUTING jump_past_alt.\n");
+          goto unconditional_jump;
+
+
+        /* Normally, the on_failure_jump pushes a failure point, which
+           then gets popped at pop_failure_jump.  We will end up at
+           pop_failure_jump, also, and with a pattern of, say, `a+', we
+           are skipping over the on_failure_jump, so we have to push
+           something meaningless for pop_failure_jump to pop.  */
+        case dummy_failure_jump:
+          DEBUG_PRINT1 ("EXECUTING dummy_failure_jump.\n");
+          /* It doesn't matter what we push for the string here.  What
+             the code at `fail' tests is the value for the pattern.  */
+          /*
+           *  WARN 191: illegal pointer conversion
+           *  between CONST and NON-CONST attribute
+           */
+#         ifdef __TANDEM
+#           pragma NOWARN( 191 )
+#         endif
+          PUSH_FAILURE_POINT (0, 0, -2);
+#         ifdef __TANDEM
+#           pragma WARN( 191 )
+#         endif
+          goto unconditional_jump;
+
+
+        /* At the end of an alternative, we need to push a dummy failure
+           point in case we are followed by a `pop_failure_jump', because
+           we don't want the failure point for the alternative to be
+           popped.  For example, matching `(a|ab)*' against `aab'
+           requires that we match the `ab' alternative.  */
+        case push_dummy_failure:
+          DEBUG_PRINT1 ("EXECUTING push_dummy_failure.\n");
+          /* See comments just above at `dummy_failure_jump' about the
+             two zeroes.  */
+          /*
+           *  WARN 191: illegal pointer conversion
+           *  between CONST and NON-CONST attribute
+           */
+#         ifdef __TANDEM
+#           pragma NOWARN( 191 )
+#         endif
+          PUSH_FAILURE_POINT (0, 0, -2);
+#         ifdef __TANDEM
+#           pragma WARN( 191 )
+#         endif
+          break;
+
+        /* Have to succeed matching what follows at least n times.
+           After that, handle like `on_failure_jump'.  */
+        case succeed_n: 
+          EXTRACT_NUMBER (mcnt, p + 2);
+          DEBUG_PRINT2 ("EXECUTING succeed_n %d.\n", mcnt);
+
+          assert (mcnt >= 0);
+          /* Originally, this is how many times we HAVE to succeed.  */
+          if (mcnt > 0)
+            {
+               mcnt--;
+	       p += 2;
+               STORE_NUMBER_AND_INCR (p, mcnt);
+               DEBUG_PRINT3 ("  Setting 0x%x to %d.\n", p, mcnt);
+            }
+	  else if (mcnt == 0)
+            {
+              DEBUG_PRINT2 ("  Setting two bytes from 0x%x to no_op.\n", p+2);
+	      p[2] = (unsigned char) no_op;
+              p[3] = (unsigned char) no_op;
+              goto on_failure;
+            }
+          break;
+        
+        case jump_n: 
+          EXTRACT_NUMBER (mcnt, p + 2);
+          DEBUG_PRINT2 ("EXECUTING jump_n %d.\n", mcnt);
+
+          /* Originally, this is how many times we CAN jump.  */
+          if (mcnt)
+            {
+               mcnt--;
+               STORE_NUMBER (p + 2, mcnt);
+	       goto unconditional_jump;	     
+            }
+          /* If don't have to jump any more, skip over the rest of command.  */
+	  else      
+	    p += 4;		     
+          break;
+        
+	case set_number_at:
+	  {
+            DEBUG_PRINT1 ("EXECUTING set_number_at.\n");
+
+            EXTRACT_NUMBER_AND_INCR (mcnt, p);
+            p1 = p + mcnt;
+            EXTRACT_NUMBER_AND_INCR (mcnt, p);
+            DEBUG_PRINT3 ("  Setting 0x%x to %d.\n", p1, mcnt);
+	    STORE_NUMBER (p1, mcnt);
+            break;
+          }
+
+        case wordbound:
+          DEBUG_PRINT1 ("EXECUTING wordbound.\n");
+          if (AT_WORD_BOUNDARY (d))
+	    break;
+          goto fail;
+
+	case notwordbound:
+          DEBUG_PRINT1 ("EXECUTING notwordbound.\n");
+	  if (AT_WORD_BOUNDARY (d))
+	    goto fail;
+          break;
+
+	case wordbeg:
+          DEBUG_PRINT1 ("EXECUTING wordbeg.\n");
+	  if (WORDCHAR_P (d) && (AT_STRINGS_BEG (d) || !WORDCHAR_P (d - 1)))
+	    break;
+          goto fail;
+
+	case wordend:
+          DEBUG_PRINT1 ("EXECUTING wordend.\n");
+	  if (!AT_STRINGS_BEG (d) && WORDCHAR_P (d - 1)
+              && (!WORDCHAR_P (d) || AT_STRINGS_END (d)))
+	    break;
+          goto fail;
+
+#ifdef emacs
+#ifdef emacs19
+  	case before_dot:
+          DEBUG_PRINT1 ("EXECUTING before_dot.\n");
+ 	  if (PTR_CHAR_POS ((unsigned char *) d) >= point)
+  	    goto fail;
+  	  break;
+  
+  	case at_dot:
+          DEBUG_PRINT1 ("EXECUTING at_dot.\n");
+ 	  if (PTR_CHAR_POS ((unsigned char *) d) != point)
+  	    goto fail;
+  	  break;
+  
+  	case after_dot:
+          DEBUG_PRINT1 ("EXECUTING after_dot.\n");
+          if (PTR_CHAR_POS ((unsigned char *) d) <= point)
+  	    goto fail;
+  	  break;
+#else /* not emacs19 */
+	case at_dot:
+          DEBUG_PRINT1 ("EXECUTING at_dot.\n");
+	  if (PTR_CHAR_POS ((unsigned char *) d) + 1 != point)
+	    goto fail;
+	  break;
+#endif /* not emacs19 */
+
+	case syntaxspec:
+          DEBUG_PRINT2 ("EXECUTING syntaxspec %d.\n", mcnt);
+	  mcnt = *p++;
+	  goto matchsyntax;
+
+        case wordchar:
+          DEBUG_PRINT1 ("EXECUTING Emacs wordchar.\n");
+	  mcnt = (int) Sword;
+        matchsyntax:
+	  PREFETCH ();
+	  if (SYNTAX (*d++) != (enum syntaxcode) mcnt)
+            goto fail;
+          SET_REGS_MATCHED ();
+	  break;
+
+	case notsyntaxspec:
+          DEBUG_PRINT2 ("EXECUTING notsyntaxspec %d.\n", mcnt);
+	  mcnt = *p++;
+	  goto matchnotsyntax;
+
+        case notwordchar:
+          DEBUG_PRINT1 ("EXECUTING Emacs notwordchar.\n");
+	  mcnt = (int) Sword;
+        matchnotsyntax:
+	  PREFETCH ();
+	  if (SYNTAX (*d++) == (enum syntaxcode) mcnt)
+            goto fail;
+	  SET_REGS_MATCHED ();
+          break;
+
+#else /* not emacs */
+	case wordchar:
+          DEBUG_PRINT1 ("EXECUTING non-Emacs wordchar.\n");
+	  PREFETCH ();
+          if (!WORDCHAR_P (d))
+            goto fail;
+	  SET_REGS_MATCHED ();
+          d++;
+	  break;
+	  
+	case notwordchar:
+          DEBUG_PRINT1 ("EXECUTING non-Emacs notwordchar.\n");
+	  PREFETCH ();
+	  if (WORDCHAR_P (d))
+            goto fail;
+          SET_REGS_MATCHED ();
+          d++;
+	  break;
+#endif /* not emacs */
+          
+        default:
+          abort ();
+	}
+      continue;  /* Successfully executed one pattern command; keep going.  */
+
+
+    /* We goto here if a matching operation fails. */
+    fail:
+      if (!FAIL_STACK_EMPTY ())
+	{ /* A restart point is known.  Restore to that state.  */
+          DEBUG_PRINT1 ("\nFAIL:\n");
+          POP_FAILURE_POINT (d, p,
+                             lowest_active_reg, highest_active_reg,
+                             regstart, regend, reg_info);
+
+          /* If this failure point is a dummy, try the next one.  */
+          if (!p)
+	    goto fail;
+
+          /* If we failed to the end of the pattern, don't examine *p.  */
+	  assert (p <= pend);
+          if (p < pend)
+            {
+              boolean is_a_jump_n = false;
+              
+              /* If failed to a backwards jump that's part of a repetition
+                 loop, need to pop this failure point and use the next one.  */
+              switch ((re_opcode_t) *p)
+                {
+                case jump_n:
+                  is_a_jump_n = true;
+                case maybe_pop_jump:
+                case pop_failure_jump:
+                case jump:
+                  p1 = p + 1;
+                  EXTRACT_NUMBER_AND_INCR (mcnt, p1);
+                  p1 += mcnt;	
+
+                  if ((is_a_jump_n && (re_opcode_t) *p1 == succeed_n)
+                      || (!is_a_jump_n
+                          && (re_opcode_t) *p1 == on_failure_jump))
+                    goto fail;
+                  break;
+                default:
+                  /* do nothing */ ;
+                }
+            }
+
+          if (d >= string1 && d <= end1)
+	    dend = end_match_1;
+        }
+      else
+        break;   /* Matching at this starting point really fails.  */
+    } /* for (;;) */
+
+  if (best_regs_set)
+    goto restore_best_regs;
+
+  FREE_VARIABLES ();
+
+  return -1;         			/* Failure to match.  */
+} /* re_match_2 */
+
+/* Subroutine definitions for re_match_2.  */
+
+
+/* We are passed P pointing to a register number after a start_memory.
+   
+   Return true if the pattern up to the corresponding stop_memory can
+   match the empty string, and false otherwise.
+   
+   If we find the matching stop_memory, sets P to point to one past its number.
+   Otherwise, sets P to an undefined byte less than or equal to END.
+
+   We don't handle duplicates properly (yet).  */
+
+static boolean
+group_match_null_string_p (p, end, reg_info)
+    unsigned char **p, *end;
+    register_info_type *reg_info;
+{
+  int mcnt;
+  /* Point to after the args to the start_memory.  */
+  unsigned char *p1 = *p + 2;
+  
+  while (p1 < end)
+    {
+      /* Skip over opcodes that can match nothing, and return true or
+	 false, as appropriate, when we get to one that can't, or to the
+         matching stop_memory.  */
+      
+      switch ((re_opcode_t) *p1)
+        {
+        /* Could be either a loop or a series of alternatives.  */
+        case on_failure_jump:
+          p1++;
+          EXTRACT_NUMBER_AND_INCR (mcnt, p1);
+          
+          /* If the next operation is not a jump backwards in the
+	     pattern.  */
+
+	  if (mcnt >= 0)
+	    {
+              /* Go through the on_failure_jumps of the alternatives,
+                 seeing if any of the alternatives cannot match nothing.
+                 The last alternative starts with only a jump,
+                 whereas the rest start with on_failure_jump and end
+                 with a jump, e.g., here is the pattern for `a|b|c':
+
+                 /on_failure_jump/0/6/exactn/1/a/jump_past_alt/0/6
+                 /on_failure_jump/0/6/exactn/1/b/jump_past_alt/0/3
+                 /exactn/1/c						
+
+                 So, we have to first go through the first (n-1)
+                 alternatives and then deal with the last one separately.  */
+
+
+              /* Deal with the first (n-1) alternatives, which start
+                 with an on_failure_jump (see above) that jumps to right
+                 past a jump_past_alt.  */
+
+              while ((re_opcode_t) p1[mcnt-3] == jump_past_alt)
+                {
+                  /* `mcnt' holds how many bytes long the alternative
+                     is, including the ending `jump_past_alt' and
+                     its number.  */
+
+                  if (!alt_match_null_string_p (p1, p1 + mcnt - 3, 
+				                      reg_info))
+                    return false;
+
+                  /* Move to right after this alternative, including the
+		     jump_past_alt.  */
+                  p1 += mcnt;	
+
+                  /* Break if it's the beginning of an n-th alternative
+                     that doesn't begin with an on_failure_jump.  */
+                  if ((re_opcode_t) *p1 != on_failure_jump)
+                    break;
+		
+		  /* Still have to check that it's not an n-th
+		     alternative that starts with an on_failure_jump.  */
+		  p1++;
+                  EXTRACT_NUMBER_AND_INCR (mcnt, p1);
+                  if ((re_opcode_t) p1[mcnt-3] != jump_past_alt)
+                    {
+		      /* Get to the beginning of the n-th alternative.  */
+                      p1 -= 3;
+                      break;
+                    }
+                }
+
+              /* Deal with the last alternative: go back and get number
+                 of the `jump_past_alt' just before it.  `mcnt' contains
+                 the length of the alternative.  */
+              EXTRACT_NUMBER (mcnt, p1 - 2);
+
+              if (!alt_match_null_string_p (p1, p1 + mcnt, reg_info))
+                return false;
+
+              p1 += mcnt;	/* Get past the n-th alternative.  */
+            } /* if mcnt > 0 */
+          break;
+
+          
+        case stop_memory:
+	  assert (p1[1] == **p);
+          *p = p1 + 2;
+          return true;
+
+        
+        default: 
+          if (!common_op_match_null_string_p (&p1, end, reg_info))
+            return false;
+        }
+    } /* while p1 < end */
+
+  return false;
+} /* group_match_null_string_p */
+
+
+/* Similar to group_match_null_string_p, but doesn't deal with alternatives:
+   It expects P to be the first byte of a single alternative and END one
+   byte past the last. The alternative can contain groups.  */
+   
+static boolean
+alt_match_null_string_p (p, end, reg_info)
+    unsigned char *p, *end;
+    register_info_type *reg_info;
+{
+  int mcnt;
+  unsigned char *p1 = p;
+  
+  while (p1 < end)
+    {
+      /* Skip over opcodes that can match nothing, and break when we get 
+         to one that can't.  */
+      
+      switch ((re_opcode_t) *p1)
+        {
+	/* It's a loop.  */
+        case on_failure_jump:
+          p1++;
+          EXTRACT_NUMBER_AND_INCR (mcnt, p1);
+          p1 += mcnt;
+          break;
+          
+	default: 
+          if (!common_op_match_null_string_p (&p1, end, reg_info))
+            return false;
+        }
+    }  /* while p1 < end */
+
+  return true;
+} /* alt_match_null_string_p */
+
+
+/* Deals with the ops common to group_match_null_string_p and
+   alt_match_null_string_p.  
+   
+   Sets P to one after the op and its arguments, if any.  */
+
+static boolean
+common_op_match_null_string_p (p, end, reg_info)
+    unsigned char **p, *end;
+    register_info_type *reg_info;
+{
+  int mcnt;
+  boolean ret;
+  int reg_no;
+  unsigned char *p1 = *p;
+
+  switch ((re_opcode_t) *p1++)
+    {
+    case no_op:
+    case begline:
+    case endline:
+    case begbuf:
+    case endbuf:
+    case wordbeg:
+    case wordend:
+    case wordbound:
+    case notwordbound:
+#ifdef emacs
+    case before_dot:
+    case at_dot:
+    case after_dot:
+#endif
+      break;
+
+    case start_memory:
+      reg_no = *p1;
+      assert (reg_no > 0 && reg_no <= MAX_REGNUM);
+      ret = group_match_null_string_p (&p1, end, reg_info);
+      
+      /* Have to set this here in case we're checking a group which
+         contains a group and a back reference to it.  */
+
+      if (REG_MATCH_NULL_STRING_P (reg_info[reg_no]) == MATCH_NULL_UNSET_VALUE)
+        REG_MATCH_NULL_STRING_P (reg_info[reg_no]) = ret;
+
+      if (!ret)
+        return false;
+      break;
+          
+    /* If this is an optimized succeed_n for zero times, make the jump.  */
+    case jump:
+      EXTRACT_NUMBER_AND_INCR (mcnt, p1);
+      if (mcnt >= 0)
+        p1 += mcnt;
+      else
+        return false;
+      break;
+
+    case succeed_n:
+      /* Get to the number of times to succeed.  */
+      p1 += 2;		
+      EXTRACT_NUMBER_AND_INCR (mcnt, p1);
+
+      if (mcnt == 0)
+        {
+          p1 -= 4;
+          EXTRACT_NUMBER_AND_INCR (mcnt, p1);
+          p1 += mcnt;
+        }
+      else
+        return false;
+      break;
+
+    case duplicate: 
+      if (!REG_MATCH_NULL_STRING_P (reg_info[*p1]))
+        return false;
+      break;
+
+    case set_number_at:
+      p1 += 4;
+
+    default:
+      /* All other opcodes mean we cannot match the empty string.  */
+      return false;
+  }
+
+  *p = p1;
+  return true;
+} /* common_op_match_null_string_p */
+
+
+/* Return zero if TRANSLATE[S1] and TRANSLATE[S2] are identical for LEN
+   bytes; nonzero otherwise.  */
+   
+static int
+bcmp_translate (s1, s2, len, translate)
+     unsigned char *s1, *s2;
+     register int len;
+     char *translate;
+{
+  register unsigned char *p1 = s1, *p2 = s2;
+  while (len)
+    {
+      if (translate[*p1++] != translate[*p2++]) return 1;
+      len--;
+    }
+  return 0;
+}
+
+/* Entry points for GNU code.  */
+
+/* re_compile_pattern is the GNU regular expression compiler: it
+   compiles PATTERN (of length SIZE) and puts the result in BUFP.
+   Returns 0 if the pattern was valid, otherwise an error string.
+   
+   Assumes the `allocated' (and perhaps `buffer') and `translate' fields
+   are set in BUFP on entry.
+   
+   We call regex_compile to do the actual compilation.  */
+
+const char *
+re_compile_pattern (pattern, length, bufp)
+     const char *pattern;
+     int length;
+     struct re_pattern_buffer *bufp;
+{
+  reg_errcode_t ret;
+  
+  /* GNU code is written to assume at least RE_NREGS registers will be set
+     (and at least one extra will be -1).  */
+  bufp->regs_allocated = REGS_UNALLOCATED;
+  
+  /* And GNU code determines whether or not to get register information
+     by passing null for the REGS argument to re_match, etc., not by
+     setting no_sub.  */
+  bufp->no_sub = 0;
+  
+  /* Match anchors at newline.  */
+  bufp->newline_anchor = 1;
+  
+  ret = regex_compile (pattern, length, re_syntax_options, bufp);
+
+  return (ret == 0) ? (const char*)NULL : re_error_msg[(int) ret];
+}     
+
+/* Entry points compatible with 4.2 BSD regex library.  We don't define
+   them if this is an Emacs or POSIX compilation.  */
+
+#if !defined (emacs) && !defined (_POSIX_SOURCE)
+
+/* BSD has one and only one pattern buffer.  */
+static struct re_pattern_buffer re_comp_buf;
+
+char *
+re_comp (s)
+    const char *s;
+{
+  reg_errcode_t ret;
+  
+  if (!s)
+    {
+      if (!re_comp_buf.buffer)
+	return "No previous regular expression";
+      return 0;
+    }
+
+  if (!re_comp_buf.buffer)
+    {
+      re_comp_buf.buffer = (unsigned char *) malloc (200);
+      if (re_comp_buf.buffer == NULL)
+        return "Memory exhausted";
+      re_comp_buf.allocated = 200;
+
+      re_comp_buf.fastmap = (char *) malloc (1 << BYTEWIDTH);
+      if (re_comp_buf.fastmap == NULL)
+	return "Memory exhausted";
+    }
+
+  /* Since `re_exec' always passes NULL for the `regs' argument, we
+     don't need to initialize the pattern buffer fields which affect it.  */
+
+  /* Match anchors at newlines.  */
+  re_comp_buf.newline_anchor = 1;
+
+  ret = regex_compile (s, strlen (s), re_syntax_options, &re_comp_buf);
+  
+  /* Yes, we're discarding `const' here.  */
+  return (char *) re_error_msg[(int) ret];
+}
+
+
+int
+re_exec (s)
+    const char *s;
+{
+  const int len = strlen (s);
+  return
+    0 <= re_search (&re_comp_buf, s, len, 0, len, (struct re_registers *) 0);
+}
+#endif /* not emacs and not _POSIX_SOURCE */
+
+/* POSIX.2 functions.  Don't define these for Emacs.  */
+
+#ifndef emacs
+
+/* regcomp takes a regular expression as a string and compiles it.
+
+   PREG is a regex_t *.  We do not expect any fields to be initialized,
+   since POSIX says we shouldn't.  Thus, we set
+
+     `buffer' to the compiled pattern;
+     `used' to the length of the compiled pattern;
+     `syntax' to RE_SYNTAX_POSIX_EXTENDED if the
+       REG_EXTENDED bit in CFLAGS is set; otherwise, to
+       RE_SYNTAX_POSIX_BASIC;
+     `newline_anchor' to REG_NEWLINE being set in CFLAGS;
+     `fastmap' and `fastmap_accurate' to zero;
+     `re_nsub' to the number of subexpressions in PATTERN.
+
+   PATTERN is the address of the pattern string.
+
+   CFLAGS is a series of bits which affect compilation.
+
+     If REG_EXTENDED is set, we use POSIX extended syntax; otherwise, we
+     use POSIX basic syntax.
+
+     If REG_NEWLINE is set, then . and [^...] don't match newline.
+     Also, regexec will try a match beginning after every newline.
+
+     If REG_ICASE is set, then we considers upper- and lowercase
+     versions of letters to be equivalent when matching.
+
+     If REG_NOSUB is set, then when PREG is passed to regexec, that
+     routine will report only success or failure, and nothing about the
+     registers.
+
+   It returns 0 if it succeeds, nonzero if it doesn't.  (See regex.h for
+   the return codes and their meanings.)  */
+
+int
+regcomp (preg, pattern, cflags)
+    regex_t *preg;
+    const char *pattern; 
+    int cflags;
+{
+  reg_errcode_t ret;
+  unsigned syntax
+    = (cflags & REG_EXTENDED) ?
+      RE_SYNTAX_POSIX_EXTENDED : RE_SYNTAX_POSIX_BASIC;
+
+  /* regex_compile will allocate the space for the compiled pattern.  */
+  preg->buffer = 0;
+  preg->allocated = 0;
+  
+  /* Don't bother to use a fastmap when searching.  This simplifies the
+     REG_NEWLINE case: if we used a fastmap, we'd have to put all the
+     characters after newlines into the fastmap.  This way, we just try
+     every character.  */
+  preg->fastmap = 0;
+  
+  if (cflags & REG_ICASE)
+    {
+      unsigned i;
+      
+      preg->translate = (char *) malloc (CHAR_SET_SIZE);
+      if (preg->translate == NULL)
+        return (int) REG_ESPACE;
+
+      /* Map uppercase characters to corresponding lowercase ones.  */
+      for (i = 0; i < CHAR_SET_SIZE; i++)
+        preg->translate[i] = (unsigned char)(ISUPPER (i) ? tolower (i) : i);
+    }
+  else
+    preg->translate = NULL;
+
+  /* If REG_NEWLINE is set, newlines are treated differently.  */
+  if (cflags & REG_NEWLINE)
+    { /* REG_NEWLINE implies neither . nor [^...] match newline.  */
+      syntax &= ~RE_DOT_NEWLINE;
+      syntax |= RE_HAT_LISTS_NOT_NEWLINE;
+      /* It also changes the matching behavior.  */
+      preg->newline_anchor = 1;
+    }
+  else
+    preg->newline_anchor = 0;
+
+  preg->no_sub = !!(cflags & REG_NOSUB);
+
+  /* POSIX says a null character in the pattern terminates it, so we 
+     can use strlen here in compiling the pattern.  */
+  ret = regex_compile (pattern, strlen (pattern), syntax, preg);
+  
+  /* POSIX doesn't distinguish between an unmatched open-group and an
+     unmatched close-group: both are REG_EPAREN.  */
+  if (ret == REG_ERPAREN) ret = REG_EPAREN;
+  
+  return (int) ret;
+}
+
+
+/* regexec searches for a given pattern, specified by PREG, in the
+   string STRING.
+   
+   If NMATCH is zero or REG_NOSUB was set in the cflags argument to
+   `regcomp', we ignore PMATCH.  Otherwise, we assume PMATCH has at
+   least NMATCH elements, and we set them to the offsets of the
+   corresponding matched substrings.
+   
+   EFLAGS specifies `execution flags' which affect matching: if
+   REG_NOTBOL is set, then ^ does not match at the beginning of the
+   string; if REG_NOTEOL is set, then $ does not match at the end.
+   
+   We return 0 if we find a match and REG_NOMATCH if not.  */
+
+int
+regexec (preg, string, nmatch, pmatch, eflags)
+    const regex_t *preg;
+    const char *string; 
+    size_t nmatch; 
+    regmatch_t pmatch[]; 
+    int eflags;
+{
+  int ret;
+  struct re_registers regs;
+  regex_t private_preg;
+  int len = strlen (string);
+  boolean want_reg_info = !preg->no_sub && nmatch > 0;
+
+  private_preg = *preg;
+  
+  private_preg.not_bol = !!(eflags & REG_NOTBOL);
+  private_preg.not_eol = !!(eflags & REG_NOTEOL);
+  
+  /* The user has told us exactly how many registers to return
+     information about, via `nmatch'.  We have to pass that on to the
+     matching routines.  */
+  private_preg.regs_allocated = REGS_FIXED;
+  
+  if (want_reg_info)
+    {
+      regs.num_regs = nmatch;
+      regs.start = TALLOC (nmatch, regoff_t);
+      regs.end = TALLOC (nmatch, regoff_t);
+      if (regs.start == NULL || regs.end == NULL)
+        return (int) REG_NOMATCH;
+    }
+
+  /* Perform the searching operation.  */
+  ret = re_search (&private_preg, string, len,
+                   /* start: */ 0, /* range: */ len,
+                   want_reg_info ? &regs : (struct re_registers *) 0);
+  
+  /* Copy the register information to the POSIX structure.  */
+  if (want_reg_info)
+    {
+      if (ret >= 0)
+        {
+          unsigned r;
+
+          for (r = 0; r < nmatch; r++)
+            {
+              pmatch[r].rm_so = regs.start[r];
+              pmatch[r].rm_eo = regs.end[r];
+            }
+        }
+
+      /* If we needed the temporary register info, free the space now.  */
+      free (regs.start);
+      free (regs.end);
+    }
+
+  /* We want zero return to mean success, unlike `re_search'.  */
+  return ret >= 0 ? (int) REG_NOERROR : (int) REG_NOMATCH;
+}
+
+
+/* Returns a message corresponding to an error code, ERRCODE, returned
+   from either regcomp or regexec.   We don't use PREG here.  */
+
+size_t
+regerror (errcode, preg, errbuf, errbuf_size)
+    int errcode;
+    const regex_t *preg;
+    char *errbuf;
+    size_t errbuf_size;
+{
+# define _RERR_(n,t)  sizeof( t ),
+  static const size_t aSizes[] = { REG_ERR_TABLE };
+# undef _RERR_
+  const char* msg;
+  size_t      msg_size;
+
+  if ((unsigned)errcode >= (int)REG_ERR_COUNT)
+    /* Only error codes returned by the rest of the code should be passed 
+       to this routine.  If we are given anything else, or if other regex
+       code generates an invalid error code, then the program has a bug.
+       Dump core so we can fix it.  */
+    abort ();
+
+  msg      = re_error_msg[ errcode ];
+  msg_size = aSizes[ errcode ];
+
+  if (msg_size >= errbuf_size)
+    {
+      strncpy (errbuf, msg, errbuf_size - 1);
+      errbuf[errbuf_size - 1] = 0;
+    }
+  else
+    strcpy (errbuf, msg);
+
+  return msg_size;
+#ifdef __TANDEM
+/*
+ *  WARN 93: no reference to identifier "preg"
+ */
+#pragma NOWARN( 93 )
+#endif
+}
+#ifdef __TANDEM
+#pragma WARN( 93 )
+#endif
+
+
+/* Free dynamically allocated space used by PREG.  */
+
+void
+regfree (preg)
+    regex_t *preg;
+{
+  if (preg->buffer != NULL)
+    free (preg->buffer);
+  preg->buffer = NULL;
+  
+  preg->allocated = 0;
+  preg->used = 0;
+
+  if (preg->fastmap != NULL)
+    free (preg->fastmap);
+  preg->fastmap = NULL;
+  preg->fastmap_accurate = 0;
+
+  if (preg->translate != NULL)
+    free (preg->translate);
+  preg->translate = NULL;
+}
+
+#endif /* not emacs  */
+
+/*
+Local variables:
+make-backup-files: t
+version-control: t
+trim-versions-without-asking: nil
+End:
+*/
diff --git a/gcc/fixinc/regex.h b/gcc/fixinc/regex.h
new file mode 100644
index 0000000..bc4ec2e
--- /dev/null
+++ b/gcc/fixinc/regex.h
@@ -0,0 +1,503 @@
+/* Definitions for data structures and routines for the regular
+   expression library, version 0.12.
+
+   Copyright (C) 1985, 1989, 1990, 1991, 1992, 1993 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+
+/* $Id: regex.h,v 1.3 1999/01/11 13:34:25 law Exp $ */
+
+#ifndef __REGEXP_LIBRARY_H__
+#define __REGEXP_LIBRARY_H__
+
+/* POSIX says that <sys/types.h> must be included (by the caller) before
+   <regex.h>.  */
+
+#ifdef VMS
+/* VMS doesn't have `size_t' in <sys/types.h>, even though POSIX says it
+   should be there.  */
+#include <stddef.h>
+#endif
+
+
+/* The following bits are used to determine the regexp syntax we
+   recognize.  The set/not-set meanings are chosen so that Emacs syntax
+   remains the value 0.  The bits are given in alphabetical order, and
+   the definitions shifted by one from the previous bit; thus, when we
+   add or remove a bit, only one other definition need change.  */
+typedef unsigned reg_syntax_t;
+
+/* If this bit is not set, then \ inside a bracket expression is literal.
+   If set, then such a \ quotes the following character.  */
+#define RE_BACKSLASH_ESCAPE_IN_LISTS (1)
+
+/* If this bit is not set, then + and ? are operators, and \+ and \? are
+     literals. 
+   If set, then \+ and \? are operators and + and ? are literals.  */
+#define RE_BK_PLUS_QM (RE_BACKSLASH_ESCAPE_IN_LISTS << 1)
+
+/* If this bit is set, then character classes are supported.  They are:
+     [:alpha:], [:upper:], [:lower:],  [:digit:], [:alnum:], [:xdigit:],
+     [:space:], [:print:], [:punct:], [:graph:], and [:cntrl:].
+   If not set, then character classes are not supported.  */
+#define RE_CHAR_CLASSES (RE_BK_PLUS_QM << 1)
+
+/* If this bit is set, then ^ and $ are always anchors (outside bracket
+     expressions, of course).
+   If this bit is not set, then it depends:
+        ^  is an anchor if it is at the beginning of a regular
+           expression or after an open-group or an alternation operator;
+        $  is an anchor if it is at the end of a regular expression, or
+           before a close-group or an alternation operator.  
+
+   This bit could be (re)combined with RE_CONTEXT_INDEP_OPS, because
+   POSIX draft 11.2 says that * etc. in leading positions is undefined.
+   We already implemented a previous draft which made those constructs
+   invalid, though, so we haven't changed the code back.  */
+#define RE_CONTEXT_INDEP_ANCHORS (RE_CHAR_CLASSES << 1)
+
+/* If this bit is set, then special characters are always special
+     regardless of where they are in the pattern.
+   If this bit is not set, then special characters are special only in
+     some contexts; otherwise they are ordinary.  Specifically, 
+     * + ? and intervals are only special when not after the beginning,
+     open-group, or alternation operator.  */
+#define RE_CONTEXT_INDEP_OPS (RE_CONTEXT_INDEP_ANCHORS << 1)
+
+/* If this bit is set, then *, +, ?, and { cannot be first in an re or
+     immediately after an alternation or begin-group operator.  */
+#define RE_CONTEXT_INVALID_OPS (RE_CONTEXT_INDEP_OPS << 1)
+
+/* If this bit is set, then . matches newline.
+   If not set, then it doesn't.  */
+#define RE_DOT_NEWLINE (RE_CONTEXT_INVALID_OPS << 1)
+
+/* If this bit is set, then . doesn't match NUL.
+   If not set, then it does.  */
+#define RE_DOT_NOT_NULL (RE_DOT_NEWLINE << 1)
+
+/* If this bit is set, nonmatching lists [^...] do not match newline.
+   If not set, they do.  */
+#define RE_HAT_LISTS_NOT_NEWLINE (RE_DOT_NOT_NULL << 1)
+
+/* If this bit is set, either \{...\} or {...} defines an
+     interval, depending on RE_NO_BK_BRACES. 
+   If not set, \{, \}, {, and } are literals.  */
+#define RE_INTERVALS (RE_HAT_LISTS_NOT_NEWLINE << 1)
+
+/* If this bit is set, +, ? and | aren't recognized as operators.
+   If not set, they are.  */
+#define RE_LIMITED_OPS (RE_INTERVALS << 1)
+
+/* If this bit is set, newline is an alternation operator.
+   If not set, newline is literal.  */
+#define RE_NEWLINE_ALT (RE_LIMITED_OPS << 1)
+
+/* If this bit is set, then `{...}' defines an interval, and \{ and \}
+     are literals.
+  If not set, then `\{...\}' defines an interval.  */
+#define RE_NO_BK_BRACES (RE_NEWLINE_ALT << 1)
+
+/* If this bit is set, (...) defines a group, and \( and \) are literals.
+   If not set, \(...\) defines a group, and ( and ) are literals.  */
+#define RE_NO_BK_PARENS (RE_NO_BK_BRACES << 1)
+
+/* If this bit is set, then \<digit> matches <digit>.
+   If not set, then \<digit> is a back-reference.  */
+#define RE_NO_BK_REFS (RE_NO_BK_PARENS << 1)
+
+/* If this bit is set, then | is an alternation operator, and \| is literal. 
+   If not set, then \| is an alternation operator, and | is literal.  */
+#define RE_NO_BK_VBAR (RE_NO_BK_REFS << 1)
+
+/* If this bit is set, then an ending range point collating higher
+     than the starting range point, as in [z-a], is invalid.
+   If not set, then when ending range point collates higher than the
+     starting range point, the range is ignored.  */
+#define RE_NO_EMPTY_RANGES (RE_NO_BK_VBAR << 1)
+
+/* If this bit is set, then an unmatched ) is ordinary.
+   If not set, then an unmatched ) is invalid.  */
+#define RE_UNMATCHED_RIGHT_PAREN_ORD (RE_NO_EMPTY_RANGES << 1)
+
+/* This global variable defines the particular regexp syntax to use (for
+   some interfaces).  When a regexp is compiled, the syntax used is
+   stored in the pattern buffer, so changing this does not affect
+   already-compiled regexps.  */
+extern reg_syntax_t re_syntax_options;
+
+/* Define combinations of the above bits for the standard possibilities.
+   (The [[[ comments delimit what gets put into the Texinfo file, so
+   don't delete them!)  */ 
+/* [[[begin syntaxes]]] */
+#define RE_SYNTAX_EMACS 0
+
+#define RE_SYNTAX_AWK							\
+  (RE_BACKSLASH_ESCAPE_IN_LISTS | RE_DOT_NOT_NULL			\
+   | RE_NO_BK_PARENS            | RE_NO_BK_REFS				\
+   | RE_NO_BK_VBAR               | RE_NO_EMPTY_RANGES			\
+   | RE_UNMATCHED_RIGHT_PAREN_ORD)
+
+#define RE_SYNTAX_POSIX_AWK 						\
+  (RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS)
+
+#define RE_SYNTAX_GREP							\
+  (RE_BK_PLUS_QM              | RE_CHAR_CLASSES				\
+   | RE_HAT_LISTS_NOT_NEWLINE | RE_INTERVALS				\
+   | RE_NEWLINE_ALT)
+
+#define RE_SYNTAX_EGREP							\
+  (RE_CHAR_CLASSES        | RE_CONTEXT_INDEP_ANCHORS			\
+   | RE_CONTEXT_INDEP_OPS | RE_HAT_LISTS_NOT_NEWLINE			\
+   | RE_NEWLINE_ALT       | RE_NO_BK_PARENS				\
+   | RE_NO_BK_VBAR)
+
+#define RE_SYNTAX_POSIX_EGREP						\
+  (RE_SYNTAX_EGREP | RE_INTERVALS | RE_NO_BK_BRACES)
+
+/* P1003.2/D11.2, section 4.20.7.1, lines 5078ff.  */
+#define RE_SYNTAX_ED RE_SYNTAX_POSIX_BASIC
+
+#define RE_SYNTAX_SED RE_SYNTAX_POSIX_BASIC
+
+/* Syntax bits common to both basic and extended POSIX regex syntax.  */
+#define _RE_SYNTAX_POSIX_COMMON						\
+  (RE_CHAR_CLASSES | RE_DOT_NEWLINE      | RE_DOT_NOT_NULL		\
+   | RE_INTERVALS  | RE_NO_EMPTY_RANGES)
+
+#define RE_SYNTAX_POSIX_BASIC						\
+  (_RE_SYNTAX_POSIX_COMMON | RE_BK_PLUS_QM)
+
+/* Differs from ..._POSIX_BASIC only in that RE_BK_PLUS_QM becomes
+   RE_LIMITED_OPS, i.e., \? \+ \| are not recognized.  Actually, this
+   isn't minimal, since other operators, such as \`, aren't disabled.  */
+#define RE_SYNTAX_POSIX_MINIMAL_BASIC					\
+  (_RE_SYNTAX_POSIX_COMMON | RE_LIMITED_OPS)
+
+#define RE_SYNTAX_POSIX_EXTENDED					\
+  (_RE_SYNTAX_POSIX_COMMON | RE_CONTEXT_INDEP_ANCHORS			\
+   | RE_CONTEXT_INDEP_OPS  | RE_NO_BK_BRACES				\
+   | RE_NO_BK_PARENS       | RE_NO_BK_VBAR				\
+   | RE_UNMATCHED_RIGHT_PAREN_ORD)
+
+/* Differs from ..._POSIX_EXTENDED in that RE_CONTEXT_INVALID_OPS
+   replaces RE_CONTEXT_INDEP_OPS and RE_NO_BK_REFS is added.  */
+#define RE_SYNTAX_POSIX_MINIMAL_EXTENDED				\
+  (_RE_SYNTAX_POSIX_COMMON  | RE_CONTEXT_INDEP_ANCHORS			\
+   | RE_CONTEXT_INVALID_OPS | RE_NO_BK_BRACES				\
+   | RE_NO_BK_PARENS        | RE_NO_BK_REFS				\
+   | RE_NO_BK_VBAR	    | RE_UNMATCHED_RIGHT_PAREN_ORD)
+/* [[[end syntaxes]]] */
+
+/* Maximum number of duplicates an interval can allow.  Some systems
+   (erroneously) define this in other header files, but we want our
+   value, so remove any previous define.  */
+#ifdef RE_DUP_MAX
+#undef RE_DUP_MAX
+#endif
+#define RE_DUP_MAX ((1 << 15) - 1) 
+
+
+/* POSIX `cflags' bits (i.e., information for `regcomp').  */
+
+/* If this bit is set, then use extended regular expression syntax.
+   If not set, then use basic regular expression syntax.  */
+#define REG_EXTENDED 1
+
+/* If this bit is set, then ignore case when matching.
+   If not set, then case is significant.  */
+#define REG_ICASE (REG_EXTENDED << 1)
+ 
+/* If this bit is set, then anchors do not match at newline
+     characters in the string.
+   If not set, then anchors do match at newlines.  */
+#define REG_NEWLINE (REG_ICASE << 1)
+
+/* If this bit is set, then report only success or fail in regexec.
+   If not set, then returns differ between not matching and errors.  */
+#define REG_NOSUB (REG_NEWLINE << 1)
+
+
+/* POSIX `eflags' bits (i.e., information for regexec).  */
+
+/* If this bit is set, then the beginning-of-line operator doesn't match
+     the beginning of the string (presumably because it's not the
+     beginning of a line).
+   If not set, then the beginning-of-line operator does match the
+     beginning of the string.  */
+#define REG_NOTBOL 1
+
+/* Like REG_NOTBOL, except for the end-of-line.  */
+#define REG_NOTEOL (1 << 1)
+
+
+  /* POSIX doesn't require that we do anything for the 0 case,
+     but why not be nice.  */
+
+#define REG_ERR_TABLE                                           \
+  _RERR_( NOERROR,   "Success" )                                \
+  _RERR_( NOMATCH,   "No match" )                               \
+  /*                                                            \
+   *  POSIX regcomp return error codes.                         \
+   *  (In the order listed in the standard.)                    \
+   */                                                           \
+  _RERR_( BADPAT,    "Invalid regular expression" )             \
+  _RERR_( ECOLLATE,  "Invalid collation character" )            \
+  _RERR_( ECTYPE,    "Invalid character class name" )           \
+  _RERR_( EESCAPE,   "Trailing backslash" )                     \
+  _RERR_( ESUBREG,   "Invalid back reference" )                 \
+  _RERR_( EBRACK,    "Unmatched [ or [^" )                      \
+  _RERR_( EPAREN,    "Unmatched ( or \\(" )                     \
+  _RERR_( EBRACE,    "Unmatched \\{" )                          \
+  _RERR_( BADBR,     "Invalid content of \\{\\}" )              \
+  _RERR_( ERANGE,    "Invalid range end" )                      \
+  _RERR_( ESPACE,    "Memory exhausted" )                       \
+  _RERR_( BADRPT,    "Invalid preceding regular expression" )   \
+  _RERR_( ECHAR,     "Invalid multibyte character" )            \
+  _RERR_( EBOL,      "^ anchor and not BOL" )                   \
+  _RERR_( EEOL,      "$ anchor and not EOL" )                   \
+                                                                \
+  /*                                                            \
+   * Error codes we've added.                                   \
+   */                                                           \
+  _RERR_( EEND,      "Premature end of regular expression" )    \
+  _RERR_( ESIZE,     "Regular expression too big" )             \
+  _RERR_( ERPAREN,   "Unmatched ) or \\)" )
+
+#define _RERR_(n,t)  REG_ ## n,
+
+typedef enum { REG_ERR_TABLE REG_ERR_COUNT } reg_errcode_t;
+
+#undef _RERR_
+
+/* This data structure represents a compiled pattern.  Before calling
+   the pattern compiler, the fields `buffer', `allocated', `fastmap',
+   `translate', and `no_sub' can be set.  After the pattern has been
+   compiled, the `re_nsub' field is available.  All other fields are
+   private to the regex routines.  */
+
+struct re_pattern_buffer
+{
+/* [[[begin pattern_buffer]]] */
+	/* Space that holds the compiled pattern.  It is declared as
+          `unsigned char *' because its elements are
+           sometimes used as array indexes.  */
+  unsigned char *buffer;
+
+	/* Number of bytes to which `buffer' points.  */
+  unsigned long allocated;
+
+	/* Number of bytes actually used in `buffer'.  */
+  unsigned long used;	
+
+        /* Syntax setting with which the pattern was compiled.  */
+  reg_syntax_t syntax;
+
+        /* Pointer to a fastmap, if any, otherwise zero.  re_search uses
+           the fastmap, if there is one, to skip over impossible
+           starting points for matches.  */
+  char *fastmap;
+
+        /* Either a translate table to apply to all characters before
+           comparing them, or zero for no translation.  The translation
+           is applied to a pattern when it is compiled and to a string
+           when it is matched.  */
+  char *translate;
+
+	/* Number of subexpressions found by the compiler.  */
+  size_t re_nsub;
+
+        /* Zero if this pattern cannot match the empty string, one else.
+           Well, in truth it's used only in `re_search_2', to see
+           whether or not we should use the fastmap, so we don't set
+           this absolutely perfectly; see `re_compile_fastmap' (the
+           `duplicate' case).  */
+  unsigned can_be_null : 1;
+
+        /* If REGS_UNALLOCATED, allocate space in the `regs' structure
+             for `max (RE_NREGS, re_nsub + 1)' groups.
+           If REGS_REALLOCATE, reallocate space if necessary.
+           If REGS_FIXED, use what's there.  */
+#define REGS_UNALLOCATED 0
+#define REGS_REALLOCATE 1
+#define REGS_FIXED 2
+  unsigned regs_allocated : 2;
+
+        /* Set to zero when `regex_compile' compiles a pattern; set to one
+           by `re_compile_fastmap' if it updates the fastmap.  */
+  unsigned fastmap_accurate : 1;
+
+        /* If set, `re_match_2' does not return information about
+           subexpressions.  */
+  unsigned no_sub : 1;
+
+        /* If set, a beginning-of-line anchor doesn't match at the
+           beginning of the string.  */ 
+  unsigned not_bol : 1;
+
+        /* Similarly for an end-of-line anchor.  */
+  unsigned not_eol : 1;
+
+        /* If true, an anchor at a newline matches.  */
+  unsigned newline_anchor : 1;
+
+/* [[[end pattern_buffer]]] */
+};
+
+typedef struct re_pattern_buffer regex_t;
+
+
+/* search.c (search_buffer) in Emacs needs this one opcode value.  It is
+   defined both in `regex.c' and here.  */
+#define RE_EXACTN_VALUE 1
+
+/* Type for byte offsets within the string.  POSIX mandates this.  */
+typedef int regoff_t;
+
+
+/* This is the structure we store register match data in.  See
+   regex.texinfo for a full description of what registers match.  */
+struct re_registers
+{
+  unsigned num_regs;
+  regoff_t *start;
+  regoff_t *end;
+};
+
+
+/* If `regs_allocated' is REGS_UNALLOCATED in the pattern buffer,
+   `re_match_2' returns information about at least this many registers
+   the first time a `regs' structure is passed.  */
+#ifndef RE_NREGS
+#define RE_NREGS 30
+#endif
+
+
+/* POSIX specification for registers.  Aside from the different names than
+   `re_registers', POSIX uses an array of structures, instead of a
+   structure of arrays.  */
+typedef struct
+{
+  regoff_t rm_so;  /* Byte offset from string's start to substring's start.  */
+  regoff_t rm_eo;  /* Byte offset from string's start to substring's end.  */
+} regmatch_t;
+
+/* Declarations for routines.  */
+
+/* To avoid duplicating every routine declaration -- once with a
+   prototype (if we are ANSI), and once without (if we aren't) -- we
+   use the following macro to declare argument types.  This
+   unfortunately clutters up the declarations a bit, but I think it's
+   worth it.  */
+
+#if __STDC__
+
+#define _RE_ARGS(args) args
+
+#else /* not __STDC__ */
+
+#define _RE_ARGS(args) ()
+
+#endif /* not __STDC__ */
+
+/* Sets the current default syntax to SYNTAX, and return the old syntax.
+   You can also simply assign to the `re_syntax_options' variable.  */
+extern reg_syntax_t re_set_syntax _RE_ARGS ((reg_syntax_t syntax));
+
+/* Compile the regular expression PATTERN, with length LENGTH
+   and syntax given by the global `re_syntax_options', into the buffer
+   BUFFER.  Return NULL if successful, and an error string if not.  */
+extern const char *re_compile_pattern
+  _RE_ARGS ((const char *pattern, int length,
+             struct re_pattern_buffer *buffer));
+
+
+/* Compile a fastmap for the compiled pattern in BUFFER; used to
+   accelerate searches.  Return 0 if successful and -2 if was an
+   internal error.  */
+extern int re_compile_fastmap _RE_ARGS ((struct re_pattern_buffer *buffer));
+
+
+/* Search in the string STRING (with length LENGTH) for the pattern
+   compiled into BUFFER.  Start searching at position START, for RANGE
+   characters.  Return the starting position of the match, -1 for no
+   match, or -2 for an internal error.  Also return register
+   information in REGS (if REGS and BUFFER->no_sub are nonzero).  */
+extern int re_search
+  _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string,
+            int length, int start, int range, struct re_registers *regs));
+
+
+/* Like `re_search', but search in the concatenation of STRING1 and
+   STRING2.  Also, stop searching at index START + STOP.  */
+extern int re_search_2
+  _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string1,
+             int length1, const char *string2, int length2,
+             int start, int range, struct re_registers *regs, int stop));
+
+
+/* Like `re_search', but return how many characters in STRING the regexp
+   in BUFFER matched, starting at position START.  */
+extern int re_match
+  _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string,
+             int length, int start, struct re_registers *regs));
+
+
+/* Relates to `re_match' as `re_search_2' relates to `re_search'.  */
+extern int re_match_2 
+  _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string1,
+             int length1, const char *string2, int length2,
+             int start, struct re_registers *regs, int stop));
+
+
+/* Set REGS to hold NUM_REGS registers, storing them in STARTS and
+   ENDS.  Subsequent matches using BUFFER and REGS will use this memory
+   for recording register information.  STARTS and ENDS must be
+   allocated with malloc, and must each be at least `NUM_REGS * sizeof
+   (regoff_t)' bytes long.
+
+   If NUM_REGS == 0, then subsequent matches should allocate their own
+   register data.
+
+   Unless this function is called, the first search or match using
+   PATTERN_BUFFER will allocate its own register data, without
+   freeing the old data.  */
+extern void re_set_registers
+  _RE_ARGS ((struct re_pattern_buffer *buffer, struct re_registers *regs,
+             unsigned num_regs, regoff_t *starts, regoff_t *ends));
+
+/* 4.2 bsd compatibility.  */
+extern char *re_comp _RE_ARGS ((const char *));
+extern int re_exec _RE_ARGS ((const char *));
+
+/* POSIX compatibility.  */
+extern int regcomp _RE_ARGS ((regex_t *preg, const char *pattern, int cflags));
+extern int regexec
+  _RE_ARGS ((const regex_t *preg, const char *string, size_t nmatch,
+             regmatch_t pmatch[], int eflags));
+extern size_t regerror
+  _RE_ARGS ((int errcode, const regex_t *preg, char *errbuf,
+             size_t errbuf_size));
+extern void regfree _RE_ARGS ((regex_t *preg));
+
+#endif /* not __REGEXP_LIBRARY_H__ */
+
+/*
+Local variables:
+make-backup-files: t
+version-control: t
+trim-versions-without-asking: nil
+End:
+*/
diff --git a/gcc/fixinc/server.c b/gcc/fixinc/server.c
new file mode 100644
index 0000000..296e307
--- /dev/null
+++ b/gcc/fixinc/server.c
@@ -0,0 +1,464 @@
+
+/*
+ *  $Id: server.c,v 1.2 1998/12/16 21:19:16 law Exp $
+ *
+ *  Server Handling copyright 1992-1998 Bruce Korb
+ *
+ *  Server Handling is free software.
+ *  You may redistribute it and/or modify it under the terms of the
+ *  GNU General Public License, as published by the Free Software
+ *  Foundation; either version 2, or (at your option) any later version.
+ *
+ *  Server Handling is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Server Handling.  See the file "COPYING".  If not,
+ *  write to:  The Free Software Foundation, Inc.,
+ *             59 Temple Place - Suite 330,
+ *             Boston,  MA  02111-1307, USA.
+ *
+ * As a special exception, Bruce Korb gives permission for additional
+ * uses of the text contained in his release of ServerHandler.
+ *
+ * The exception is that, if you link the ServerHandler library with other
+ * files to produce an executable, this does not by itself cause the
+ * resulting executable to be covered by the GNU General Public License.
+ * Your use of that executable is in no way restricted on account of
+ * linking the ServerHandler library code into it.
+ *
+ * This exception does not however invalidate any other reasons why
+ * the executable file might be covered by the GNU General Public License.
+ *
+ * This exception applies only to the code released by Bruce Korb under
+ * the name ServerHandler.  If you copy code from other sources under the
+ * General Public License into a copy of ServerHandler, as the General Public
+ * License permits, the exception does not apply to the code that you add
+ * in this way.  To avoid misleading anyone as to the status of such
+ * modified files, you must delete this exception notice from them.
+ *
+ * If you write modifications of your own for ServerHandler, it is your
+ * choice whether to permit this exception to apply to your modifications.
+ * If you do not wish that, delete this exception notice.
+ */
+
+#include <fcntl.h>
+#include <errno.h>
+#include <signal.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <sys/param.h>
+
+#include "server.h"
+
+#ifdef DEBUG
+#define STATIC
+#else
+#define STATIC static
+#endif
+#ifndef tSCC
+#define tSCC static const char
+#endif
+#ifndef NUL
+#define NUL '\0'
+#endif
+
+STATIC bool readPipeTimeout;
+
+STATIC tpChar defArgs[] =
+{(char *) NULL, "-p", (char *) NULL};
+STATIC tpfPair serverPair =
+{(FILE *) NULL, (FILE *) NULL};
+STATIC pid_t serverId = NULLPROCESS;
+/*
+ *  Arbitrary text that should not be found in the shell output.
+ *  It must be a single line and appear verbatim at the start of
+ *  the terminating output line.
+ */
+tSCC zDone[] = "ShElL-OuTpUt-HaS-bEeN-cOmPlEtEd";
+STATIC tpChar pCurDir = (char *) NULL;
+
+/*
+ *  chainOpen
+ *
+ *  Given an FD for an inferior process to use as stdin,
+ *  start that process and return a NEW FD that that process
+ *  will use for its stdout.  Requires the argument vector
+ *  for the new process and, optionally, a pointer to a place
+ *  to store the child's process id.
+ */
+int
+chainOpen (stdinFd, ppArgs, pChild)
+     int stdinFd;
+     tpChar *ppArgs;
+     pid_t *pChild;
+{
+  tFdPair stdoutPair =
+  {-1, -1};
+  pid_t chId;
+  char *pzCmd;
+
+  /*
+   *  Create a pipe it will be the child process' stdout,
+   *  and the parent will read from it.
+   */
+  if ((pipe ((int *) &stdoutPair) < 0))
+    {
+      if (pChild != (pid_t *) NULL)
+	*pChild = NOPROCESS;
+      return -1;
+    }
+
+  /*
+   *  If we did not get an arg list, use the default
+   */
+  if (ppArgs == (tpChar *) NULL)
+    ppArgs = defArgs;
+
+  /*
+   *  If the arg list does not have a program,
+   *  assume the "SHELL" from the environment, or, failing
+   *  that, then sh.  Set argv[0] to whatever we decided on.
+   */
+  if (pzCmd = *ppArgs,
+      (pzCmd == (char *) NULL) || (*pzCmd == '\0'))
+    {
+
+      pzCmd = getenv ("SHELL");
+      if (pzCmd == (char *) NULL)
+	pzCmd = "sh";
+    }
+#ifdef DEBUG_PRINT
+  printf ("START:  %s\n", pzCmd);
+  {
+    int idx = 0;
+    while (ppArgs[++idx] != (char *) NULL)
+      printf ("  ARG %2d:  %s\n", idx, ppArgs[idx]);
+  }
+#endif
+  /*
+   *  Call fork() and see which process we become
+   */
+  chId = fork ();
+  switch (chId)
+    {
+    case NOPROCESS:		/* parent - error in call */
+      close (stdoutPair.readFd);
+      close (stdoutPair.writeFd);
+      if (pChild != (pid_t *) NULL)
+	*pChild = NOPROCESS;
+      return -1;
+
+    default:			/* parent - return opposite FD's */
+      if (pChild != (pid_t *) NULL)
+	*pChild = chId;
+#ifdef DEBUG_PRINT
+      printf ("for pid %d:  stdin from %d, stdout to %d\n"
+	      "for parent:  read from %d\n",
+	      chId, stdinFd, stdoutPair.writeFd, stdoutPair.readFd);
+#endif
+      close (stdinFd);
+      close (stdoutPair.writeFd);
+      return stdoutPair.readFd;
+
+    case NULLPROCESS:		/* child - continue processing */
+      break;
+    }
+
+  /*
+   *  Close the pipe end handed back to the parent process
+   */
+  close (stdoutPair.readFd);
+
+  /*
+   *  Close our current stdin and stdout
+   */
+  close (STDIN_FILENO);
+  close (STDOUT_FILENO);
+
+  /*
+   *  Make the fd passed in the stdin, and the write end of
+   *  the new pipe become the stdout.
+   */
+  fcntl (stdoutPair.writeFd, F_DUPFD, STDOUT_FILENO);
+  fcntl (stdinFd, F_DUPFD, STDIN_FILENO);
+
+  if (*ppArgs == (char *) NULL)
+    *ppArgs = pzCmd;
+
+  execvp (pzCmd, ppArgs);
+  fprintf (stderr, "Error %d:  Could not execvp( '%s', ... ):  %s\n",
+	   errno, pzCmd, strerror (errno));
+  exit (EXIT_PANIC);
+}
+
+
+/*
+ *  p2open
+ *
+ *  Given a pointer to an argument vector, start a process and
+ *  place its stdin and stdout file descriptors into an fd pair
+ *  structure.  The "writeFd" connects to the inferior process
+ *  stdin, and the "readFd" connects to its stdout.  The calling
+ *  process should write to "writeFd" and read from "readFd".
+ *  The return value is the process id of the created process.
+ */
+pid_t
+p2open (pPair, ppArgs)
+     tFdPair *pPair;
+     tpChar *ppArgs;
+{
+  pid_t chId;
+
+  /*
+   *  Create a bi-directional pipe.  Writes on 0 arrive on 1
+   *  and vice versa, so the parent and child processes will
+   *  read and write to opposite FD's.
+   */
+  if (pipe ((int *) pPair) < 0)
+    return NOPROCESS;
+
+  pPair->readFd = chainOpen (pPair->readFd, ppArgs, &chId);
+  if (chId == NOPROCESS)
+    close (pPair->writeFd);
+
+  return chId;
+}
+
+
+/*
+ *  p2fopen
+ *
+ *  Identical to "p2open()", except that the "fd"'s are "fdopen(3)"-ed
+ *  into file pointers instead.
+ */
+pid_t
+p2fopen (pfPair, ppArgs)
+     tpfPair *pfPair;
+     tpChar *ppArgs;
+{
+  tFdPair fdPair;
+  pid_t chId = p2open (&fdPair, ppArgs);
+
+  if (chId == NOPROCESS)
+    return chId;
+
+  pfPair->pfRead = fdopen (fdPair.readFd, "r");
+  pfPair->pfWrite = fdopen (fdPair.writeFd, "w");
+  return chId;
+}
+
+
+/*
+ *  loadData
+ *
+ *  Read data from a file pointer (a pipe to a process in this context)
+ *  until we either get EOF or we get a marker line back.
+ *  The read data are stored in a malloc-ed string that is truncated
+ *  to size at the end.  Input is assumed to be an ASCII string.
+ */
+STATIC char *
+loadData (fp)
+     FILE *fp;
+{
+  char *pzText;
+  size_t textSize;
+  char *pzScan;
+  char zLine[1024];
+
+  textSize = sizeof (zLine) * 2;
+  pzScan = \
+    pzText = malloc (textSize);
+
+  if (pzText == (char *) NULL)
+    return pzText;
+
+  for (;;)
+    {
+      size_t usedCt;
+
+      alarm (10);
+      readPipeTimeout = BOOL_FALSE;
+      if (fgets (zLine, sizeof (zLine), fp) == (char *) NULL)
+	break;
+
+      if (strncmp (zLine, zDone, sizeof (zDone) - 1) == 0)
+	break;
+
+      strcpy (pzScan, zLine);
+      pzScan += strlen (zLine);
+      usedCt = (size_t) (pzScan - pzText);
+
+      if (textSize - usedCt < sizeof (zLine))
+	{
+
+	  size_t off = (size_t) (pzScan - pzText);
+	  void *p;
+	  textSize += 4096;
+	  p = realloc ((void *) pzText, textSize);
+	  if (p == (void *) NULL)
+	    {
+	      fprintf (stderr, "Failed to get 0x%08X bytes\n", textSize);
+	      free ((void *) pzText);
+	      return (char *) NULL;
+	    }
+
+	  pzText = (char *) p;
+	  pzScan = pzText + off;
+	}
+    }
+
+  alarm (0);
+  if (readPipeTimeout)
+    {
+      free ((void *) pzText);
+      return (char *) NULL;
+    }
+
+  while ((pzScan > pzText) && isspace (pzScan[-1]))
+    pzScan--;
+  *pzScan = NUL;
+  return realloc ((void *) pzText, strlen (pzText) + 1);
+}
+
+
+/*
+ *  SHELL SERVER PROCESS CODE
+ */
+
+#ifdef DONT_HAVE_SIGSEND
+typedef enum
+{
+  P_ALL, P_PID, P_GID, P_UID, P_PGID, P_SID, P_CID
+}
+idtype_t;
+typedef long id_t;
+
+STATIC int
+sigsend (idtype, id, sig)
+     idtype_t idtype;
+     id_t id;
+     int sig;
+{
+  switch (idtype)
+    {
+    case P_PID:
+      kill ((pid_t) id, sig);
+      break;
+
+    case P_ALL:
+    case P_GID:
+    case P_UID:
+    case P_PGID:
+    case P_SID:
+    case P_CID:
+      errno = EINVAL;
+      return -1;
+      /*NOTREACHED */
+    }
+
+  return 0;
+}
+#endif /* HAVE_SIGSEND */
+
+
+STATIC void
+closeServer ()
+{
+  kill( (pid_t) serverId, SIGKILL);
+  serverId = NULLPROCESS;
+  fclose (serverPair.pfRead);
+  fclose (serverPair.pfWrite);
+  serverPair.pfRead = serverPair.pfWrite = (FILE *) NULL;
+}
+
+
+struct sigaction savePipeAction;
+struct sigaction saveAlrmAction;
+struct sigaction currentAction;
+
+STATIC void
+sigHandler (signo)
+     int signo;
+{
+  closeServer ();
+  readPipeTimeout = BOOL_TRUE;
+}
+
+
+STATIC void
+serverSetup ()
+{
+#ifndef SA_SIGINFO
+#  define SA_SIGINFO 0
+#else
+  currentAction.sa_sigaction =
+#endif
+  currentAction.sa_handler   = sigHandler;
+  currentAction.sa_flags     = SA_SIGINFO;
+  sigemptyset( &currentAction.sa_mask );
+
+  sigaction( SIGPIPE, &currentAction, &savePipeAction );
+  sigaction( SIGALRM, &currentAction, &saveAlrmAction );
+  atexit( &closeServer );
+
+  fputs ("trap : INT\n", serverPair.pfWrite);
+  fflush (serverPair.pfWrite);
+  pCurDir = getcwd ((char *) NULL, MAXPATHLEN + 1);
+}
+
+
+char *
+runShell (pzCmd)
+     const char *pzCmd;
+{
+  tSCC zNil[] = "";
+
+  /*
+   *  IF the shell server process is not running yet,
+   *  THEN try to start it.
+   */
+  if (serverId == NULLPROCESS)
+    {
+      serverId = p2fopen (&serverPair, defArgs);
+      if (serverId > 0)
+	serverSetup ();
+    }
+
+  /*
+   *  IF it is still not running,
+   *  THEN return the nil string.
+   */
+  if (serverId <= 0)
+    return (char *) zNil;
+
+  /*
+   *  Make sure the process will pay attention to us,
+   *  send the supplied command, and then
+   *  have it output a special marker that we can find.
+   */
+  fprintf (serverPair.pfWrite, "\\cd %s\n%s\n\necho\necho %s\n",
+	   pCurDir, pzCmd, zDone);
+  fflush (serverPair.pfWrite);
+  if (serverId == NULLPROCESS)
+    return (char *) NULL;
+
+  /*
+   *  Now try to read back all the data.  If we fail due to either
+   *  a sigpipe or sigalrm (timeout), we will return the nil string.
+   */
+  {
+    char *pz = loadData (serverPair.pfRead);
+    if (pz == (char *) NULL)
+      {
+	fprintf (stderr, "CLOSING SHELL SERVER - command failure:\n\t%s\n",
+		 pzCmd);
+	closeServer ();
+	pz = (char *) zNil;
+      }
+    return pz;
+  }
+}
diff --git a/gcc/fixinc/server.h b/gcc/fixinc/server.h
new file mode 100644
index 0000000..aef8df7
--- /dev/null
+++ b/gcc/fixinc/server.h
@@ -0,0 +1,94 @@
+
+/*
+ *  $Id: server.h,v 1.2 1998/12/16 21:19:17 law Exp $
+ *
+ *  Server Handling copyright 1992-1998 Bruce Korb
+ *
+ *  Server Handling is free software.
+ *  You may redistribute it and/or modify it under the terms of the
+ *  GNU General Public License, as published by the Free Software
+ *  Foundation; either version 2, or (at your option) any later version.
+ *
+ *  Server Handling is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Server Handling.  See the file "COPYING".  If not,
+ *  write to:  The Free Software Foundation, Inc.,
+ *             59 Temple Place - Suite 330,
+ *             Boston,  MA  02111-1307, USA.
+ *
+ * As a special exception, Bruce Korb gives permission for additional
+ * uses of the text contained in his release of ServerHandler.
+ *
+ * The exception is that, if you link the ServerHandler library with other
+ * files to produce an executable, this does not by itself cause the
+ * resulting executable to be covered by the GNU General Public License.
+ * Your use of that executable is in no way restricted on account of
+ * linking the ServerHandler library code into it.
+ *
+ * This exception does not however invalidate any other reasons why
+ * the executable file might be covered by the GNU General Public License.
+ *
+ * This exception applies only to the code released by Bruce Korb under
+ * the name ServerHandler.  If you copy code from other sources under the
+ * General Public License into a copy of ServerHandler, as the General Public
+ * License permits, the exception does not apply to the code that you add
+ * in this way.  To avoid misleading anyone as to the status of such
+ * modified files, you must delete this exception notice from them.
+ *
+ * If you write modifications of your own for ServerHandler, it is your
+ * choice whether to permit this exception to apply to your modifications.
+ * If you do not wish that, delete this exception notice.
+ */
+
+#ifndef FIXINC_SERVER_H
+#define FIXINC_SERVER_H
+
+#include <stdio.h>
+#include <unistd.h>
+
+/*
+ *  Dual pipe opening of a child process
+ */
+
+typedef struct
+  {
+    int readFd;
+    int writeFd;
+  }
+tFdPair;
+
+typedef struct
+  {
+    FILE *pfRead;		/* parent read fp  */
+    FILE *pfWrite;		/* parent write fp */
+  }
+tpfPair;
+
+typedef char *tpChar;
+
+#define NOPROCESS   ((pid_t)-1)
+#define NULLPROCESS ((pid_t)0)
+
+#define EXIT_PANIC   99
+
+typedef enum
+  {
+    BOOL_FALSE, BOOL_TRUE
+  }
+bool;
+
+#define _P_(p) ()
+
+char *runShell _P_ ((const char *pzCmd));
+pid_t p2fopen _P_ ((tpfPair * pfPair, tpChar * ppArgs));
+pid_t p2open _P_ ((tFdPair * pPair, tpChar * ppArgs));
+int
+chainOpen _P_ ((int stdinFd,
+		tpChar * ppArgs,
+		pid_t * pChild));
+
+#endif /* FIXINC_SERVER_H */