old fixincludes coup des gras

From-SVN: r31892

gcc/ChangeLog

+2000-02-09  Bruce Korb  <bkorb@gnu.org>
+
+	* gcc/fixincludes:  ** DELETED **
+	* gcc/fixcpp:  ** DELETED **
+	* gcc/fixinc-nt.sed:  ** DELETED **
+	* gcc/just-fixinc:  ** DELETED **
+	* gcc/Makefile.in:  Removed out-dated commentary
+	* gcc/configure.in: Removed fast-fixincludes disablement.
+	* MAINTAINERS(Ian Taylor) moved to "Write after approval" group.
+
 2000-02-09  Clinton Popetz  <cpopetz@cygnus.com>
 	* function.c (thread_prologue_and_epilogue_insns): Uncomment
 	last change.

gcc/Makefile.in

@@ -2182,26 +2182,6 @@ fixinc.sh: $(FIXINCSRCDIR)/mkfixinc.sh $(FIXINCSRCDIR)/fixincl.c \
 	export MAKE srcdir ; \
 	cd ./fixinc; $(SHELL) $${srcdir}/mkfixinc.sh $(target)
 
-##stmp-fixinc: $(FIXINCLUDES) gsyslimits.h
-##	rm -rf include
-##	mkdir include
-##	if [ x$(FIXINCLUDES) != xMakefile.in ]; \
-##	then \
-##	  for dir in $(SYSTEM_HEADER_DIR) $(OTHER_FIXINCLUDES_DIRS); do \
-##	    if [ -d $$dir ]; \
-##	    then \
-##	      $(SHELL) $(srcdir)/$(FIXINCLUDES) include $$dir; \
-##	    else true; fi; \
-##	  done; \
-##	  if [ x$(INSTALL_ASSERT_H) != x ] ; \
-##	  then \
-##	    rm -f include/assert.h; \
-##	    cp $(srcdir)/assert.h include/assert.h; \
-##	    chmod a+r include/assert.h; \
-##	  fi \
-##	else true; \
-##	fi
-
 # Build fixed copies of system files.
 stmp-fixinc: fixinc.sh gsyslimits.h
 	rm -rf include; mkdir include

gcc/configure.in

@@ -236,15 +236,6 @@ if test x$enable_c_cpplib != xno; then
   cpp_main=cppmain
 fi)
 
-# Disable fast fixincludes
-AC_ARG_ENABLE(fast-fixincludes,
-[  --disable-fast-fixincludes
-                         Disable the new fast fixincludes.
-                         Run the old fixincludes script unconditionally],
-if test x$enable_fast_fixincludes = xno ; then
-  cp $srcdir/fixincludes ./fixinc.sh
-fi)
-
 # Enable Multibyte Characters for C/C++
 AC_ARG_ENABLE(c-mbchar,
 [  --enable-c-mbchar       Enable multibyte characters for C and C++.],
@@ -1132,7 +1123,6 @@ changequote([,])dnl
 		xmake_file=pa/x-pa-mpeix 
 		echo "You must use gas. Assuming it is already installed." 
 		install_headers_dir=install-headers-tar
-		fixincludes=Makefile.in
 		use_collect2=yes 
 		;; 
 	i370-*-opened*)			 # IBM 360/370/390 Architecture
@@ -1140,20 +1130,17 @@ changequote([,])dnl
 		tm_file=i370/oe.h
 		xmake_file=i370/x-oe
 		tmake_file=i370/t-oe
-		fixincludes=Makefile.in # Headers are wierd, don't mess with
 		;;
 	i370-*-mvs*)
 		xm_file=i370/xm-mvs.h
 		tm_file=i370/mvs.h
 		tmake_file=i370/t-mvs
-		fixincludes=Makefile.in # Headers are wierd, don't mess with
 		;;
 	i370-*-linux*)
 		xm_file="xm-linux.h i370/xm-linux.h"
 		xmake_file=x-linux
 		tm_file="i370/linux.h ${tm_file}"
 		tmake_file="t-linux i370/t-linux"
-		fixincludes=Makefile.in # The headers are ok already.
 		# broken_install=yes
 		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 		# extra_parts="crtbegin.o crtend.o"
@@ -1295,7 +1282,6 @@ changequote([,])dnl
 		xmake_file=i386/x-beos
 		extra_objs=winnt.o
 		extra_parts='crtbegin.o crtend.o'
-		fixincludes=Makefile.in
 		;;
 changequote(,)dnl
 	i[34567]86-*-bsdi* | i[34567]86-*-bsd386*)
@@ -4821,7 +4807,6 @@ AC_SUBST(extra_objs)
 AC_SUBST(extra_parts)
 AC_SUBST(extra_passes)
 AC_SUBST(extra_programs)
-AC_SUBST(fixinc_defs)
 AC_SUBST(float_h_file)
 AC_SUBST(gcc_gxx_include_dir)
 AC_SUBST(gcc_version)

gcc/fixcpp

