xalan-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbert...@apache.org
Subject cvs commit: xml-xalan/c/src/xalanc/PlatformSupport DirectoryEnumerator.hpp
Date Wed, 03 Dec 2003 21:52:57 GMT
dbertoni    2003/12/03 13:52:57

  Modified:    c        Makefile.incl.in config.guess config.sub configure
                        configure.in runConfigure
               c/src/xalanc/Include PlatformDefinitions.hpp
               c/src/xalanc/PlatformSupport DirectoryEnumerator.hpp
  Log:
  Patch 25180 for iSeries support.
  
  Revision  Changes    Path
  1.4       +27 -0     xml-xalan/c/Makefile.incl.in
  
  Index: Makefile.incl.in
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/Makefile.incl.in,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Makefile.incl.in	2 Dec 2003 19:58:50 -0000	1.3
  +++ Makefile.incl.in	3 Dec 2003 21:52:57 -0000	1.4
  @@ -415,6 +415,33 @@
   
   endif
   
  +#=============== OS400 SPECIFIC OPTIONS =========================
  +
  +ifeq ($(PLATFORM), OS400)
  +
  +  SUPPORTED = TRUE
  +  PLATFORM_COMPILE_OPTIONS = -v -D_MULTI_THREADED -D${PLATFORM} -DXALAN_USE_XERCES_LOCAL_CODEPAGE_TRANSCODERS
  +  PLATFORM_C_COMPILE_OPTIONS = -v -D_MULTI_THREADED -D${PLATFORM} -DXALAN_USE_XERCES_LOCAL_CODEPAGE_TRANSCODERS
  +  ALLLIBS =
  +  MAKE_SHARED = ld -v ${LDFLAGS}
  +  MAKE_SHARED_C = ld -v ${LDFLAGS}
  +  SHLIBSUFFIX=.a
  +
  +  CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
  +ifeq (-DNDEBUG,$(findstring -DNDEBUG,${CXXFLAGS}))
  +  CC2 = $(CXX) $(PLATFORM_COMPILE_OPTIONS2) -DNDEBUG
  +else
  +  CC2 = $(CXX) $(PLATFORM_COMPILE_OPTIONS2)
  +endif
  +  CC3 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS2)
  +  CC4 = $(CC) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
  +  TO = qwobj
  +  EXTRA_COMPILE_OPTIONS = -I. -g  -qTERASPACE="*YES *NOTSIFC" -qSTGMDL="*INHERIT" -DXML_USE_ICONV400_TRANSCODER -DXML_USE_INMEM_MESSAGELOADER -DXML_USE_PTHREADS -DXML_USE_NETACCESSSOR_SOCKET -qTGTRLS="V5R1M0"
  +  EXTRA_LINK_OPTIONS = -qOPTION="*DUPPROC *DUPVAR *NOWARN"
  +  LINK = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
  +
  +endif
  +
   ifndef SUPPORTED
     nogood:
   	  @echo Linux, Solaris, AIX, Compaq Tru64, OS/390, MacOSX, and HP-UX are the only platforms supported.
  
  
  
  1.2       +580 -437  xml-xalan/c/config.guess
  
  Index: config.guess
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/config.guess,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- config.guess	12 Nov 2003 20:42:18 -0000	1.1
  +++ config.guess	3 Dec 2003 21:52:57 -0000	1.2
  @@ -1,9 +1,9 @@
   #! /bin/sh
   # Attempt to guess a canonical system name.
  -#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
  -#   Free Software Foundation, Inc.
  +#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
  +#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
   
  -version='2000-10-03'
  +timestamp='2003-10-20'
   
   # 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,38 +24,50 @@
   # configuration script generated by Autoconf, you may include it under
   # the same distribution terms that you use for the rest of that program.
   
  -# Written by Per Bothner <bothner@cygnus.com>.
  -# Please send patches to <config-patches@gnu.org>.
  +# 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.
   #
   # This script attempts to guess a canonical system name similar to
   # config.sub.  If it succeeds, it prints the system name on stdout, and
   # exits with 0.  Otherwise, it exits with 1.
   #
   # The plan is that this can be called by configure scripts if you
  -# don't specify an explicit system type (host/target name).
  -#
  -# Only a few systems have been added to this list; please add others
  -# (but try to keep the structure clean).
  -#
  +# don't specify an explicit build system type.
   
   me=`echo "$0" | sed -e 's,.*/,,'`
   
   usage="\
   Usage: $0 [OPTION]
   
  -Output the configuration name of this system.
  +Output the configuration name of the system \`$me' is run on.
   
   Operation modes:
  -  -h, --help               print this help, then exit
  -  -V, --version            print version number, then exit"
  +  -h, --help         print this help, then exit
  +  -t, --time-stamp   print date of last modification, then exit
  +  -v, --version      print version number, then exit
  +
  +Report bugs and patches to <config-patches@gnu.org>."
  +
  +version="\
  +GNU config.guess ($timestamp)
  +
  +Originally written by Per Bothner.
  +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
  +Free Software Foundation, Inc.
  +
  +This is free software; see the source for copying conditions.  There is NO
  +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
   
   help="
   Try \`$me --help' for more information."
   
   # Parse command line
   while test $# -gt 0 ; do
  -  case "$1" in
  -    --version | --vers* | -V )
  +  case $1 in
  +    --time-stamp | --time* | -t )
  +       echo "$timestamp" ; exit 0 ;;
  +    --version | -v )
          echo "$version" ; exit 0 ;;
       --help | --h* | -h )
          echo "$usage"; exit 0 ;;
  @@ -64,9 +76,7 @@
       - )	# Use stdin as input.
          break ;;
       -* )
  -       exec >&2
  -       echo "$me: invalid option $1"
  -       echo "$help"
  +       echo "$me: invalid option $1$help" >&2
          exit 1 ;;
       * )
          break ;;
  @@ -78,133 +88,207 @@
     exit 1
   fi
   
  -# Use $HOST_CC if defined. $CC may point to a cross-compiler
  -if test x"$CC_FOR_BUILD" = x; then
  -  if test x"$HOST_CC" != x; then
  -    CC_FOR_BUILD="$HOST_CC"
  -  else
  -    if test x"$CC" != x; then
  -      CC_FOR_BUILD="$CC"
  -    else
  -      CC_FOR_BUILD=cc
  -    fi
  -  fi
  -fi
  +trap '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.
  +
  +# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
  +# use `HOST_CC' if defined, but it is deprecated.
  +
  +# 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
  +	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
  +	     CC_FOR_BUILD="$c"; break ;
  +	  fi ;
  +	done ;
  +	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 ;'
   
   # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
  -# (ghazi@noc.rutgers.edu 8/24/94.)
  +# (ghazi@noc.rutgers.edu 1994-08-24)
   if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
   	PATH=$PATH:/.attbin ; export PATH
   fi
   
   UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
   UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
  -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
  +UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
   UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
   
  -dummy=dummy-$$
  -trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15
  -
   # Note: order is significant - the case branches are not exclusive.
   
   case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
       *:NetBSD:*:*)
  -	# Netbsd (nbsd) targets should (where applicable) match one or
  +	# NetBSD (nbsd) targets should (where applicable) match one or
   	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
   	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
   	# switched to ELF, *-*-netbsd* would select the old
   	# object file format.  This provides both forward
   	# compatibility and a consistent mechanism for selecting the
   	# object file format.
  -	# Determine the machine/vendor (is the vendor relevant).
  -	case "${UNAME_MACHINE}" in
  -	    amiga) machine=m68k-unknown ;;
  -	    arm32) machine=arm-unknown ;;
  -	    atari*) machine=m68k-atari ;;
  -	    sun3*) machine=m68k-sun ;;
  -	    mac68k) machine=m68k-apple ;;
  -	    macppc) machine=powerpc-apple ;;
  -	    hp3[0-9][05]) machine=m68k-hp ;;
  -	    ibmrt|romp-ibm) machine=romp-ibm ;;
  -	    *) machine=${UNAME_MACHINE}-unknown ;;
  +	#
  +	# Note: NetBSD doesn't particularly care about the vendor
  +	# portion of the name.  We always set it to "unknown".
  +	sysctl="sysctl -n hw.machine_arch"
  +	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 ;;
  +	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
  +	esac
  +	# The Operating System including object format, if it has switched
  +	# to ELF recently, or will in the future.
  +	case "${UNAME_MACHINE_ARCH}" in
  +	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
  +		eval $set_cc_for_build
  +		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
  +			| grep __ELF__ >/dev/null
  +		then
  +		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
  +		    # Return netbsd for either.  FIX?
  +		    os=netbsd
  +		else
  +		    os=netbsdelf
  +		fi
  +		;;
  +	    *)
  +	        os=netbsd
  +		;;
   	esac
  -	# The Operating System including object format.
  -	if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
  -		| grep __ELF__ >/dev/null
  -	then
  -	    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
  -	    # Return netbsd for either.  FIX?
  -	    os=netbsd
  -	else
  -	    os=netbsdelf
  -	fi
   	# The OS release
  -	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
  +	# 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 ;;
  +    amiga:OpenBSD:*:*)
  +	echo m68k-unknown-openbsd${UNAME_RELEASE}
  +	exit 0 ;;
  +    arc:OpenBSD:*:*)
  +	echo mipsel-unknown-openbsd${UNAME_RELEASE}
  +	exit 0 ;;
  +    hp300:OpenBSD:*:*)
  +	echo m68k-unknown-openbsd${UNAME_RELEASE}
  +	exit 0 ;;
  +    mac68k:OpenBSD:*:*)
  +	echo m68k-unknown-openbsd${UNAME_RELEASE}
  +	exit 0 ;;
  +    macppc:OpenBSD:*:*)
  +	echo powerpc-unknown-openbsd${UNAME_RELEASE}
  +	exit 0 ;;
  +    mvme68k:OpenBSD:*:*)
  +	echo m68k-unknown-openbsd${UNAME_RELEASE}
  +	exit 0 ;;
  +    mvme88k:OpenBSD:*:*)
  +	echo m88k-unknown-openbsd${UNAME_RELEASE}
  +	exit 0 ;;
  +    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 ;;
  +    sgi:OpenBSD:*:*)
  +	echo mipseb-unknown-openbsd${UNAME_RELEASE}
  +	exit 0 ;;
  +    sun3:OpenBSD:*:*)
  +	echo m68k-unknown-openbsd${UNAME_RELEASE}
  +	exit 0 ;;
  +    wgrisc:OpenBSD:*:*)
  +	echo mipsel-unknown-openbsd${UNAME_RELEASE}
  +	exit 0 ;;
  +    *:OpenBSD:*:*)
  +	echo ${UNAME_MACHINE}-unknown-openbsd${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
  -	$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"
  -				;;
  -		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
  @@ -217,40 +301,22 @@
       Amiga*:UNIX_System_V:4.0:*)
   	echo m68k-unknown-sysv4
   	exit 0;;
  -    amiga:OpenBSD:*:*)
  -	echo m68k-unknown-openbsd${UNAME_RELEASE}
  -	exit 0 ;;
       *:[Aa]miga[Oo][Ss]:*:*)
   	echo ${UNAME_MACHINE}-unknown-amigaos
   	exit 0 ;;
  -    arc64:OpenBSD:*:*)
  -	echo mips64el-unknown-openbsd${UNAME_RELEASE}
  -	exit 0 ;;
  -    arc:OpenBSD:*:*)
  -	echo mipsel-unknown-openbsd${UNAME_RELEASE}
  -	exit 0 ;;
  -    hkmips:OpenBSD:*:*)
  -	echo mips-unknown-openbsd${UNAME_RELEASE}
  -	exit 0 ;;
  -    pmax:OpenBSD:*:*)
  -	echo mipsel-unknown-openbsd${UNAME_RELEASE}
  -	exit 0 ;;
  -    sgi:OpenBSD:*:*)
  -	echo mips-unknown-openbsd${UNAME_RELEASE}
  -	exit 0 ;;
  -    wgrisc:OpenBSD:*:*)
  -	echo mipsel-unknown-openbsd${UNAME_RELEASE}
  +    *:[Mm]orph[Oo][Ss]:*:*)
  +	echo ${UNAME_MACHINE}-unknown-morphos
   	exit 0 ;;
       *:OS/390:*:*)
  -	echo i390-ibm-mvs${UNAME_RELEASE}
  +	echo i370-ibm-openedition
   	exit 0 ;;
  -    *:z/OS:*:*)
  -	echo i390-ibm-mvs${UNAME_RELEASE}
  +    *:OS400:*:*)
  +        echo powerpc-ibm-os400
   	exit 0 ;;
       arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
   	echo arm-acorn-riscix${UNAME_RELEASE}
   	exit 0;;
  -    SR2?01:HI-UX/MPP:*:*)
  +    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
   	echo hppa1.1-hitachi-hiuxmpp
   	exit 0;;
       Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
  @@ -264,6 +330,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 ;;
  @@ -292,7 +365,7 @@
   	echo m68k-sun-sunos${UNAME_RELEASE}
   	exit 0 ;;
       sun*:*:4.2BSD:*)
  -	UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
  +	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
   	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
   	case "`/bin/arch`" in
   	    sun3)
  @@ -306,9 +379,6 @@
       aushp:SunOS:*:*)
   	echo sparc-auspex-sunos${UNAME_RELEASE}
   	exit 0 ;;
  -    atari*:OpenBSD:*:*)
  -	echo m68k-unknown-openbsd${UNAME_RELEASE}
  -	exit 0 ;;
       # The situation for MiNT is a little confusing.  The machine name
       # can be virtually everything (everything which is not
       # "atarist" or "atariste" at least should have a processor
  @@ -335,18 +405,6 @@
       *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
           echo m68k-unknown-mint${UNAME_RELEASE}
           exit 0 ;;
  -    sun3*:OpenBSD:*:*)
  -	echo m68k-unknown-openbsd${UNAME_RELEASE}
  -	exit 0 ;;
  -    mac68k:OpenBSD:*:*)
  -	echo m68k-unknown-openbsd${UNAME_RELEASE}
  -	exit 0 ;;
  -    mvme68k:OpenBSD:*:*)
  -	echo m68k-unknown-openbsd${UNAME_RELEASE}
  -	exit 0 ;;
  -    mvme88k:OpenBSD:*:*)
  -	echo m88k-unknown-openbsd${UNAME_RELEASE}
  -	exit 0 ;;
       powerpc:machten:*:*)
   	echo powerpc-apple-machten${UNAME_RELEASE}
   	exit 0 ;;
  @@ -363,6 +421,7 @@
   	echo clipper-intergraph-clix${UNAME_RELEASE}
   	exit 0 ;;
       mips:*:*:UMIPS | mips:*:*:RISCos)
  +	eval $set_cc_for_build
   	sed 's/^	//' << EOF >$dummy.c
   #ifdef __cplusplus
   #include <stdio.h>  /* for printf() prototype */
  @@ -384,12 +443,20 @@
   	  exit (-1);
   	}
   EOF
  -	$CC_FOR_BUILD $dummy.c -o $dummy \
  -	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
  -	  && rm $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 ;;
  @@ -437,11 +504,20 @@
       ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
   	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
   	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
  -    i?86:AIX:*:*)
  +    i*86:AIX:*:*)
   	echo i386-ibm-aix
   	exit 0 ;;
  +    ia64:AIX:*:*)
  +	if [ -x /usr/bin/oslevel ] ; then
  +		IBM_REV=`/usr/bin/oslevel`
  +	else
  +		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
  +	fi
  +	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
  +	exit 0 ;;
       *:AIX:2:3)
   	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
  +		eval $set_cc_for_build
   		sed 's/^		//' << EOF >$dummy.c
   		#include <sys/systemcfg.h>
   
  @@ -453,8 +529,7 @@
   			exit(0);
   			}
   EOF
  -		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $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
  @@ -462,9 +537,9 @@
   		echo rs6000-ibm-aix3.2
   	fi
   	exit 0 ;;
  -    *:AIX:*:4)
  -	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
  -	if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then
  +    *:AIX:*:[45])
  +	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
  +	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
   		IBM_ARCH=rs6000
   	else
   		IBM_ARCH=powerpc
  @@ -472,7 +547,7 @@
   	if [ -x /usr/bin/oslevel ] ; then
   		IBM_REV=`/usr/bin/oslevel`
   	else
  -		IBM_REV=4.${UNAME_RELEASE}
  +		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
   	fi
   	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
   	exit 0 ;;
  @@ -498,11 +573,28 @@
   	echo m68k-hp-bsd4.4
   	exit 0 ;;
       9000/[34678]??:HP-UX:*:*)
  +	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
   	case "${UNAME_MACHINE}" in
   	    9000/31? )            HP_ARCH=m68000 ;;
   	    9000/[34]?? )         HP_ARCH=m68k ;;
   	    9000/[678][0-9][0-9])
  -              sed 's/^              //' << EOF >$dummy.c
  +		if [ -x /usr/bin/getconf ]; then
  +		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
  +                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
  +                    case "${sc_cpu_version}" in
  +                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
  +                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
  +                      532)                      # CPU_PA_RISC2_0
  +                        case "${sc_kernel_bits}" in
  +                          32) HP_ARCH="hppa2.0n" ;;
  +                          64) HP_ARCH="hppa2.0w" ;;
  +			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
  +                        esac ;;
  +                    esac
  +		fi
  +		if [ "${HP_ARCH}" = "" ]; then
  +		    eval $set_cc_for_build
  +		    sed 's/^              //' << EOF >$dummy.c
   
                 #define _HPUX_SOURCE
                 #include <stdlib.h>
  @@ -535,13 +627,29 @@
                     exit (0);
                 }
   EOF
  -	(CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
  -	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
  -	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
  +	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:*:*)
  +	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
  +	echo ia64-hp-hpux${HPUX_REV}
  +	exit 0 ;;
       3050*:HI-UX:*:*)
  +	eval $set_cc_for_build
   	sed 's/^	//' << EOF >$dummy.c
   	#include <unistd.h>
   	int
  @@ -567,8 +675,7 @@
   	  exit (0);
   	}
   EOF
  -	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $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:*:* )
  @@ -577,7 +684,7 @@
       9000/8??:4.3bsd:*:*)
   	echo hppa1.0-hp-bsd
   	exit 0 ;;
  -    *9??*:MPE/iX:*:*)
  +    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
   	echo hppa1.0-hp-mpeix
   	exit 0 ;;
       hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
  @@ -586,7 +693,7 @@
       hp8??:OSF1:*:*)
   	echo hppa1.0-hp-osf
   	exit 0 ;;
  -    i?86:OSF1:*:*)
  +    i*86:OSF1:*:*)
   	if [ -x /usr/sbin/sysversion ] ; then
   	    echo ${UNAME_MACHINE}-unknown-osf1mk
   	else
  @@ -596,9 +703,6 @@
       parisc*:Lites*:*:*)
   	echo hppa1.1-hp-lites
   	exit 0 ;;
  -    hppa*:OpenBSD:*:*)
  -	echo hppa-unknown-openbsd
  -	exit 0 ;;
       C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
   	echo c1-convex-bsd
           exit 0 ;;
  @@ -617,41 +721,39 @@
       C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
   	echo c4-convex-bsd
           exit 0 ;;
  -    CRAY*X-MP:*:*:*)
  -	echo xmp-cray-unicos
  -        exit 0 ;;
       CRAY*Y-MP:*:*:*)
  -	echo ymp-cray-unicos${UNAME_RELEASE}
  +	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
   	exit 0 ;;
       CRAY*[A-Z]90:*:*:*)
   	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
   	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
  -	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
  +	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
  +	      -e 's/\.[^.]*$/.X/'
   	exit 0 ;;
       CRAY*TS:*:*:*)
   	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
   	exit 0 ;;
       CRAY*T3E:*:*:*)
  -	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
  +	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 ;;
  -    CRAY-2:*:*:*)
  -	echo cray2-cray-unicos
  -        exit 0 ;;
  -    F300:UNIX_System_V:*:*)
  +    *: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 "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
  +        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
           exit 0 ;;
  -    F301:UNIX_System_V:*:*)
  -       echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
  -       exit 0 ;;
  -    hp300:OpenBSD:*:*)
  -	echo m68k-unknown-openbsd${UNAME_RELEASE}
  +    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:*:*)
  +    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
   	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
   	exit 0 ;;
       sparc*:BSD/OS:*:*)
  @@ -661,10 +763,21 @@
   	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
   	exit 0 ;;
       *:FreeBSD:*:*)
  -	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
  -	exit 0 ;;
  -    *:OpenBSD:*:*)
  -	echo ${UNAME_MACHINE}-unknown-openbsd`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
  @@ -675,11 +788,17 @@
       i*:PW*:*)
   	echo ${UNAME_MACHINE}-pc-pw32
   	exit 0 ;;
  +    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
  @@ -691,229 +810,175 @@
   	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 ;;
  -    *:Linux:*:*)
  -
  +    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 ;;
  +    m68*:Linux:*:*)
  +	echo ${UNAME_MACHINE}-unknown-linux-gnu
  +	exit 0 ;;
  +    mips:Linux:*:*)
  +	eval $set_cc_for_build
  +	sed 's/^	//' << EOF >$dummy.c
  +	#undef CPU
  +	#undef mips
  +	#undef mipsel
  +	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
  +	CPU=mipsel
  +	#else
  +	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
  +	CPU=mips
  +	#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
  +	;;
  +    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
  +	exit 0 ;;
  +    ppc64:Linux:*:*)
  +	echo powerpc64-unknown-linux-gnu
  +	exit 0 ;;
  +    alpha:Linux:*:*)
  +	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
  +	  EV5)   UNAME_MACHINE=alphaev5 ;;
  +	  EV56)  UNAME_MACHINE=alphaev56 ;;
  +	  PCA56) UNAME_MACHINE=alphapca56 ;;
  +	  PCA57) UNAME_MACHINE=alphapca56 ;;
  +	  EV6)   UNAME_MACHINE=alphaev6 ;;
  +	  EV67)  UNAME_MACHINE=alphaev67 ;;
  +	  EV68*) UNAME_MACHINE=alphaev68 ;;
  +        esac
  +	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
  +	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
  +	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
  +	exit 0 ;;
  +    parisc:Linux:*:* | hppa:Linux:*:*)
  +	# Look for CPU level
  +	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
  +	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
  +	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
  +	  *)    echo hppa-unknown-linux-gnu ;;
  +	esac
  +	exit 0 ;;
  +    parisc64:Linux:*:* | hppa64:Linux:*:*)
  +	echo hppa64-unknown-linux-gnu
  +	exit 0 ;;
  +    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 ;;
  +    sparc:Linux:*:* | sparc64:Linux:*:*)
  +	echo ${UNAME_MACHINE}-unknown-linux-gnu
  +	exit 0 ;;
  +    x86_64:Linux:*:*)
  +	echo x86_64-unknown-linux-gnu
  +	exit 0 ;;
  +    i*86:Linux:*:*)
   	# The BFD linker knows what the default object file format is, so
   	# first see if it will tell us. cd to the root directory to prevent
   	# problems with other programs or directories called `ld' in the path.
  -	ld_supported_emulations=`cd /; ld --help 2>&1 \
  -			 | sed -ne '/supported emulations:/!d
  +	# Set LC_ALL=C to ensure ld outputs messages in English.
  +	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
  +			 | sed -ne '/supported targets:/!d
   				    s/[ 	][ 	]*/ /g
  -				    s/.*supported emulations: *//
  +				    s/.*supported targets: *//
   				    s/ .*//
   				    p'`
  -        case "$ld_supported_emulations" in
  -	  *ia64)
  -		echo "${UNAME_MACHINE}-unknown-linux"
  -		exit 0
  -		;;
  -	  i?86linux)
  -		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
  -		exit 0
  -		;;
  -	  elf_i?86)
  +        case "$ld_supported_targets" in
  +	  elf32-i386)
   		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
   		;;
  -	  i?86coff)
  +	  a.out-i386-linux)
  +		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
  +		exit 0 ;;
  +	  coff-i386)
   		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
  -		exit 0
  -		;;
  -	  sparclinux)
  -		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
  -		exit 0
  -		;;
  -	  armlinux)
  -		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
  -		exit 0
  -		;;
  -	  elf32arm*)
  -		echo "${UNAME_MACHINE}-unknown-linux-gnuoldld"
  -		exit 0
  -		;;
  -	  armelf_linux*)
  -		echo "${UNAME_MACHINE}-unknown-linux-gnu"
  -		exit 0
  -		;;
  -	  m68klinux)
  -		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
  -		exit 0
  -		;;
  -	  elf32ppc | elf32ppclinux)
  -		# Determine Lib Version
  -		cat >$dummy.c <<EOF
  -#include <features.h>
  -#if defined(__GLIBC__)
  -extern char __libc_version[];
  -extern char __libc_release[];
  -#endif
  -main(argc, argv)
  -     int argc;
  -     char *argv[];
  -{
  -#if defined(__GLIBC__)
  -  printf("%s %s\n", __libc_version, __libc_release);
  -#else
  -  printf("unkown\n");
  -#endif
  -  return 0;
  -}
  -EOF
  -		LIBC=""
  -		$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
  -		if test "$?" = 0 ; then
  -			./$dummy | grep 1\.99 > /dev/null
  -			if test "$?" = 0 ; then
  -				LIBC="libc1"
  -			fi
  -		fi
  -		rm -f $dummy.c $dummy
  -		echo powerpc-unknown-linux-gnu${LIBC}
  -		exit 0
  -		;;
  -	  shelf_linux)
  -		echo "${UNAME_MACHINE}-unknown-linux-gnu"
  -		exit 0
  -		;;
  +		exit 0 ;;
  +	  "")
  +		# Either a pre-BFD a.out linker (linux-gnuoldld) or
  +		# one that does not give us useful --help.
  +		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
  +		exit 0 ;;
   	esac
  -
  -	if test "${UNAME_MACHINE}" = "alpha" ; then
  -		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
  -		LIBC=""
  -		$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"
  -				;;
  -			esac
  -
  -			objdump --private-headers $dummy | \
  -			  grep ld.so.1 > /dev/null
  -			if test "$?" = 0 ; then
  -				LIBC="libc1"
  -			fi
  -		fi
  -		rm -f $dummy.s $dummy
  -		echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
  -	elif test "${UNAME_MACHINE}" = "mips" ; then
  -	  cat >$dummy.c <<EOF
  -#ifdef __cplusplus
  -#include <stdio.h>  /* for printf() prototype */
  -	int main (int argc, char *argv[]) {
  -#else
  -	int main (argc, argv) int argc; char *argv[]; {
  -#endif
  -#ifdef __MIPSEB__
  -  printf ("%s-unknown-linux-gnu\n", argv[1]);
  -#endif
  -#ifdef __MIPSEL__
  -  printf ("%sel-unknown-linux-gnu\n", argv[1]);
  -#endif
  -  return 0;
  -}
  -EOF
  -	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
  -	  rm -f $dummy.c $dummy
  -	elif test "${UNAME_MACHINE}" = "s390"; then
  -	  echo s390-ibm-linux && exit 0
  -	elif test "${UNAME_MACHINE}" = "x86_64"; then
  -	  echo x86_64-unknown-linux-gnu && exit 0
  -	else
  -	  # Either a pre-BFD a.out linker (linux-gnuoldld)
  -	  # or one that does not give us useful --help.
  -	  # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
  -	  # If ld does not provide *any* "supported emulations:"
  -	  # that means it is gnuoldld.
  -	  test -z "$ld_supported_emulations" \
  -	    && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
  -
  -	  case "${UNAME_MACHINE}" in
  -	  i?86)
  -	    VENDOR=pc;
  -	    ;;
  -	  *)
  -	    VENDOR=unknown;
  -	    ;;
  -	  esac
  -	  # Determine whether the default compiler is a.out or elf
  -	  cat >$dummy.c <<EOF
  -#include <features.h>
  -#ifdef __cplusplus
  -#include <stdio.h>  /* for printf() prototype */
  -	int main (int argc, char *argv[]) {
  -#else
  -	int main (argc, argv) int argc; char *argv[]; {
  -#endif
  -#ifdef __ELF__
  -# ifdef __GLIBC__
  -#  if __GLIBC__ >= 2
  -    printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
  -#  else
  -    printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
  -#  endif
  -# else
  -   printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
  -# endif
  -#else
  -  printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
  -#endif
  -  return 0;
  -}
  +	# Determine whether the default compiler is a.out or elf
  +	eval $set_cc_for_build
  +	sed 's/^	//' << EOF >$dummy.c
  +	#include <features.h>
  +	#ifdef __ELF__
  +	# ifdef __GLIBC__
  +	#  if __GLIBC__ >= 2
  +	LIBC=gnu
  +	#  else
  +	LIBC=gnulibc1
  +	#  endif
  +	# else
  +	LIBC=gnulibc1
  +	# endif
  +	#else
  +	#ifdef __INTEL_COMPILER
  +	LIBC=gnu
  +	#else
  +	LIBC=gnuaout
  +	#endif
  +	#endif
  +	#ifdef __dietlibc__
  +	LIBC=dietlibc
  +	#endif
   EOF
  -	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
  -	  rm -f $dummy.c $dummy
  -	  test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
  -	fi ;;
  -# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
  -# are messed up and put the nodename in both sysname and nodename.
  -    i?86:DYNIX/ptx:4*:*)
  +	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
  +	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
  +	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
  +	;;
  +    i*86:DYNIX/ptx:4*:*)
  +	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
  +	# earlier versions are messed up and put the nodename in both
  +	# sysname and nodename.
   	echo i386-sequent-sysv4
   	exit 0 ;;
  -    i?86:UNIX_SV:4.2MP:2.*)
  +    i*86:UNIX_SV:4.2MP:2.*)
           # Unixware is an offshoot of SVR4, but it has its own version
           # number series starting with 2...
           # I am not positive that other SVR4 systems won't match this,
  @@ -921,7 +986,27 @@
           # Use sysv4.2uw... so that sysv4* matches it.
   	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
   	exit 0 ;;
  -    i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
  +    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
   		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
  @@ -929,36 +1014,32 @@
   		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
   	fi
   	exit 0 ;;
  -    i?86:*:5:7*)
  -        # Fixed at (any) Pentium or better
  -        UNAME_MACHINE=i586
  -        if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
  -	    echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
  -	else
  -	    echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
  -	fi
  +    i*86:*:5:[78]*)
  +	case `/bin/uname -X | grep "^Machine"` in
  +	    *486*)	     UNAME_MACHINE=i486 ;;
  +	    *Pentium)	     UNAME_MACHINE=i586 ;;
  +	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
  +	esac
  +	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
   	exit 0 ;;
  -    i?86:*:3.2:*)
  +    i*86:*:3.2:*)
   	if test -f /usr/options/cb.name; then
   		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
  @@ -982,9 +1063,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]??,*:*:4.0:3.0 | 4850:*: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`
  @@ -995,21 +1082,21 @@
       3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
           /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
             && echo i486-ncr-sysv4 && exit 0 ;;
  -    m68*:LynxOS:2.*:*)
  +    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
   	echo m68k-unknown-lynxos${UNAME_RELEASE}
   	exit 0 ;;
       mc68030:UNIX_System_V:4.*:*)
   	echo m68k-atari-sysv4
   	exit 0 ;;
  -    i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:*)
  -	echo i386-unknown-lynxos${UNAME_RELEASE}
  -	exit 0 ;;
       TSUNAMI:LynxOS:2.*:*)
   	echo sparc-unknown-lynxos${UNAME_RELEASE}
   	exit 0 ;;
  -    rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
  +    rs6000:LynxOS:2.*:*)
   	echo rs6000-unknown-lynxos${UNAME_RELEASE}
   	exit 0 ;;
  +    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
  +	echo powerpc-unknown-lynxos${UNAME_RELEASE}
  +	exit 0 ;;
       SM[BE]S:UNIX_SV:*:*)
   	echo mips-dde-sysv${UNAME_RELEASE}
   	exit 0 ;;
  @@ -1027,8 +1114,8 @@
   		echo ns32k-sni-sysv
   	fi
   	exit 0 ;;
  -    PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
  -                           # says <Richard.M.Bartel@ccMail.Census.GOV>
  +    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
  +                      # says <Richard.M.Bartel@ccMail.Census.GOV>
           echo i586-unisys-sysv4
           exit 0 ;;
       *:UNIX_System_V:4*:FTX*)
  @@ -1040,6 +1127,10 @@
   	# From seanf@swdc.stratus.com.
   	echo i860-stratus-sysv4
   	exit 0 ;;
  +    *:VOS:*:*)
  +	# From Paul.Green@stratus.com.
  +	echo hppa1.1-stratus-vos
  +	exit 0 ;;
       mc68*:A/UX:*:*)
   	echo m68k-apple-aux${UNAME_RELEASE}
   	exit 0 ;;
  @@ -1068,6 +1159,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 ;;
  @@ -1075,20 +1169,29 @@
   	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]*:*)
  -	if test "${UNAME_MACHINE}" = "x86pc"; then
  +	UNAME_PROCESSOR=`uname -p`
  +	if test "$UNAME_PROCESSOR" = "x86"; then
  +		UNAME_PROCESSOR=i386
   		UNAME_MACHINE=pc
   	fi
  -	echo `uname -p`-${UNAME_MACHINE}-nto-qnx
  +	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
   	exit 0 ;;
       *:QNX:*:4*)
   	echo i386-pc-qnx
   	exit 0 ;;
  -    NSR-[KW]:NONSTOP_KERNEL:*:*)
  +    NSR-[DGKLNPTVWY]:NONSTOP_KERNEL:*:*)
   	echo nsr-tandem-nsk${UNAME_RELEASE}
   	exit 0 ;;
  +    *:NonStop-UX:*:*)
  +	echo mips-compaq-nonstopux
  +	exit 0 ;;
       BS2000:POSIX*:*:*)
   	echo bs2000-siemens-sysv
   	exit 0 ;;
  @@ -1106,11 +1209,36 @@
   	fi
   	echo ${UNAME_MACHINE}-unknown-plan9
   	exit 0 ;;
  +    *:TOPS-10:*:*)
  +	echo pdp10-unknown-tops10
  +	exit 0 ;;
  +    *:TENEX:*:*)
  +	echo pdp10-unknown-tenex
  +	exit 0 ;;
  +    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
  +	echo pdp10-dec-tops20
  +	exit 0 ;;
  +    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
  +	echo pdp10-xkl-tops20
  +	exit 0 ;;
  +    *:TOPS-20:*:*)
  +	echo pdp10-unknown-tops20
  +	exit 0 ;;
  +    *:ITS:*:*)
  +	echo pdp10-unknown-its
  +	exit 0 ;;
  +    SEI:*:*:SEIUX)
  +        echo mips-sei-seiux${UNAME_RELEASE}
  +	exit 0 ;;
  +    *:DRAGONFLY:*:*)
  +	echo ${UNAME_MACHINE}-unknown-dragonfly${UNAME_RELEASE}
  +	exit 0 ;;
   esac
   
   #echo '(No uname command or uname output not recognized.)' 1>&2
   #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
   
  +eval $set_cc_for_build
   cat >$dummy.c <<EOF
   #ifdef _SEQUENT_
   # include <sys/types.h>
  @@ -1197,11 +1325,24 @@
   #endif
   
   #if defined (vax)
  -#if !defined (ultrix)
  -  printf ("vax-dec-bsd\n"); exit (0);
  -#else
  -  printf ("vax-dec-ultrix\n"); exit (0);
  -#endif
  +# if !defined (ultrix)
  +#  include <sys/param.h>
  +#  if defined (BSD)
  +#   if BSD == 43
  +      printf ("vax-dec-bsd4.3\n"); exit (0);
  +#   else
  +#    if BSD == 199006
  +      printf ("vax-dec-bsd4.3reno\n"); exit (0);
  +#    else
  +      printf ("vax-dec-bsd\n"); exit (0);
  +#    endif
  +#   endif
  +#  else
  +    printf ("vax-dec-bsd\n"); exit (0);
  +#  endif
  +# else
  +    printf ("vax-dec-ultrix\n"); exit (0);
  +# endif
   #endif
   
   #if defined (alliant) && defined (i860)
  @@ -1212,8 +1353,7 @@
   }
   EOF
   
  -$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $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.
   
  @@ -1248,8 +1388,9 @@
   cat >&2 <<EOF
   $0: unable to guess system type
   
  -The $version version of this script cannot recognize your system type.
  -Please download the most up to date version of the config scripts:
  +This script, last modified $timestamp, has failed to recognize
  +the operating system you are using. It is advised that you
  +download the most up to date version of the config scripts from
   
       ftp://ftp.gnu.org/pub/gnu/config/
   
  @@ -1258,7 +1399,7 @@
   pertinent to <config-patches@gnu.org> in order to provide the needed
   information to handle your system.
   
  -config.guess version = $version
  +config.guess timestamp = $timestamp
   
   uname -m = `(uname -m) 2>/dev/null || echo unknown`
   uname -r = `(uname -r) 2>/dev/null || echo unknown`
  @@ -1285,7 +1426,9 @@
   
   # Local variables:
   # eval: (add-hook 'write-file-hooks 'time-stamp)
  -# time-stamp-start: "version='"
  +# time-stamp-start: "timestamp='"
   # time-stamp-format: "%:y-%02m-%02d"
   # time-stamp-end: "'"
   # End:
  +
  +
  
  
  
  1.2       +349 -142  xml-xalan/c/config.sub
  
  Index: config.sub
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/config.sub,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- config.sub	12 Nov 2003 20:42:18 -0000	1.1
  +++ config.sub	3 Dec 2003 21:52:57 -0000	1.2
  @@ -1,9 +1,9 @@
   #! /bin/sh
  -# Configuration validation subroutine script, version 1.1.
  -#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
  -#   Free Software Foundation, Inc.
  +# Configuration validation subroutine script.
  +#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
  +#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
   
  -version='2000-09-11'
  +timestamp='2003-11-20'
   
   # This file is (in principle) common to ALL GNU software.
   # The presence of a machine in this file suggests that SOME GNU software
  @@ -29,7 +29,8 @@
   # configuration script generated by Autoconf, you may include it under
   # the same distribution terms that you use for the rest of that program.
   
  -# Please send patches to <config-patches@gnu.org>.
  +# Please send patches to <config-patches@gnu.org>.  Submit a context
  +# diff and a properly formatted ChangeLog entry.
   #
   # Configuration subroutine to validate and canonicalize a configuration type.
   # Supply the specified configuration type as an argument.
  @@ -60,16 +61,30 @@
   Canonicalize a configuration name.
   
   Operation modes:
  -  -h, --help               print this help, then exit
  -  -V, --version            print version number, then exit"
  +  -h, --help         print this help, then exit
  +  -t, --time-stamp   print date of last modification, then exit
  +  -v, --version      print version number, then exit
  +
  +Report bugs and patches to <config-patches@gnu.org>."
  +
  +version="\
  +GNU config.sub ($timestamp)
  +
  +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
  +Free Software Foundation, Inc.
  +
  +This is free software; see the source for copying conditions.  There is NO
  +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
   
   help="
   Try \`$me --help' for more information."
   
   # Parse command line
   while test $# -gt 0 ; do
  -  case "$1" in
  -    --version | --vers* | -V )
  +  case $1 in
  +    --time-stamp | --time* | -t )
  +       echo "$timestamp" ; exit 0 ;;
  +    --version | -v )
          echo "$version" ; exit 0 ;;
       --help | --h* | -h )
          echo "$usage"; exit 0 ;;
  @@ -78,9 +93,7 @@
       - )	# Use stdin as input.
          break ;;
       -* )
  -       exec >&2
  -       echo "$me: invalid option $1"
  -       echo "$help"
  +       echo "$me: invalid option $1$help"
          exit 1 ;;
   
       *local*)
  @@ -105,7 +118,8 @@
   # 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*)
  +  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/'`
       ;;
  @@ -145,6 +159,14 @@
   		os=-vxworks
   		basic_machine=$1
   		;;
  +	-chorusos*)
  +		os=-chorusos
  +		basic_machine=$1
  +		;;
  + 	-chorusrdb)
  + 		os=-chorusrdb
  +		basic_machine=$1
  + 		;;
   	-hiux*)
   		os=-hiuxwe2
   		;;
  @@ -203,22 +225,50 @@
   case $basic_machine in
   	# Recognize the basic CPU types without company name.
   	# Some are omitted here because they have special meanings below.
  -	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
  -		| arme[lb] | armv[2345] | armv[345][lb] | pyramid | mn10200 | mn10300 | tron | a29k \
  -		| 580 | i960 | h8300 \
  -		| x86 | ppcbe | mipsbe | mipsle | shbe | shle | armbe | armle \
  -		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
  -		| hppa64 \
  -		| alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
  -		| alphaev6[78] \
  -		| we32k | ns16k | clipper | i390 | sh | sh[34] \
  -		| powerpc | powerpcle \
  -		| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
  -		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
  -		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
  -		| mips64vr5000 | miprs64vr5000el | mcore \
  -		| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
  -		| thumb | d10v | d30v | fr30 | avr)
  +	1750a | 580 \
  +	| 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 | 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 | 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[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 | tic4x | tic80 | tron \
  +	| v850 | v850e \
  +	| we32k \
  +	| x86 | xscale | xstormy16 | xtensa \
  +	| z8k)
   		basic_machine=$basic_machine-unknown
   		;;
   	m6811 | m68hc11 | m6812 | m68hc12)
  @@ -226,13 +276,13 @@
   		basic_machine=$basic_machine-unknown
   		os=-none
   		;;
  -	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl)
  +	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
   		;;
   
   	# We use `pc' rather than `unknown'
   	# because (1) that's what they normally are, and
   	# (2) the word "unknown" tends to confuse beginning users.
  -	i[234567]86 | x86_64)
  +	i*86 | x86_64)
   	  basic_machine=$basic_machine-pc
   	  ;;
   	# Object if more than one company name word.
  @@ -241,28 +291,61 @@
   		exit 1
   		;;
   	# Recognize the basic CPU types with company name.
  -	# FIXME: clean up the formatting here.
  -	vax-* | tahoe-* | i[234567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
  -	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
  -	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
  -	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
  -	      | xmp-* | ymp-* \
  -	      | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* | armbe-* | armle-* \
  -	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
  -	      | hppa2.0n-* | hppa64-* \
  -	      | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
  -	      | alphaev6[78]-* \
  -	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
  -	      | clipper-* | orion-* \
  -	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
  -	      | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
  -	      | mips64el-* | mips64orion-* | mips64orionel-* \
  -	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
  -	      | mipstx39-* | mipstx39el-* | mcore-* \
  -	      | f301-* | armv*-* | s390-* | sv1-* | t3e-* \
  -	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
  -	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* \
  -	      | bs2000-* | tic54x-* | c54x-* | x86_64-*)
  +	580-* \
  +	| a29k-* \
  +	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
  +	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
  +	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
  +	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
  +	| avr-* \
  +	| bs2000-* \
  +	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
  +	| clipper-* | cydra-* \
  +	| d10v-* | d30v-* | dlx-* \
  +	| elxsi-* \
  +	| 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-* | 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[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-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
  +	| tron-* \
  +	| v850-* | v850e-* | vax-* \
  +	| we32k-* \
  +	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
  +	| xtensa-* \
  +	| ymp-* \
  +	| z8k-*)
   		;;
   	# Recognize the various machine names and aliases which stand
   	# for a CPU type and a company and sometimes even an OS.
  @@ -294,6 +377,9 @@
   		basic_machine=a29k-none
   		os=-bsd
   		;;
  +	amd64)
  +		basic_machine=x86_64-pc
  +		;;
   	amdahl)
   		basic_machine=580-amdahl
   		os=-sysv
  @@ -325,6 +411,10 @@
   		basic_machine=ns32k-sequent
   		os=-dynix
   		;;
  +	c90)
  +		basic_machine=c90-cray
  +		os=-unicos
  +		;;
   	convex-c1)
   		basic_machine=c1-convex
   		os=-bsd
  @@ -345,16 +435,8 @@
   		basic_machine=c38-convex
   		os=-bsd
   		;;
  -	cray | ymp)
  -		basic_machine=ymp-cray
  -		os=-unicos
  -		;;
  -	cray2)
  -		basic_machine=cray2-cray
  -		os=-unicos
  -		;;
  -	[ctj]90-cray)
  -		basic_machine=c90-cray
  +	cray | j90)
  +		basic_machine=j90-cray
   		os=-unicos
   		;;
   	crds | unos)
  @@ -369,6 +451,14 @@
   	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
   		basic_machine=mips-dec
   		;;
  +	decsystem10* | dec10*)
  +		basic_machine=pdp10-dec
  +		os=-tops10
  +		;;
  +	decsystem20* | dec20*)
  +		basic_machine=pdp10-dec
  +		os=-tops20
  +		;;
   	delta | 3300 | motorola-3300 | motorola-delta \
   	      | 3300-motorola | delta-motorola)
   		basic_machine=m68k-motorola
  @@ -410,6 +500,10 @@
   		basic_machine=tron-gmicro
   		os=-sysv
   		;;
  +	go32)
  +		basic_machine=i386-pc
  +		os=-go32
  +		;;
   	h3050r* | hiux*)
   		basic_machine=hppa1.1-hitachi
   		os=-hiuxwe2
  @@ -481,23 +575,23 @@
   		basic_machine=hppa1.1-hp
   		os=-proelf
   		;;
  -	i390-ibm* | ibm*)
  -		basic_machine=i390-ibm
  +	i370-ibm* | ibm*)
  +		basic_machine=i370-ibm
   		;;
   # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
  -	i[34567]86v32)
  +	i*86v32)
   		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
   		os=-sysv32
   		;;
  -	i[34567]86v4*)
  +	i*86v4*)
   		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
   		os=-sysv4
   		;;
  -	i[34567]86v)
  +	i*86v)
   		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
   		os=-sysv
   		;;
  -	i[34567]86sol2)
  +	i*86sol2)
   		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
   		os=-solaris2
   		;;
  @@ -509,18 +603,6 @@
   		basic_machine=i386-unknown
   		os=-vsta
   		;;
  -	i386-go32 | go32)
  -		basic_machine=i386-unknown
  -		os=-go32
  -		;;
  -	i386-mingw32 | mingw32)
  -		basic_machine=i386-unknown
  -		os=-mingw32
  -		;;
  -	i[34567]86-pw32 | pw32)
  -		basic_machine=i586-unknown
  -		os=-pw32
  -		;;
   	iris | iris4d)
   		basic_machine=mips-sgi
   		case $os in
  @@ -546,6 +628,10 @@
   		basic_machine=ns32k-utek
   		os=-sysv
   		;;
  +	mingw32)
  +		basic_machine=i386-pc
  +		os=-mingw32
  +		;;
   	miniframe)
   		basic_machine=m68000-convergent
   		;;
  @@ -553,14 +639,6 @@
   		basic_machine=m68k-atari
   		os=-mint
   		;;
  -	mipsel*-linux*)
  -		basic_machine=mipsel-unknown
  -		os=-linux-gnu
  -		;;
  -	mips*-linux*)
  -		basic_machine=mips-unknown
  -		os=-linux-gnu
  -		;;
   	mips3*-*)
   		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
   		;;
  @@ -575,12 +653,16 @@
   		basic_machine=m68k-rom68k
   		os=-coff
   		;;
  +	morphos)
  +		basic_machine=powerpc-unknown
  +		os=-morphos
  +		;;
   	msdos)
  -		basic_machine=i386-unknown
  +		basic_machine=i386-pc
   		os=-msdos
   		;;
   	mvs)
  -		basic_machine=i390-ibm
  +		basic_machine=i370-ibm
   		os=-mvs
   		;;
   	ncr3000)
  @@ -640,9 +722,17 @@
   		basic_machine=i960-intel
   		os=-mon960
   		;;
  +	nonstopux)
  +		basic_machine=mips-compaq
  +		os=-nonstopux
  +		;;
   	np1)
   		basic_machine=np1-gould
   		;;
  +	nv1)
  +		basic_machine=nv1-cray
  +		os=-unicosmp
  +		;;
   	nsr-tandem)
   		basic_machine=nsr-tandem
   		;;
  @@ -650,6 +740,14 @@
   		basic_machine=hppa1.1-oki
   		os=-proelf
   		;;
  +	or32 | or32-*)
  +		basic_machine=or32-unknown
  +		os=-coff
  +		;;
  +	os400)
  +		basic_machine=powerpc-ibm
  +		os=-os400
  +		;;
   	OSE68000 | ose68000)
   		basic_machine=m68000-ericsson
   		os=-ose
  @@ -672,45 +770,65 @@
   	pbb)
   		basic_machine=m68k-tti
   		;;
  -        pc532 | pc532-*)
  +	pc532 | pc532-*)
   		basic_machine=ns32k-pc532
   		;;
  -	pentium | p5 | k5 | k6 | nexen)
  +	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-* | nexen-*)
  +	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
   		;;
  -	power)	basic_machine=rs6000-ibm
  +	power)	basic_machine=power-ibm
   		;;
   	ppc)	basic_machine=powerpc-unknown
  -	        ;;
  +		;;
   	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
   		;;
   	ppcle | powerpclittle | ppc-le | powerpc-little)
   		basic_machine=powerpcle-unknown
  -	        ;;
  +		;;
   	ppcle-* | powerpclittle-*)
   		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
   		;;
  +	ppc64)	basic_machine=powerpc64-unknown
  +		;;
  +	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
  +		;;
  +	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
  +		basic_machine=powerpc64le-unknown
  +		;;
  +	ppc64le-* | powerpc64little-*)
  +		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
  +		;;
   	ps2)
   		basic_machine=i386-ibm
   		;;
  +	pw32)
  +		basic_machine=i586-unknown
  +		os=-pw32
  +		;;
   	rom68k)
   		basic_machine=m68k-rom68k
   		os=-coff
  @@ -721,10 +839,26 @@
   	rtpc | rtpc-*)
   		basic_machine=romp-ibm
   		;;
  +	s390 | s390-*)
  +		basic_machine=s390-ibm
  +		;;
  +	s390x | s390x-*)
  +		basic_machine=s390x-ibm
  +		;;
   	sa29200)
   		basic_machine=a29k-amd
   		os=-udi
   		;;
  +	sb1)
  +		basic_machine=mipsisa64sb1-unknown
  +		;;
  +	sb1el)
  +		basic_machine=mipsisa64sb1el-unknown
  +		;;
  +	sei)
  +		basic_machine=mips-sei
  +		os=-seiux
  +		;;
   	sequent)
   		basic_machine=i386-sequent
   		;;
  @@ -732,7 +866,10 @@
   		basic_machine=sh-hitachi
   		os=-hms
   		;;
  -	sparclite-wrs)
  +	sh64)
  +		basic_machine=sh64-unknown
  +		;;
  +	sparclite-wrs | simso-wrs)
   		basic_machine=sparclite-wrs
   		os=-vxworks
   		;;
  @@ -799,22 +936,42 @@
   		os=-dynix
   		;;
   	t3e)
  -		basic_machine=t3e-cray
  +		basic_machine=alphaev5-cray
  +		os=-unicos
  +		;;
  +	t90)
  +		basic_machine=t90-cray
   		os=-unicos
   		;;
   	tic54x | c54x*)
   		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
   		;;
   	tx39el)
   		basic_machine=mipstx39el-unknown
   		;;
  +	toad1)
  +		basic_machine=pdp10-xkl
  +		os=-tops20
  +		;;
   	tower | tower-32)
   		basic_machine=m68k-ncr
   		;;
  +	tpf)
  +		basic_machine=s390x-ibm
  +		os=-tpf
  +		;;
   	udi29k)
   		basic_machine=a29k-amd
   		os=-udi
  @@ -836,8 +993,8 @@
   		os=-vms
   		;;
   	vpp*|vx|vx-*)
  -               basic_machine=f301-fujitsu
  -               ;;
  +		basic_machine=f301-fujitsu
  +		;;
   	vxworks960)
   		basic_machine=i960-wrs
   		os=-vxworks
  @@ -858,13 +1015,13 @@
   		basic_machine=hppa1.1-winbond
   		os=-proelf
   		;;
  -	xmp)
  -		basic_machine=xmp-cray
  -		os=-unicos
  -		;;
  -        xps | xps100)
  +	xps | xps100)
   		basic_machine=xps100-honeywell
   		;;
  +	ymp)
  +		basic_machine=ymp-cray
  +		os=-unicos
  +		;;
   	z8k-*-coff)
   		basic_machine=z8k-unknown
   		os=-sim
  @@ -885,13 +1042,6 @@
   	op60c)
   		basic_machine=hppa1.1-oki
   		;;
  -	mips)
  -		if [ x$os = x-linux-gnu ]; then
  -			basic_machine=mips-unknown
  -		else
  -			basic_machine=mips-mips
  -		fi
  -		;;
   	romp)
   		basic_machine=romp-ibm
   		;;
  @@ -901,19 +1051,26 @@
   	vax)
   		basic_machine=vax-dec
   		;;
  +	pdp10)
  +		# there are many clones, so DEC is not a safe bet
  +		basic_machine=pdp10-unknown
  +		;;
   	pdp11)
   		basic_machine=pdp11-dec
   		;;
   	we32k)
   		basic_machine=we32k-att
   		;;
  -	sh3 | sh4)
  -		base_machine=sh-unknown
  +	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
  +		basic_machine=sh-unknown
  +		;;
  +	sh64)
  +		basic_machine=sh64-unknown
   		;;
  -	sparc | sparcv9)
  +	sparc | sparcv9 | sparcv9b)
   		basic_machine=sparc-sun
   		;;
  -        cydra)
  +	cydra)
   		basic_machine=cydra-cydrome
   		;;
   	orion)
  @@ -928,9 +1085,8 @@
   	pmac | pmac-mpw)
   		basic_machine=powerpc-apple
   		;;
  -	c4x*)
  -		basic_machine=c4x-none
  -		os=-coff
  +	*-unknown)
  +		# Make sure to match an already-canonicalized machine name.
   		;;
   	*)
   		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
  @@ -984,27 +1140,34 @@
   	      | -aos* \
   	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
   	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
  -	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
  +	      | -hiux* | -386bsd* | -knetbsd* | -netbsd* | -openbsd* | -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* \
  -	      | -openstep* | -oskit* | -conix* | -pw32*)
  +	      | -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* | -windiss* \
  +	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
   	# Remember, each alternative MUST END IN *, to match a version number.
   		;;
   	-qnx*)
   		case $basic_machine in
  -		    x86-* | i[34567]86-*)
  +		    x86-* | i*86-*)
   			;;
   		    *)
   			os=-nto$os
   			;;
   		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* \
  @@ -1013,6 +1176,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|'`
   		;;
  @@ -1025,6 +1191,9 @@
   	-opened*)
   		os=-openedition
   		;;
  +        -os400*)
  +		os=-os400
  +		;;
   	-wince*)
   		os=-wince
   		;;
  @@ -1043,14 +1212,23 @@
   	-acis*)
   		os=-aos
   		;;
  +	-atheos*)
  +		os=-atheos
  +		;;
  +	-syllable*)
  +		os=-syllable
  +		;;
   	-386bsd)
   		os=-bsd
   		;;
   	-ctix* | -uts*)
   		os=-sysv
   		;;
  +	-nova*)
  +		os=-rtmk-nova
  +		;;
   	-ns2 )
  -	        os=-nextstep2
  +		os=-nextstep2
   		;;
   	-nsk*)
   		os=-nsk
  @@ -1062,6 +1240,9 @@
   	-sinix*)
   		os=-sysv4
   		;;
  +        -tpf*)
  +		os=-tpf
  +		;;
   	-triton*)
   		os=-sysv3
   		;;
  @@ -1089,8 +1270,14 @@
   	-xenix)
   		os=-xenix
   		;;
  -        -*mint | -*MiNT)
  -	        os=-mint
  +	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
  +		os=-mint
  +		;;
  +	-aros*)
  +		os=-aros
  +		;;
  +	-kaos*)
  +		os=-kaos
   		;;
   	-none)
   		;;
  @@ -1123,7 +1310,14 @@
   	arm*-semi)
   		os=-aout
   		;;
  -        pdp11-*)
  +    c4x-* | tic4x-*)
  +        os=-coff
  +        ;;
  +	# This must come before the *-dec entry.
  +	pdp10-*)
  +		os=-tops20
  +		;;
  +	pdp11-*)
   		os=-none
   		;;
   	*-dec | vax-*)
  @@ -1150,6 +1344,9 @@
   	mips*-*)
   		os=-elf
   		;;
  +	or32-*)
  +		os=-coff
  +		;;
   	*-tti)	# must be before sparc entry or we get the wrong os.
   		os=-sysv3
   		;;
  @@ -1207,31 +1404,31 @@
   	*-ns)
   		os=-genix
   		;;
  -	i390-*)
  +	i370-*)
   		os=-mvs
   		;;
   	*-next)
   		os=-nextstep3
   		;;
  -        *-gould)
  +	*-gould)
   		os=-sysv
   		;;
  -        *-highlevel)
  +	*-highlevel)
   		os=-bsd
   		;;
   	*-encore)
   		os=-bsd
   		;;
  -        *-sgi)
  +	*-sgi)
   		os=-irix
   		;;
  -        *-siemens)
  +	*-siemens)
   		os=-sysv4
   		;;
   	*-masscomp)
   		os=-rtu
   		;;
  -	f301-fujitsu)
  +	f30[01]-fujitsu | f700-fujitsu)
   		os=-uxpv
   		;;
   	*-rom68k)
  @@ -1294,10 +1491,16 @@
   			-mvs* | -opened*)
   				vendor=ibm
   				;;
  +			-os400*)
  +				vendor=ibm
  +				;;
   			-ptx*)
   				vendor=sequent
   				;;
  -			-vxsim* | -vxworks*)
  +			-tpf*)
  +				vendor=ibm
  +				;;
  +			-vxsim* | -vxworks* | -windiss*)
   				vendor=wrs
   				;;
   			-aux*)
  @@ -1309,9 +1512,12 @@
   			-mpw* | -macos*)
   				vendor=apple
   				;;
  -			-*mint | -*MiNT)
  +			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
   				vendor=atari
   				;;
  +			-vos*)
  +				vendor=stratus
  +				;;
   		esac
   		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
   		;;
  @@ -1322,7 +1528,8 @@
   
   # Local variables:
   # eval: (add-hook 'write-file-hooks 'time-stamp)
  -# time-stamp-start: "version='"
  +# time-stamp-start: "timestamp='"
   # time-stamp-format: "%:y-%02m-%02d"
   # time-stamp-end: "'"
   # End:
  +
  
  
  
  1.3       +68 -65    xml-xalan/c/configure
  
  Index: configure
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/configure,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- configure	2 Dec 2003 19:58:50 -0000	1.2
  +++ configure	3 Dec 2003 21:52:57 -0000	1.3
  @@ -2558,71 +2558,6 @@
   
   
   
  -echo "$as_me:$LINENO: checking for floor in -lm" >&5
  -echo $ECHO_N "checking for floor in -lm... $ECHO_C" >&6
  -if test "${ac_cv_lib_m_floor+set}" = set; then
  -  echo $ECHO_N "(cached) $ECHO_C" >&6
  -else
  -  ac_check_lib_save_LIBS=$LIBS
  -LIBS="-lm  $LIBS"
  -cat >conftest.$ac_ext <<_ACEOF
  -#line $LINENO "configure"
  -/* confdefs.h.  */
  -_ACEOF
  -cat confdefs.h >>conftest.$ac_ext
  -cat >>conftest.$ac_ext <<_ACEOF
  -/* end confdefs.h.  */
  -
  -/* Override any gcc2 internal prototype to avoid an error.  */
  -#ifdef __cplusplus
  -extern "C"
  -#endif
  -/* We use char because int might match the return type of a gcc2
  -   builtin and then its argument prototype would still apply.  */
  -char floor ();
  -int
  -main ()
  -{
  -floor ();
  -  ;
  -  return 0;
  -}
  -_ACEOF
  -rm -f conftest.$ac_objext conftest$ac_exeext
  -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
  -  (eval $ac_link) 2>&5
  -  ac_status=$?
  -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } &&
  -         { ac_try='test -s conftest$ac_exeext'
  -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  -  (eval $ac_try) 2>&5
  -  ac_status=$?
  -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); }; }; then
  -  ac_cv_lib_m_floor=yes
  -else
  -  echo "$as_me: failed program was:" >&5
  -sed 's/^/| /' conftest.$ac_ext >&5
  -
  -ac_cv_lib_m_floor=no
  -fi
  -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  -LIBS=$ac_check_lib_save_LIBS
  -fi
  -echo "$as_me:$LINENO: result: $ac_cv_lib_m_floor" >&5
  -echo "${ECHO_T}$ac_cv_lib_m_floor" >&6
  -if test $ac_cv_lib_m_floor = yes; then
  -  cat >>confdefs.h <<_ACEOF
  -#define HAVE_LIBM 1
  -_ACEOF
  -
  -  LIBS="-lm $LIBS"
  -
  -fi
  -
  -
  -
   if test "$CXX" = "g++" -o "$CXX" = "c++"; then
   
     echo "$as_me:$LINENO: checking whether -fno-elide-constructors works correctly" >&5
  @@ -2753,8 +2688,76 @@
           *-*-mvs*)       platform=OS390 ;;
           *-*-osf*)       platform=TRU64 ;;
           *-apple-darwin*)       platform=MACOSX ;;
  +        *-*-os400*)     platform=OS400 ;;
  +        *-*-OS400*)     platform=OS400 ;;
           *)              platform=UNKNOWN ;;
   esac
  +if test "$platform" != "OS400"; then
  +
  +echo "$as_me:$LINENO: checking for floor in -lm" >&5
  +echo $ECHO_N "checking for floor in -lm... $ECHO_C" >&6
  +if test "${ac_cv_lib_m_floor+set}" = set; then
  +  echo $ECHO_N "(cached) $ECHO_C" >&6
  +else
  +  ac_check_lib_save_LIBS=$LIBS
  +LIBS="-lm  $LIBS"
  +cat >conftest.$ac_ext <<_ACEOF
  +#line $LINENO "configure"
  +/* confdefs.h.  */
  +_ACEOF
  +cat confdefs.h >>conftest.$ac_ext
  +cat >>conftest.$ac_ext <<_ACEOF
  +/* end confdefs.h.  */
  +
  +/* Override any gcc2 internal prototype to avoid an error.  */
  +#ifdef __cplusplus
  +extern "C"
  +#endif
  +/* We use char because int might match the return type of a gcc2
  +   builtin and then its argument prototype would still apply.  */
  +char floor ();
  +int
  +main ()
  +{
  +floor ();
  +  ;
  +  return 0;
  +}
  +_ACEOF
  +rm -f conftest.$ac_objext conftest$ac_exeext
  +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
  +  (eval $ac_link) 2>&5
  +  ac_status=$?
  +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  +  (exit $ac_status); } &&
  +         { ac_try='test -s conftest$ac_exeext'
  +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  +  (eval $ac_try) 2>&5
  +  ac_status=$?
  +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  +  (exit $ac_status); }; }; then
  +  ac_cv_lib_m_floor=yes
  +else
  +  echo "$as_me: failed program was:" >&5
  +sed 's/^/| /' conftest.$ac_ext >&5
  +
  +ac_cv_lib_m_floor=no
  +fi
  +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  +LIBS=$ac_check_lib_save_LIBS
  +fi
  +echo "$as_me:$LINENO: result: $ac_cv_lib_m_floor" >&5
  +echo "${ECHO_T}$ac_cv_lib_m_floor" >&6
  +if test $ac_cv_lib_m_floor = yes; then
  +  cat >>confdefs.h <<_ACEOF
  +#define HAVE_LIBM 1
  +_ACEOF
  +
  +  LIBS="-lm $LIBS"
  +
  +fi
  +
  +fi
   
   ac_ext=cc
   ac_cpp='$CXXCPP $CPPFLAGS'
  
  
  
  1.4       +7 -2      xml-xalan/c/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/configure.in,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- configure.in	3 Dec 2003 17:12:38 -0000	1.3
  +++ configure.in	3 Dec 2003 21:52:57 -0000	1.4
  @@ -7,8 +7,6 @@
   AC_PROG_INSTALL
   AC_CHECK_PROG(AUTOCONF, autoconf, autoconf, true)
   
  -dnl Checks for libraries
  -AC_CHECK_LIB(m, floor)
   
   dnl  Check for gcc problems
   
  @@ -59,8 +57,15 @@
           *-*-mvs*)       platform=OS390 ;;
           *-*-osf*)       platform=TRU64 ;;
           *-apple-darwin*)       platform=MACOSX ;;
  +        *-*-os400*)     platform=OS400 ;;
  +        *-*-OS400*)     platform=OS400 ;;
           *)              platform=UNKNOWN ;;
   esac
  +
  +dnl Checks for libraries
  +if test "$platform" != "OS400"; then
  +	AC_CHECK_LIB(m, floor)
  +fi
   
   dnl check if mbstowcs is available and can correctly count only
   AC_HEADER_STDC
  
  
  
  1.3       +11 -4     xml-xalan/c/runConfigure
  
  Index: runConfigure
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/runConfigure,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- runConfigure	2 Dec 2003 19:58:50 -0000	1.2
  +++ runConfigure	3 Dec 2003 21:52:57 -0000	1.3
  @@ -58,6 +58,9 @@
   # 
   #
   # $Log$
  +# Revision 1.3  2003/12/03 21:52:57  dbertoni
  +# Patch 25180 for iSeries support.
  +#
   # Revision 1.2  2003/12/02 19:58:50  dbertoni
   # Patch for Bugzilla 24567.
   #
  @@ -156,7 +159,7 @@
       echo "Usage: runConfigure \"options\""
       echo "       where options may be any of the following:"
       echo "       -p <platform> (accepts 'aix', 'linux', 'freebsd', 'netbsd', 'solaris',
  -            'hp-10', 'hp-11', 'irix', 'tru64', 'macosx')"
  +            'hp-10', 'hp-11', 'irix', 'tru64', 'macosx', 'os400')"
       echo "       -c <C compiler name> (e.g. gcc, cc, xlc)"
       echo "       -x <C++ compiler name> (e.g. g++, CC, xlC)"
       echo "       -d (specifies that you want to build debug version)"
  @@ -292,7 +295,7 @@
   #
   
   case $platform in
  -   aix | linux | freebsd | netbsd | solaris | hp-10 | hp-11 | irix | tru64 | macosx)
  +   aix | linux | freebsd | netbsd | solaris | hp-10 | hp-11 | irix | tru64 | macosx | os400)
          # platform has been recognized
          ;;
      *)
  @@ -307,7 +310,9 @@
   
   if test $debug = "off"; then
       echo "Debug is OFF"
  -    if test $platform = "linux"; then
  +    if test $platform = "os400"; then
  +        debugflag="";
  +    elif test $platform = "linux"; then
   		if test $cppcompiler = "icpc"; then
   			debugflag="-O3 -DNDEBUG";
   		else
  @@ -465,6 +470,8 @@
   elif test $platform = "hp-10"; then
       threadingLibs="-lcma"
       threadingDefines="-DXML_USE_DCE"
  +elif test $platform = "os400"; then
  +    threadingLibs=""
   fi
   
   
  @@ -475,7 +482,7 @@
   #
   
   case $cppcompiler in
  -   xlC | xlc | xlC_r | xlc_r | g++ | c++ | cc | CC | aCC | cxx | icpc)
  +   xlC | xlc | xlC_r | xlc_r | g++ | c++ | cc | CC | aCC | cxx | icpc | icc)
         ;;
   
      *)
  
  
  
  1.3       +2 -0      xml-xalan/c/src/xalanc/Include/PlatformDefinitions.hpp
  
  Index: PlatformDefinitions.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/xalanc/Include/PlatformDefinitions.hpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PlatformDefinitions.hpp	19 Sep 2003 21:05:21 -0000	1.2
  +++ PlatformDefinitions.hpp	3 Dec 2003 21:52:57 -0000	1.3
  @@ -69,6 +69,8 @@
   #include "SolarisDefinitions.hpp"
   #elif defined(OS390)
   #include "OS390Definitions.hpp"
  +#elif defined(OS400)
  +#include "OS400Definitions.hpp"
   #elif defined(__DECCXX)
   #include "TRU64Definitions.hpp"
   #elif defined(__INTEL_COMPILER)
  
  
  
  1.3       +2 -2      xml-xalan/c/src/xalanc/PlatformSupport/DirectoryEnumerator.hpp
  
  Index: DirectoryEnumerator.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/xalanc/PlatformSupport/DirectoryEnumerator.hpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DirectoryEnumerator.hpp	7 Aug 2003 05:42:12 -0000	1.2
  +++ DirectoryEnumerator.hpp	3 Dec 2003 21:52:57 -0000	1.3
  @@ -178,7 +178,7 @@
   	 */
   	bool isDirectory() const
   	{
  -#if defined(AIX) || defined(HPUX) || defined(SOLARIS) || defined(OS390) || defined(TRU64)
  +#if defined(AIX) || defined(HPUX) || defined(SOLARIS) || defined(OS390) || defined(OS400) || defined(TRU64)
   		return false;
   #else		
   		if (d_type == DT_DIR || d_type == DT_UNKNOWN)
  @@ -195,7 +195,7 @@
   	bool
   	isSelfOrParent() const
   	{
  -#if defined(AIX) || defined(HPUX) || defined(SOLARIS) || defined(OS390) || defined(TRU64)
  +#if defined(AIX) || defined(HPUX) || defined(SOLARIS) || defined(OS390) || defined(OS400) || defined(TRU64)
   		return false;
   #else		
   		if (isDirectory() == false)
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org


Mime
View raw message