apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject cvs commit: apr/build config.guess config.sub
Date Fri, 20 Feb 2004 16:23:04 GMT
jorton      2004/02/20 08:23:04

  Modified:    build    config.guess config.sub
  Log:
  * build/config.guess, build/config.sub: Update to current GNU config
  scripts.
  
  Revision  Changes    Path
  1.10      +241 -126  apr/build/config.guess
  
  Index: config.guess
  ===================================================================
  RCS file: /home/cvs/apr/build/config.guess,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -w -d -u -r1.9 -r1.10
  --- config.guess	18 Feb 2004 10:39:09 -0000	1.9
  +++ config.guess	20 Feb 2004 16:23:04 -0000	1.10
  @@ -1,9 +1,9 @@
   #! /bin/sh
   # Attempt to guess a canonical system name.
   #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
  -#   2000, 2001, 2002 Free Software Foundation, Inc.
  +#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
   
  -timestamp='2002-03-20'
  +timestamp='2004-02-16'
   
   # This file is free software; you can redistribute it and/or modify it
   # under the terms of the GNU General Public License as published by
  @@ -24,11 +24,6 @@
   # configuration script generated by Autoconf, you may include it under
   # the same distribution terms that you use for the rest of that program.
   
  -#####################################################################
  -# This file contains changes for Apache, clearly marked below.
  -# These changes are hereby donated to the public domain.
  -#####################################################################
  -
   # Originally written by Per Bothner <per@bothner.com>.
   # Please send patches to <config-patches@gnu.org>.  Submit a context
   # diff and a properly formatted ChangeLog entry.
  @@ -93,30 +88,42 @@
     exit 1
   fi
   
  +trap 'exit 1' 1 2 15
   
  -dummy=dummy-$$
  -trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
  +# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
  +# compiler to aid in system detection is discouraged as it requires
  +# temporary files to be created and, as you can see below, it is a
  +# headache to deal with in a portable fashion.
   
  -# CC_FOR_BUILD -- compiler used by this script.
   # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
   # use `HOST_CC' if defined, but it is deprecated.
   
  -set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
  - ,,)    echo "int dummy(){}" > $dummy.c ;
  +# Portable tmp directory creation inspired by the Autoconf team.
  +
  +set_cc_for_build='
  +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) &&