-#!/bin/sh
-#
-# NAME:
-#	fixcpp - fix CPP errors
-#
-# SYNOPSIS:
-#	fixcpp [-c][-p patch_file][-b bak_dir][-n new_dir] files(s)
-#
-# DESCRIPTION:
-#	For each named file, use sed(1) to fixup any descriptive
-#	text after #else or #endif or that is not properly
-#	commented as this causes ANSI compilers to generate
-#	unnecessary warnings.
-#
-#	Naturally this script is not guaranteed to be bullet
-#	proof, use of -n or -b is advisable!
-#
-#	-c causes fixcpp to make sure that only files that
-#	needed changing are affected by returning the original
-#	file to its original location if no changes were needed.
-#
-#	-p causes fixcpp to append to a patch file the context
-#	diffs of the changes wrought.
-#
-# SEE ALSO:
-#	sed(1)
-#
-# AMENDED:
-#	90/08/08 22:46:32 (sjg)
-#
-# RELEASED:
-#	90/08/08 22:46:34 v1.4
-#
-# SCCSID:
-#	@(#)fixcpp.sh 1.4 90/08/08 22:46:32 (sjg)
-#
-#	@(#)Copyright (c) 1990 Simon J. Gerraty
-#
-#       This is free software.  It comes with NO WARRANTY.
-#       Everyone is granted permission to copy, modify and
-#       redistribute this source code provided that all
-#       recipients are given similar rights, and that the above
-#       copyright notice and this notice are preserved in all
-#       copies. 
-
-TMPF=/tmp/fixcpp.$$
-NEWDIR=
-BAKDIR=
-PATCHF=
-CHECK=
-
-set -- `getopt "cp:b:n:" $*`
-if [ $? != 0 ]; then
-	echo "$0 [-c][-p patch_file][-b bakup_dir][-n new_dir] file [file ...]" >&2
-	exit 1
-fi
-for i in $*
-do
-	case $i in
-	-c)	CHECK=yes; shift;;
-	-p)	PATCHF=$2; shift 2;;
-	-b)	BAKDIR=$2; shift 2;;
-	-n)	NEWDIR=$2; shift 2;;
-	--)	shift; break;;
-	esac
-done
-NEWDIR=${NEWDIR:-.}
-if [ $BAKDIR ]; then
-	if [ ! -d $BAKDIR ]; then
-		echo "$0: no such directory -- $BAKDIR" >&2
-		exit 1
-	fi
-fi
-
-
-
-for i in $*
-do
-	if [ $BAKDIR ]; then
-		mv $i $BAKDIR
-		infile=$BAKDIR/$i
-	else
-		if [ "$NEWDIR" = "." ]; then
-			mv $i ${TMPF}
-			infile=${TMPF}
-		else
-			infile=$i
-		fi
-	fi	
-	sed -e 's;^#\([ 	]*e[nl][^ 	]*[ 	][ 	]*\)\([^/ 	][^\*].*\);#\1/* \2 */;' -e 's;^#\([ 	]*e[nl][^ 	]*[ 	][ 	]*\)\([^/ 	]\)$;#\1/* \2 */;' $infile >${NEWDIR}/$i
-	if [ "${CHECK}" = "yes" -o ${PATCHF} ]; then
-		if cmp -s $infile ${NEWDIR}/$i ; then
-			if [ "${CHECK}" = "yes" ]; then
-				if [ $BAKDIR ]; then
-					mv $infile ${NEWDIR}/$i
-				else
-					rm ${NEWDIR}/$i
-				fi
-			fi
-		else
-			if [ $PATCHF ]; then
-				diff -c $infile ${NEWDIR}/$i >> ${PATCHF}
-			fi
-		fi
-	fi
-
-done
-
-rm -f ${TMPF}

gcc/fixinc-nt.sed

-s/!__STDC__/!defined (__STRICT_ANSI__)/g
-s/getcwd(char \*, int)/getcwd(char *, size_t)/
-s/Format\[\]/Format\[1\]/
-s/^#if !defined (__cplusplus)/#if 0/
-s/^#define DECLSPEC_IMPORT __declspec(dllimport)/#define DECLSPEC_IMPORT/

gcc/just-fixinc

-#!/bin/sh
-# $Id: just-fixinc,v 1.2 1998/04/03 16:35:58 law Exp $
-# This script exists for use after installing
-# the GCC binaries from a distribution tape/CD-ROM.
-# Use it *after* copying the directory of binaries
-# to the proper installed location.
-# It runs fixincludes (or fixinc.svr4, if appropriate) to correct bugs in
-# the system header files.
-# This script needs to be customized for each type of installation so that
-# others may run it after the installation-sans-fixincludes is completed.
-
-# The corrected header files go in the GCC installation directory
-# so that only GCC sees them.
-# This script does not modify the original header files in /usr/include.
-# It only modifies copies in the GCC installation directory.
-
-installed=/opt/gnu/lib/gcc-lib/sparc-sun-solaris2/2.6.0
-cd $installed/include
-
-rmdir tmpfoo > /dev/null 2>&1
-mkdir tmpfoo
-mv va-sparc.h varargs.h stdarg.h stddef.h limits.h float.h proto.h tmpfoo
-
-$installed/fixinc.svr4 $installed/include /usr/include $installed
-
-# Make sure fixed native limits.h gets renamed to syslimits.h before gcc's
-# limits.h from tmpfoo is moved back.
-rm -f syslimits.h
-if test -f limits.h ; then
-  mv limits.h syslimits.h
-else
-  cp $installed/gsyslimits.h syslimits.h
-fi
-chmod a+r syslimits.h
-
-mv tmpfoo/* .
-rmdir tmpfoo
-
-# eof