X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Ffixinc%2Fmkfixinc.sh;h=a3700ccb2669b8cfa6e36eb7fe9b5446bddd4667;hb=5b08c6a374a300eb0c5ebcb9677f378430cce0ed;hp=16e8624655ebe17bd27b0c73ffbc31b283240eb8;hpb=976201bae2377efee89a1ff077d228513b326af0;p=pf3gnuchains%2Fgcc-fork.git

diff --git a/gcc/fixinc/mkfixinc.sh b/gcc/fixinc/mkfixinc.sh
index 16e8624655e..a3700ccb266 100755
--- a/gcc/fixinc/mkfixinc.sh
+++ b/gcc/fixinc/mkfixinc.sh
@@ -1,101 +1,62 @@
 #! /bin/sh
 
-build=$1
-machine=$2
-
-if [ -z "$build" ]
-then
-	echo No target system name given
-	exit 1
-fi
-
-#  If we don't get two arguments, then assume both arguments
-#  are the same
-#
-if [ -z "$machine" ]
+if [ $# -ne 2 ]
 then
-	machine="$build"
+  echo "Usage: $0 <build-mach-triplet> <target-mach-triplet>"
+  exit 1
 fi
 
+build=$1
+machine=$2
 target=../fixinc.sh
 
 echo constructing ${target} for $machine to run on $build
 fixincludes="${machine}"
 
-# Choose fix build method by build system
+# Choose one or two-process fix methodology.  Systems that cannot handle
+# bi-directional pipes must use the two process method.
+#
 case $build in
-	i?86-*-msdosdjgpp* )
-		MAKE="${MAKE} -f ${srcdir}/Makefile.DOS srcdir=${srcdir}"
+	i?86-*-msdosdjgpp* | \
+	*-*-beos* )
+		MAKE="${MAKE} TARGETS=twoprocess"
+		CFLAGS="${CFLAGS} -DSEPARATE_FIX_PROC"
 		;;
 
-	*-*-beos* )
-		MAKE="${MAKE} -f ${srcdir}/Makefile.BEOS srcdir=${srcdir}"
-		# Remove the following line to enable fixincludes
-		# (Makefile.BEOS is empty until Monday 12/4/00 :)
-		fixincludes=
+	vax-dec-bsd* )
+		CFLAGS="${CFLAGS} -Dexit=xexit -Datexit=xatexit"
+		MAKE="${MAKE} TARGETS=oneprocess"
 		;;
 
 	* )
-		MAKE="${MAKE} -f Makefile"
+		MAKE="${MAKE} TARGETS=oneprocess"
 		;;
 esac
 
 # Check for special fix rules for particular targets
 case $machine in
-	*-*-sysv4* | \
-	i?86-*-sysv5* | \
-	i?86-*-udk*)
-		fixincludes=fixinc.svr4
-		;;
-
-	i?86-*-interix* | \
-	alpha-*-interix*)
-		fixincludes=fixinc.interix
-		;;
-
-	*-*-netbsd* | \
-	i?86-*-openbsd*)
-		fixincludes=fixinc.wrap
-		;;
-
-	alpha*-*-winnt* | \
-	i?86-*-winnt3*)
-		fixincludes=fixinc.winnt
-		;;
-
-	i?86-sequent-ptx* | i?86-sequent-sysv[34]*)
-		fixincludes=fixinc.ptx
-		;;
-
-	alpha*-dec-vms* | \
-	arm-semi-aout | armel-semi-aout | \
-	arm-semi-aof | armel-semi-aof | \
-	arm-*-gnu* | \
-	c*-convex-* | \
-	hppa1.1-*-osf* | \
-	hppa1.0-*-osf* | \
-	hppa1.1-*-bsd* | \
-	hppa1.0-*-bsd* | \
-	hppa*-*-lites* | \
-	*-*-gnu* | \
-	i?86-moss-msdos* | i?86-*-moss* | \
-	i?86-*-osf1* | \
-	i?86-*-win32 | \
-	i?86-*-pe | i?86-*-cygwin* | \
-	i?86-*-mingw32* | \
-	i?86-*-uwin* | \
-	mips-sgi-irix5cross64 | \
-	powerpc-*-eabiaix* | \
-	powerpc-*-eabisim* | \
-	powerpc-*-eabi*    | \
-	powerpc-*-rtems*   | \
-	powerpcle-*-eabisim* | \
-	powerpcle-*-eabi*  | \
-        powerpcle-*-winnt* | \
-	powerpcle-*-pe | powerpcle-*-cygwin* | \
-	thumb-*-coff* | thumbel-*-coff* )
-		fixincludes=
-		;;
+    alpha*-dec-*vms* | \
+    arm-semi-aof | \
+    hppa1.1-*-osf* | \
+    hppa1.1-*-bsd* | \
+    i370-*-openedition | \
+    i?86-moss-msdos* | \
+    i?86-*-moss* | \
+    i?86-*-pe | \
+    i?86-*-cygwin* | \
+    i?86-*-mingw32* | \
+    i?86-*-uwin* | \
+    i?86-*-interix* | \
+    powerpc-*-eabiaix* | \
+    powerpc-*-eabisim* | \
+    powerpc-*-eabi*    | \
+    powerpc-*-rtems*   | \
+    powerpcle-*-eabisim* | \
+    powerpcle-*-eabi* )
+        #  Don't do any fixing.
+        #
+        fixincludes=
+        ;;
 esac
 
 #  IF there is no include fixing,
@@ -108,21 +69,10 @@ then
     exit 0
 fi
 
-#  IF the fixer is supplied in our source directory,
-#  THEN copy that into place
-#
-if test -f ${srcdir}/"${fixincludes}"
-then
-    echo copying ${srcdir}/$fixincludes to ${target}
-    cp ${srcdir}/$fixincludes ${target}
-    chmod 755 ${target}
-    exit 0
-fi
-
 #  OK.  We gotta make the thing.
 #  make and install either the binary or the default script
 
-defs="SHELL=\"$SHELL\" CC=\"$CC\" CFLAGS=\"$CFLAGS\" LDFLAGS=\"$LDFLAGS\""
+defs="SHELL=\"$SHELL\" CC=\"$CC\" CFLAGS=\"$CFLAGS\" LDFLAGS=\"$LDFLAGS\" LIBERTY=\"$LIBERTY\""
 cmd="$MAKE ${defs} install-bin"
 echo $cmd
 eval $cmd