exit \$exitcode" 0 ;
  +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
  +: ${TMPDIR=/tmp} ;
  + { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` &&
test -n "$tmp" && test -d "$tmp" ; } ||
  + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 &&
mkdir $tmp) ; } ||
  + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning:
creating insecure temp directory" >&2 ; } ||
  + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
  +dummy=$tmp/dummy ;
  +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
  +case $CC_FOR_BUILD,$HOST_CC,$CC in
  + ,,)    echo "int x;" > $dummy.c ;
   	for c in cc gcc c89 c99 ; do
  -	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
  -	  if test $? = 0 ; then
  +	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
   	     CC_FOR_BUILD="$c"; break ;
   	  fi ;
   	done ;
  -	rm -f $dummy.c $dummy.o $dummy.rel ;
   	if test x"$CC_FOR_BUILD" = x ; then
   	  CC_FOR_BUILD=no_compiler_found ;
   	fi
   	;;
    ,,*)   CC_FOR_BUILD=$CC ;;
    ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
  -esac'
  +esac ;'
   
   # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
   # (ghazi@noc.rutgers.edu 1994-08-24)
  @@ -147,6 +154,7 @@
   	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
   	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
   	case "${UNAME_MACHINE_ARCH}" in
  +	    armeb) machine=armeb-unknown ;;
   	    arm*) machine=arm-unknown ;;
   	    sh3el) machine=shl-unknown ;;
   	    sh3eb) machine=sh-unknown ;;
  @@ -172,18 +180,35 @@
   		;;
   	esac
   	# The OS release
  +	# Debian GNU/NetBSD machines have a different userland, and
  +	# thus, need a distinct triplet. However, they do not need
  +	# kernel version information, so it can be replaced with a
  +	# suitable tag, in the style of linux-gnu.
  +	case "${UNAME_VERSION}" in
  +	    Debian*)
  +		release='-gnu'
  +		;;
  +	    *)
   	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
  +		;;
  +	esac
   	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
   	# contains redundant information, the shorter form:
   	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
   	echo "${machine}-${os}${release}"
   	exit 0 ;;
  +    amd64:OpenBSD:*:*)
  +	echo x86_64-unknown-openbsd${UNAME_RELEASE}
  +	exit 0 ;;
       amiga:OpenBSD:*:*)
   	echo m68k-unknown-openbsd${UNAME_RELEASE}
   	exit 0 ;;
       arc:OpenBSD:*:*)
   	echo mipsel-unknown-openbsd${UNAME_RELEASE}
   	exit 0 ;;
  +    cats:OpenBSD:*:*)
  +	echo arm-unknown-openbsd${UNAME_RELEASE}
  +	exit 0 ;;
       hp300:OpenBSD:*:*)
   	echo m68k-unknown-openbsd${UNAME_RELEASE}
   	exit 0 ;;
  @@ -202,6 +227,9 @@
       mvmeppc:OpenBSD:*:*)
   	echo powerpc-unknown-openbsd${UNAME_RELEASE}
   	exit 0 ;;
  +    pegasos:OpenBSD:*:*)
  +	echo powerpc-unknown-openbsd${UNAME_RELEASE}
  +	exit 0 ;;
       pmax:OpenBSD:*:*)
   	echo mipsel-unknown-openbsd${UNAME_RELEASE}
   	exit 0 ;;
  @@ -217,69 +245,65 @@
       *:OpenBSD:*:*)
   	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
   	exit 0 ;;
  +    *:ekkoBSD:*:*)
  +	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
  +	exit 0 ;;
  +    macppc:MirBSD:*:*)
  +	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
  +	exit 0 ;;
  +    *:MirBSD:*:*)
  +	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
  +	exit 0 ;;
       alpha:OSF1:*:*)
   	if test $UNAME_RELEASE = "V4.0"; then
   		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
   	fi
  +	# According to Compaq, /usr/sbin/psrinfo has been available on
  +	# OSF/1 and Tru64 systems produced since 1995.  I hope that
  +	# covers most systems running today.  This code pipes the CPU
  +	# types through head -n 1, so we only detect the type of CPU 0.
  +	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p'
| head -n 1`
  +	case "$ALPHA_CPU_TYPE" in
  +	    "EV4 (21064)")
  +		UNAME_MACHINE="alpha" ;;
  +	    "EV4.5 (21064)")
  +		UNAME_MACHINE="alpha" ;;
  +	    "LCA4 (21066/21068)")
  +		UNAME_MACHINE="alpha" ;;
  +	    "EV5 (21164)")
  +		UNAME_MACHINE="alphaev5" ;;
  +	    "EV5.6 (21164A)")
  +		UNAME_MACHINE="alphaev56" ;;
  +	    "EV5.6 (21164PC)")
  +		UNAME_MACHINE="alphapca56" ;;
  +	    "EV5.7 (21164PC)")
  +		UNAME_MACHINE="alphapca57" ;;
  +	    "EV6 (21264)")
  +		UNAME_MACHINE="alphaev6" ;;
  +	    "EV6.7 (21264A)")
  +		UNAME_MACHINE="alphaev67" ;;
  +	    "EV6.8CB (21264C)")
  +		UNAME_MACHINE="alphaev68" ;;
  +	    "EV6.8AL (21264B)")
  +		UNAME_MACHINE="alphaev68" ;;
  +	    "EV6.8CX (21264D)")
  +		UNAME_MACHINE="alphaev68" ;;
  +	    "EV6.9A (21264/EV69A)")
  +		UNAME_MACHINE="alphaev69" ;;
  +	    "EV7 (21364)")
  +		UNAME_MACHINE="alphaev7" ;;
  +	    "EV7.9 (21364A)")
  +		UNAME_MACHINE="alphaev79" ;;
  +	esac
   	# A Vn.n version is a released version.
   	# A Tn.n version is a released field test version.
   	# A Xn.n version is an unreleased experimental baselevel.
   	# 1.2 uses "1.2" for uname -r.
  -	cat <<EOF >$dummy.s
  -	.data
  -\$Lformat:
  -	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
  -
  -	.text
  -	.globl main
  -	.align 4
  -	.ent main
  -main:
  -	.frame \$30,16,\$26,0
  -	ldgp \$29,0(\$27)
  -	.prologue 1
  -	.long 0x47e03d80 # implver \$0
  -	lda \$2,-1
  -	.long 0x47e20c21 # amask \$2,\$1
  -	lda \$16,\$Lformat
  -	mov \$0,\$17
  -	not \$1,\$18
  -	jsr \$26,printf
  -	ldgp \$29,0(\$26)
  -	mov 0,\$16
  -	jsr \$26,exit
  -	.end main
  -EOF
  -	eval $set_cc_for_build
  -	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
  -	if test "$?" = 0 ; then
  -		case `./$dummy` in
  -			0-0)
  -				UNAME_MACHINE="alpha"
  -				;;
  -			1-0)
  -				UNAME_MACHINE="alphaev5"
  -				;;
  -			1-1)
  -				UNAME_MACHINE="alphaev56"
  -				;;
  -			1-101)
  -				UNAME_MACHINE="alphapca56"
  -				;;
  -			2-303)
  -				UNAME_MACHINE="alphaev6"
  -				;;
  -			2-307)
  -				UNAME_MACHINE="alphaev67"
  -				;;
  -			2-1307)
  -				UNAME_MACHINE="alphaev68"
  -				;;
  -		esac
  -	fi
  -	rm -f $dummy.s $dummy
   	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
'abcdefghijklmnopqrstuvwxyz'`
   	exit 0 ;;
  +    Alpha*:OpenVMS:*:*)
  +	echo alpha-hp-vms
  +	exit 0 ;;
       Alpha\ *:Windows_NT*:*)
   	# How do we know it's Interix rather than the generic POSIX subsystem?
   	# Should we change UNAME_MACHINE based on the output of uname instead
  @@ -298,18 +322,12 @@
       *:[Mm]orph[Oo][Ss]:*:*)
   	echo ${UNAME_MACHINE}-unknown-morphos
   	exit 0 ;;
  -#########################
  -# Apache changes
  -#
  -    *:OS400:*:* | *:OS/400:*:*) 
  -       echo as400-ibm-os400
  -       exit 0 ;;
  -#
  -# end Apache changes
  -#########################
       *:OS/390:*:*)
   	echo i370-ibm-openedition
   	exit 0 ;;
  +    *:OS400:*:*)
  +        echo powerpc-ibm-os400
  +	exit 0 ;;
       arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
   	echo arm-acorn-riscix${UNAME_RELEASE}
   	exit 0;;
  @@ -327,6 +345,13 @@
       NILE*:*:*:dcosx)
   	echo pyramid-pyramid-svr4
   	exit 0 ;;
  +    DRS?6000:unix:4.0:6*)
  +	echo sparc-icl-nx6
  +	exit 0 ;;
  +    DRS?6000:UNIX_SV:4.2*:7*)
  +	case `/usr/bin/uname -p` in
  +	    sparc) echo sparc-icl-nx7 && exit 0 ;;
  +	esac ;;
       sun4H:SunOS:5.*:*)
   	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
   	exit 0 ;;
  @@ -395,6 +420,9 @@
       *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
           echo m68k-unknown-mint${UNAME_RELEASE}
           exit 0 ;;
  +    m68k:machten:*:*)
  +	echo m68k-apple-machten${UNAME_RELEASE}
  +	exit 0 ;;
       powerpc:machten:*:*)
   	echo powerpc-apple-machten${UNAME_RELEASE}
   	exit 0 ;;
  @@ -433,15 +461,20 @@
   	  exit (-1);
   	}
   EOF
  -	$CC_FOR_BUILD $dummy.c -o $dummy \
  -	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
  -	  && rm -f $dummy.c $dummy && exit 0
  -	rm -f $dummy.c $dummy
  +	$CC_FOR_BUILD -o $dummy $dummy.c \
  +	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
  +	  && exit 0
   	echo mips-mips-riscos${UNAME_RELEASE}
   	exit 0 ;;
       Motorola:PowerMAX_OS:*:*)
   	echo powerpc-motorola-powermax
   	exit 0 ;;
  +    Motorola:*:4.3:PL8-*)
  +	echo powerpc-harris-powermax
  +	exit 0 ;;
  +    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
  +	echo powerpc-harris-powermax
  +	exit 0 ;;
       Night_Hawk:Power_UNIX:*:*)
   	echo powerpc-harris-powerunix
   	exit 0 ;;
  @@ -514,8 +547,7 @@
   			exit(0);
   			}
   EOF
  -		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy
&& exit 0
  -		rm -f $dummy.c $dummy
  +		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
   		echo rs6000-ibm-aix3.2.5
   	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
   		echo rs6000-ibm-aix3.2.4
  @@ -613,11 +645,21 @@
                     exit (0);
                 }
   EOF
  -		    (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`./$dummy`
  -		    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
  -		    rm -f $dummy.c $dummy
  +		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
  +		    test -z "$HP_ARCH" && HP_ARCH=hppa
   		fi ;;
   	esac
  +	if [ ${HP_ARCH} = "hppa2.0w" ]
  +	then
  +	    # avoid double evaluation of $set_cc_for_build
  +	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
  +	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
  +	    then
  +		HP_ARCH="hppa2.0w"
  +	    else
  +		HP_ARCH="hppa64"
  +	    fi
  +	fi
   	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
   	exit 0 ;;
       ia64:HP-UX:*:*)
  @@ -651,8 +693,7 @@
   	  exit (0);
   	}
   EOF
  -	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy
&& exit 0
  -	rm -f $dummy.c $dummy
  +	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
   	echo unknown-hitachi-hiuxwe2
   	exit 0 ;;
       9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
  @@ -710,21 +751,26 @@
       CRAY*TS:*:*:*)
   	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
   	exit 0 ;;
  -    CRAY*T3D:*:*:*)
  -	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
  -	exit 0 ;;
       CRAY*T3E:*:*:*)
   	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
   	exit 0 ;;
       CRAY*SV1:*:*:*)
   	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
   	exit 0 ;;
  +    *:UNICOS/mp:*:*)
  +	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
  +	exit 0 ;;
       F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
   	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
           FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'
| sed -e 's/\///'`
           FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
           echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
           exit 0 ;;
  +    5000:UNIX_System_V:4.*:*)
  +        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'
| sed -e 's/\///'`
  +        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'
| sed -e 's/ /_/'`
  +        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
  +	exit 0 ;;
       i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
   	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
   	exit 0 ;;
  @@ -735,7 +781,21 @@
   	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
   	exit 0 ;;
       *:FreeBSD:*:*)
  -	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
  +	# Determine whether the default compiler uses glibc.
  +	eval $set_cc_for_build
  +	sed 's/^	//' << EOF >$dummy.c
  +	#include <features.h>
  +	#if __GLIBC__ >= 2
  +	LIBC=gnu
  +	#else
  +	LIBC=
  +	#endif
  +EOF
  +	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
  +	# GNU/KFreeBSD systems have a "k" prefix to indicate we are using
  +	# FreeBSD's kernel, but not the complete OS.
  +	case ${LIBC} in gnu) kernel_only='k' ;; esac
  +	echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
   	exit 0 ;;
       i*:CYGWIN*:*)
   	echo ${UNAME_MACHINE}-pc-cygwin
  @@ -746,14 +806,17 @@
       i*:PW*:*)
   	echo ${UNAME_MACHINE}-pc-pw32
   	exit 0 ;;
  -    x86:Interix*:3*)
  -	echo i386-pc-interix3
  +    x86:Interix*:[34]*)
  +	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
  +	exit 0 ;;
  +    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
  +	echo i${UNAME_MACHINE}-pc-mks
   	exit 0 ;;
       i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
   	# How do we know it's Interix rather than the generic POSIX subsystem?
   	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
   	# UNAME_MACHINE based on the output of uname instead of i386?
  -	echo i386-pc-interix
  +	echo i586-pc-interix
   	exit 0 ;;
       i*:UWIN*:*)
   	echo ${UNAME_MACHINE}-pc-uwin
  @@ -765,14 +828,22 @@
   	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
   	exit 0 ;;
       *:GNU:*:*)
  +	# the GNU system
   	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed
-e 's,/.*$,,'`
   	exit 0 ;;
  +    *:GNU/*:*:*)
  +	# other systems with GNU libc and userland
  +	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo
${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
  +	exit 0 ;;
       i*86:Minix:*:*)
   	echo ${UNAME_MACHINE}-pc-minix
   	exit 0 ;;
       arm*:Linux:*:*)
   	echo ${UNAME_MACHINE}-unknown-linux-gnu
   	exit 0 ;;
  +    cris:Linux:*:*)
  +	echo cris-axis-linux-gnu
  +	exit 0 ;;
       ia64:Linux:*:*)
   	echo ${UNAME_MACHINE}-unknown-linux-gnu
   	exit 0 ;;
  @@ -796,8 +867,26 @@
   	#endif
   EOF
   	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
  -	rm -f $dummy.c
  -	test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
  +	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
  +	;;
  +    mips64:Linux:*:*)
  +	eval $set_cc_for_build
  +	sed 's/^	//' << EOF >$dummy.c
  +	#undef CPU
  +	#undef mips64
  +	#undef mips64el
  +	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
  +	CPU=mips64el
  +	#else
  +	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
  +	CPU=mips64
  +	#else
  +	CPU=
  +	#endif
  +	#endif
  +EOF
  +	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
  +	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
   	;;
       ppc:Linux:*:*)
   	echo powerpc-unknown-linux-gnu
  @@ -833,6 +922,9 @@
       s390:Linux:*:* | s390x:Linux:*:*)
   	echo ${UNAME_MACHINE}-ibm-linux
   	exit 0 ;;
  +    sh64*:Linux:*:*)
  +    	echo ${UNAME_MACHINE}-unknown-linux-gnu
  +	exit 0 ;;
       sh*:Linux:*:*)
   	echo ${UNAME_MACHINE}-unknown-linux-gnu
   	exit 0 ;;
  @@ -890,9 +982,11 @@
   	LIBC=gnuaout
   	#endif
   	#endif
  +	#ifdef __dietlibc__
  +	LIBC=dietlibc
  +	#endif
   EOF
   	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
  -	rm -f $dummy.c
   	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit
0
   	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
   	;;
  @@ -910,6 +1004,26 @@
           # Use sysv4.2uw... so that sysv4* matches it.
   	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
   	exit 0 ;;
  +    i*86:OS/2:*:*)
  +	# If we were able to find `uname', then EMX Unix compatibility
  +	# is probably installed.
  +	echo ${UNAME_MACHINE}-pc-os2-emx
  +	exit 0 ;;
  +    i*86:XTS-300:*:STOP)
  +	echo ${UNAME_MACHINE}-unknown-stop
  +	exit 0 ;;
  +    i*86:atheos:*:*)
  +	echo ${UNAME_MACHINE}-unknown-atheos
  +	exit 0 ;;
  +	i*86:syllable:*:*)
  +	echo ${UNAME_MACHINE}-pc-syllable
  +	exit 0 ;;
  +    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
  +	echo i386-unknown-lynxos${UNAME_RELEASE}
  +	exit 0 ;;
  +    i*86:*DOS:*:*)
  +	echo ${UNAME_MACHINE}-pc-msdosdjgpp
  +	exit 0 ;;
       i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
   	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
   	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
  @@ -931,22 +1045,19 @@
   		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
   		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
   	elif /bin/uname -X 2>/dev/null >/dev/null ; then
  -		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
  -		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
  -		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
  +		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
  +		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
  +		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
   			&& UNAME_MACHINE=i586
  -		(/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
  +		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
   			&& UNAME_MACHINE=i686
  -		(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
  +		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
   			&& UNAME_MACHINE=i686
   		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
   	else
   		echo ${UNAME_MACHINE}-pc-sysv32
   	fi
   	exit 0 ;;
  -    i*86:*DOS:*:*)
  -	echo ${UNAME_MACHINE}-pc-msdosdjgpp
  -	exit 0 ;;
       pc:*:*:*)
   	# Left here for compatibility:
           # uname -m prints for DJGPP always 'pc', but it prints nothing about
  @@ -970,9 +1081,15 @@
   	# "miniframe"
   	echo m68010-convergent-sysv
   	exit 0 ;;
  +    mc68k:UNIX:SYSTEM5:3.51m)
  +	echo m68k-convergent-sysv
  +	exit 0 ;;
  +    M680?0:D-NIX:5.3:*)
  +	echo m68k-diab-dnix
  +	exit 0 ;;
       M68*:*:R3V[567]*:*)
   	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
  -    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0
| 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
  +    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0
| 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
   	OS_REL=''
   	test -r /etc/.relid \
   	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
  @@ -989,9 +1106,6 @@
       mc68030:UNIX_System_V:4.*:*)
   	echo m68k-atari-sysv4
   	exit 0 ;;
  -    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
  -	echo i386-unknown-lynxos${UNAME_RELEASE}
  -	exit 0 ;;
       TSUNAMI:LynxOS:2.*:*)
   	echo sparc-unknown-lynxos${UNAME_RELEASE}
   	exit 0 ;;
  @@ -1063,6 +1177,9 @@
       SX-5:SUPER-UX:*:*)
   	echo sx5-nec-superux${UNAME_RELEASE}
   	exit 0 ;;
  +    SX-6:SUPER-UX:*:*)
  +	echo sx6-nec-superux${UNAME_RELEASE}
  +	exit 0 ;;
       Power*:Rhapsody:*:*)
   	echo powerpc-apple-rhapsody${UNAME_RELEASE}
   	exit 0 ;;
  @@ -1070,7 +1187,11 @@
   	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
   	exit 0 ;;
       *:Darwin:*:*)
  -	echo `uname -p`-apple-darwin${UNAME_RELEASE}
  +	case `uname -p` in
  +	    *86) UNAME_PROCESSOR=i686 ;;
  +	    powerpc) UNAME_PROCESSOR=powerpc ;;
  +	esac
  +	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
   	exit 0 ;;
       *:procnto*:*:* | *:QNX:[0123456789]*:*)
   	UNAME_PROCESSOR=`uname -p`
  @@ -1083,7 +1204,7 @@
       *:QNX:*:4*)
   	echo i386-pc-qnx
   	exit 0 ;;
  -    NSR-[GKLNPTVW]:NONSTOP_KERNEL:*:*)
  +    NSR-?:NONSTOP_KERNEL:*:*)
   	echo nsr-tandem-nsk${UNAME_RELEASE}
   	exit 0 ;;
       *:NonStop-UX:*:*)
  @@ -1106,11 +1227,6 @@
   	fi
   	echo ${UNAME_MACHINE}-unknown-plan9
   	exit 0 ;;
  -    i*86:OS/2:*:*)
  -	# If we were able to find `uname', then EMX Unix compatibility
  -	# is probably installed.
  -	echo ${UNAME_MACHINE}-pc-os2-emx
  -	exit 0 ;;
       *:TOPS-10:*:*)
   	echo pdp10-unknown-tops10
   	exit 0 ;;
  @@ -1129,11 +1245,11 @@
       *:ITS:*:*)
   	echo pdp10-unknown-its
   	exit 0 ;;
  -    i*86:XTS-300:*:STOP)
  -	echo ${UNAME_MACHINE}-unknown-stop
  +    SEI:*:*:SEIUX)
  +        echo mips-sei-seiux${UNAME_RELEASE}
   	exit 0 ;;
  -    i*86:atheos:*:*)
  -	echo ${UNAME_MACHINE}-unknown-atheos
  +    *:DragonFly:*:*)
  +	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
   	exit 0 ;;
   esac
   
  @@ -1255,8 +1371,7 @@
   }
   EOF
   
  -$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c
$dummy && exit 0
  -rm -f $dummy.c $dummy
  +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
   
   # Apollos put the system type in the environment.
   
  
  
  
  1.9       +167 -115  apr/build/config.sub
  
  Index: config.sub
  ===================================================================
  RCS file: /home/cvs/apr/build/config.sub,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -w -d -u -r1.8 -r1.9
  --- config.sub	18 Feb 2004 10:39:09 -0000	1.8
  +++ config.sub	20 Feb 2004 16:23:04 -0000	1.9
  @@ -1,9 +1,9 @@
   #! /bin/sh
   # Configuration validation subroutine script.
   #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
  -#   2000, 2001, 2002 Free Software Foundation, Inc.
  +#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
   
  -timestamp='2002-03-07'
  +timestamp='2004-02-16'
   
   # This file is (in principle) common to ALL GNU software.
   # The presence of a machine in this file suggests that SOME GNU software
  @@ -29,11 +29,6 @@
   # configuration script generated by Autoconf, you may include it under
   # the same distribution terms that you use for the rest of that program.
   
  -#####################################################################
  -# This file contains changes for Apache, clearly marked below.
  -# These changes are hereby donated to the public domain.
  -#####################################################################
  -
   # Please send patches to <config-patches@gnu.org>.  Submit a context
   # diff and a properly formatted ChangeLog entry.
   #
  @@ -123,20 +118,11 @@
   # Here we must recognize all the valid KERNEL-OS combinations.
   maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
   case $maybe_os in
  -  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
  +  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu*
| \
  +  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
       os=-$maybe_os
       basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
       ;;
  -########################
  -# changes for Apache
  -#
  -  os400)
  -    os=-$maybe_os
  -    basic_machine=as400;
  -    ;;
  -#
  -# end Apache changes
  -########################
     *)
       basic_machine=`echo $1 | sed 's/-[^-]*$//'`
       if [ $basic_machine != $1 ]
  @@ -243,28 +229,42 @@
   	| a29k \
   	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
   	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
  +	| am33_2.0 \
   	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
   	| c4x | clipper \
  -	| d10v | d30v | dsp16xx \
  -	| fr30 \
  +	| d10v | d30v | dlx | dsp16xx \
  +	| fr30 | frv \
   	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
   	| i370 | i860 | i960 | ia64 \
  +	| ip2k | iq2000 \
   	| m32r | m68000 | m68k | m88k | mcore \
  -	| mips | mips16 | mips64 | mips64el | mips64orion | mips64orionel \
  -	| mips64vr4100 | mips64vr4100el | mips64vr4300 \
  -	| mips64vr4300el | mips64vr5000 | mips64vr5000el \
  -	| mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
  -	| mipsisa32 | mipsisa64 \
  +	| mips | mipsbe | mipseb | mipsel | mipsle \
  +	| mips16 \
  +	| mips64 | mips64el \
  +	| mips64vr | mips64vrel \
  +	| mips64orion | mips64orionel \
  +	| mips64vr4100 | mips64vr4100el \
  +	| mips64vr4300 | mips64vr4300el \
  +	| mips64vr5000 | mips64vr5000el \
  +	| mipsisa32 | mipsisa32el \
  +	| mipsisa32r2 | mipsisa32r2el \
  +	| mipsisa64 | mipsisa64el \
  +	| mipsisa64r2 | mipsisa64r2el \
  +	| mipsisa64sb1 | mipsisa64sb1el \
  +	| mipsisa64sr71k | mipsisa64sr71kel \
  +	| mipstx39 | mipstx39el \
   	| mn10200 | mn10300 \
  +	| msp430 \
   	| ns16k | ns32k \
   	| openrisc | or32 \
   	| pdp10 | pdp11 | pj | pjl \
   	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
   	| pyramid \
  -	| sh | sh[34] | sh[34]eb | shbe | shle | sh64 \
  +	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
  +	| sh64 | sh64le \
   	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
   	| strongarm \
  -	| tahoe | thumb | tic80 | tron \
  +	| tahoe | thumb | tic4x | tic80 | tron \
   	| v850 | v850e \
   	| we32k \
   	| x86 | xscale | xstormy16 | xtensa \
  @@ -296,34 +296,50 @@
   	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
   	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
   	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
  -	| arm-*  | armbe-* | armle-* | armv*-* \
  +	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
   	| avr-* \
   	| bs2000-* \
  -	| c[123]* | c30-* | [cjt]90-* | c54x-* \
  +	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
   	| clipper-* | cydra-* \
  -	| d10v-* | d30v-* \
  +	| d10v-* | d30v-* | dlx-* \
   	| elxsi-* \
  -	| f30[01]-* | f700-* | fr30-* | fx80-* \
  +	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
   	| h8300-* | h8500-* \
   	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
   	| i*86-* | i860-* | i960-* | ia64-* \
  +	| ip2k-* | iq2000-* \
   	| m32r-* \
   	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
   	| m88110-* | m88k-* | mcore-* \
  -	| mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
  -	| mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
  -	| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
  -	| mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
  -	| none-* | np1-* | ns16k-* | ns32k-* \
  +	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
  +	| mips16-* \
  +	| mips64-* | mips64el-* \
  +	| mips64vr-* | mips64vrel-* \
  +	| mips64orion-* | mips64orionel-* \
  +	| mips64vr4100-* | mips64vr4100el-* \
  +	| mips64vr4300-* | mips64vr4300el-* \
  +	| mips64vr5000-* | mips64vr5000el-* \
  +	| mipsisa32-* | mipsisa32el-* \
  +	| mipsisa32r2-* | mipsisa32r2el-* \
  +	| mipsisa64-* | mipsisa64el-* \
  +	| mipsisa64r2-* | mipsisa64r2el-* \
  +	| mipsisa64sb1-* | mipsisa64sb1el-* \
  +	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
  +	| mipstx39-* | mipstx39el-* \
  +	| msp430-* \
  +	| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
   	| orion-* \
   	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
   	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
   	| pyramid-* \
   	| romp-* | rs6000-* \
  -	| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* | sh64-* \
  +	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
  +	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
   	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
   	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
  -	| tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
  +	| tahoe-* | thumb-* \
  +	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
  +	| tron-* \
   	| v850-* | v850e-* | vax-* \
   	| we32k-* \
   	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
  @@ -347,6 +363,9 @@
   		basic_machine=a29k-amd
   		os=-udi
   		;;
  +    	abacus)
  +		basic_machine=abacus-unknown
  +		;;
   	adobe68k)
   		basic_machine=m68010-adobe
   		os=-scout
  @@ -361,6 +380,12 @@
   		basic_machine=a29k-none
   		os=-bsd
   		;;
  +	amd64)
  +		basic_machine=x86_64-pc
  +		;;
  +	amd64-*)
  +		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
  +		;;
   	amdahl)
   		basic_machine=580-amdahl
   		os=-sysv
  @@ -420,6 +445,10 @@
   		basic_machine=j90-cray
   		os=-unicos
   		;;
  +	cr16c)
  +		basic_machine=cr16c-unknown
  +		os=-elf
  +		;;
   	crds | unos)
   		basic_machine=m68k-crds
   		;;
  @@ -710,6 +739,10 @@
   	np1)
   		basic_machine=np1-gould
   		;;
  +	nv1)
  +		basic_machine=nv1-cray
  +		os=-unicosmp
  +		;;
   	nsr-tandem)
   		basic_machine=nsr-tandem
   		;;
  @@ -721,6 +754,10 @@
   		basic_machine=or32-unknown
   		os=-coff
   		;;
  +	os400)
  +		basic_machine=powerpc-ibm
  +		os=-os400
  +		;;
   	OSE68000 | ose68000)
   		basic_machine=m68000-ericsson
   		os=-ose
  @@ -749,21 +786,27 @@
   	pentium | p5 | k5 | k6 | nexgen | viac3)
   		basic_machine=i586-pc
   		;;
  -	pentiumpro | p6 | 6x86 | athlon)
  +	pentiumpro | p6 | 6x86 | athlon | athlon_*)
   		basic_machine=i686-pc
   		;;
  -	pentiumii | pentium2)
  +	pentiumii | pentium2 | pentiumiii | pentium3)
   		basic_machine=i686-pc
   		;;
  +	pentium4)
  +		basic_machine=i786-pc
  +		;;
   	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
   		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
   		;;
   	pentiumpro-* | p6-* | 6x86-* | athlon-*)
   		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
   		;;
  -	pentiumii-* | pentium2-*)
  +	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
   		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
   		;;
  +	pentium4-*)
  +		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
  +		;;
   	pn)
   		basic_machine=pn-gould
   		;;
  @@ -816,15 +859,16 @@
   		basic_machine=a29k-amd
   		os=-udi
   		;;
  -########################
  -# changes for Apache
  -#
  -	as400*)
  -		basic_machine=as400-ibm
  +	sb1)
  +		basic_machine=mipsisa64sb1-unknown
  +		;;
  +	sb1el)
  +		basic_machine=mipsisa64sb1el-unknown
  +		;;
  +	sei)
  +		basic_machine=mips-sei
  +		os=-seiux
   		;;
  -# 
  -# end Apache changes
  -########################
   	sequent)
   		basic_machine=i386-sequent
   		;;
  @@ -832,6 +876,9 @@
   		basic_machine=sh-hitachi
   		os=-hms
   		;;
  +	sh64)
  +		basic_machine=sh64-unknown
  +		;;
   	sparclite-wrs | simso-wrs)
   		basic_machine=sparclite-wrs
   		os=-vxworks
  @@ -898,10 +945,6 @@
   		basic_machine=i386-sequent
   		os=-dynix
   		;;
  -	t3d)
  -		basic_machine=alpha-cray
  -		os=-unicos
  -		;;
   	t3e)
   		basic_machine=alphaev5-cray
   		os=-unicos
  @@ -914,6 +957,14 @@
   		basic_machine=tic54x-unknown
   		os=-coff
   		;;
  +	tic55x | c55x*)
  +		basic_machine=tic55x-unknown
  +		os=-coff
  +		;;
  +	tic6x | c6x*)
  +		basic_machine=tic6x-unknown
  +		os=-coff
  +		;;
   	tx39)
   		basic_machine=mipstx39-unknown
   		;;
  @@ -927,6 +978,10 @@
   	tower | tower-32)
   		basic_machine=m68k-ncr
   		;;
  +	tpf)
  +		basic_machine=s390x-ibm
  +		os=-tpf
  +		;;
   	udi29k)
   		basic_machine=a29k-amd
   		os=-udi
  @@ -970,10 +1025,6 @@
   		basic_machine=hppa1.1-winbond
   		os=-proelf
   		;;
  -	windows32)
  -		basic_machine=i386-pc
  -		os=-windows32-msvcrt
  -		;;
           xps | xps100)
   		basic_machine=xps100-honeywell
   		;;
  @@ -1020,7 +1071,7 @@
   	we32k)
   		basic_machine=we32k-att
   		;;
  -	sh3 | sh4 | sh3eb | sh4eb)
  +	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
   		basic_machine=sh-unknown
   		;;
   	sh64)
  @@ -1044,10 +1095,6 @@
   	pmac | pmac-mpw)
   		basic_machine=powerpc-apple
   		;;
  -	c4x*)
  -		basic_machine=c4x-none
  -		os=-coff
  -		;;
   	*-unknown)
   		# Make sure to match an already-canonicalized machine name.
   		;;
  @@ -1092,14 +1139,6 @@
   	-gnu/linux*)
   		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
   		;;
  -########################
  -# changes for Apache
  -#
  -	-os400* )
  -        	;;
  -#
  -# end Apache changes
  -########################
   	# First accept the basic system types.
   	# The portable systems comes first.
   	# Each alternative MUST END IN A *, to match a version number.
  @@ -1111,18 +1150,20 @@
   	      | -aos* \
   	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
   	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
  -	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
  -	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
  +	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
  +	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
  +	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
   	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
   	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
   	      | -chorusos* | -chorusrdb* \
   	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
  -	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
  -	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
  +	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
  +	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
   	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
   	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
   	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
  -	      | -morphos* | -superux* | -rtmk* | -rtmk-nova*)
  +	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
  +	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
   	# Remember, each alternative MUST END IN *, to match a version number.
   		;;
   	-qnx*)
  @@ -1134,8 +1175,10 @@
   			;;
   		esac
   		;;
  +	-nto-qnx*)
  +		;;
   	-nto*)
  -		os=-nto-qnx
  +		os=`echo $os | sed -e 's|nto|nto-qnx|'`
   		;;
   	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
   	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
  @@ -1144,6 +1187,9 @@
   	-mac*)
   		os=`echo $os | sed -e 's|mac|macos|'`
   		;;
  +	-linux-dietlibc)
  +		os=-linux-dietlibc
  +		;;
   	-linux*)
   		os=`echo $os | sed -e 's|linux|linux-gnu|'`
   		;;
  @@ -1156,6 +1202,9 @@
   	-opened*)
   		os=-openedition
   		;;
  +        -os400*)
  +		os=-os400
  +		;;
   	-wince*)
   		os=-wince
   		;;
  @@ -1177,6 +1226,9 @@
   	-atheos*)
   		os=-atheos
   		;;
  +	-syllable*)
  +		os=-syllable
  +		;;
   	-386bsd)
   		os=-bsd
   		;;
  @@ -1199,6 +1251,9 @@
   	-sinix*)
   		os=-sysv4
   		;;
  +        -tpf*)
  +		os=-tpf
  +		;;
   	-triton*)
   		os=-sysv3
   		;;
  @@ -1229,6 +1284,12 @@
           -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
   	        os=-mint
   		;;
  +	-aros*)
  +		os=-aros
  +		;;
  +	-kaos*)
  +		os=-kaos
  +		;;
   	-none)
   		;;
   	*)
  @@ -1260,6 +1321,9 @@
   	arm*-semi)
   		os=-aout
   		;;
  +    c4x-* | tic4x-*)
  +        os=-coff
  +        ;;
   	# This must come before the *-dec entry.
   	pdp10-*)
   		os=-tops20
  @@ -1303,27 +1367,9 @@
   	*-be)
   		os=-beos
   		;;
  -########################
  -# changes for Apache
  -#
  -#	*-ibm)
  -#		os=-aix
  -#		;;
  -#
   	*-ibm)
  -		case $basic_machine in
  -			as400*)
  -				os=-os400;
  -				;;
  -			*)
   				os=-aix
   				;;
  -		esac
  -                ;;
  -# 
  -# end Apache changes
  -########################
  -
   	*-wec)
   		os=-proelf
   		;;
  @@ -1456,10 +1502,16 @@
   			-mvs* | -opened*)
   				vendor=ibm
   				;;
  +			-os400*)
  +				vendor=ibm
  +				;;
   			-ptx*)
   				vendor=sequent
   				;;
  -			-vxsim* | -vxworks*)
  +			-tpf*)
  +				vendor=ibm
  +				;;
  +			-vxsim* | -vxworks* | -windiss*)
   				vendor=wrs
   				;;
   			-aux*)
  
  
  

Mime
View raw message