[Djvu-cvs] djvulibre-3.5/config config.guess, 1.13, 1.14 config.sub, 1.14, 1.15

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/djvu/djvulibre-3.5/config
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv6968/config

Modified Files:
	config.guess config.sub 
Log Message:
refresh config/config.guess, config/config.sub

Index: config.guess
===================================================================
RCS file: /cvsroot/djvu/djvulibre-3.5/config/config.guess,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** config.guess	19 Mar 2010 20:39:50 -0000	1.13
--- config.guess	17 Aug 2010 09:08:26 -0000	1.14
***************
*** 2,9 ****
  # Attempt to guess a canonical system name.
  #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
! #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
  #   Free Software Foundation, Inc.

! timestamp='2009-04-27'

  # This file is free software; you can redistribute it and/or modify it
--- 2,9 ----
  # Attempt to guess a canonical system name.
  #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
! #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
  #   Free Software Foundation, Inc.

! timestamp='2009-12-30'

  # This file is free software; you can redistribute it and/or modify it
***************
*** 28,34 ****

! # Originally written by Per Bothner <pe...@bo...>.
! # Please send patches to <con...@gn...>.  Submit a context
! # diff and a properly formatted ChangeLog entry.
  #
  # This script attempts to guess a canonical system name similar to
--- 28,34 ----

! # Originally written by Per Bothner.  Please send patches (context
! # diff format) to <con...@gn...> and include a ChangeLog
! # entry.
  #
  # This script attempts to guess a canonical system name similar to
***************
*** 36,41 ****
  # 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 build system type.

  me=`echo "$0" | sed -e 's,.*/,,'`
--- 36,41 ----
  # exits with 0.  Otherwise, it exits with 1.
  #
! # You can get the latest version of this script from:
! # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD

  me=`echo "$0" | sed -e 's,.*/,,'`
***************
*** 57,62 ****

  Originally written by Per Bothner.
! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
! 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

  This is free software; see the source for copying conditions.  There is NO
--- 57,63 ----

  Originally written by Per Bothner.
! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
! 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
! Software Foundation, Inc.

  This is free software; see the source for copying conditions.  There is NO
***************
*** 171,175 ****
  		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).
--- 172,176 ----
  		eval $set_cc_for_build
  		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
! 			| grep -q __ELF__
  		then
  		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
***************
*** 334,337 ****
--- 335,341 ----
  	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
  	exit ;;
+     i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+ 	echo i386-pc-auroraux${UNAME_RELEASE}
+ 	exit ;;
      i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
  	eval $set_cc_for_build
***************
*** 657,661 ****

  	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
! 		grep __LP64__ >/dev/null
  	    then
  		HP_ARCH="hppa2.0w"
--- 661,665 ----

  	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
! 		grep -q __LP64__
  	    then
  		HP_ARCH="hppa2.0w"
***************
*** 808,817 ****
  	echo ${UNAME_MACHINE}-pc-pw32
  	exit ;;
!     *:Interix*:[3456]*)
      	case ${UNAME_MACHINE} in
  	    x86)
  		echo i586-pc-interix${UNAME_RELEASE}
  		exit ;;
! 	    EM64T | authenticamd | genuineintel)
  		echo x86_64-unknown-interix${UNAME_RELEASE}
  		exit ;;
--- 812,821 ----
  	echo ${UNAME_MACHINE}-pc-pw32
  	exit ;;
!     *:Interix*:*)
      	case ${UNAME_MACHINE} in
  	    x86)
  		echo i586-pc-interix${UNAME_RELEASE}
  		exit ;;
! 	    authenticamd | genuineintel | EM64T)
  		echo x86_64-unknown-interix${UNAME_RELEASE}
  		exit ;;
***************
*** 823,826 ****
--- 827,833 ----
  	echo i${UNAME_MACHINE}-pc-mks
  	exit ;;
+     8664:Windows_NT:*)
+ 	echo x86_64-pc-mks
+ 	exit ;;
      i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
  	# How do we know it's Interix rather than the generic POSIX subsystem?
***************
*** 852,855 ****
--- 859,876 ----
  	echo ${UNAME_MACHINE}-pc-minix
  	exit ;;
+     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 -q ld.so.1
+ 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ 	exit ;;
      arm*:Linux:*:*)
  	eval $set_cc_for_build
***************
*** 874,877 ****
--- 895,909 ----
      	echo frv-unknown-linux-gnu
  	exit ;;
+     i*86:Linux:*:*)
+ 	LIBC=gnu
+ 	eval $set_cc_for_build
+ 	sed 's/^	//' << EOF >$dummy.c
+ 	#ifdef __dietlibc__
+ 	LIBC=dietlibc
+ 	#endif
+ EOF
+ 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+ 	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+ 	exit ;;
      ia64:Linux:*:*)
  	echo ${UNAME_MACHINE}-unknown-linux-gnu
***************
*** 883,920 ****
  	echo ${UNAME_MACHINE}-unknown-linux-gnu
  	exit ;;
!     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 | sed -n '
! 	    /^CPU/{
! 		s: ::g
! 		p
! 	    }'`"
! 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
! 	;;
!     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=
--- 915,929 ----
  	echo ${UNAME_MACHINE}-unknown-linux-gnu
  	exit ;;
!     mips:Linux:*:* | mips64:Linux:*:*)
  	eval $set_cc_for_build
  	sed 's/^	//' << EOF >$dummy.c
  	#undef CPU
! 	#undef ${UNAME_MACHINE}
! 	#undef ${UNAME_MACHINE}el
  	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
! 	CPU=${UNAME_MACHINE}el
  	#else
  	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
! 	CPU=${UNAME_MACHINE}
  	#else
  	CPU=
***************
*** 922,930 ****
  	#endif
  EOF
! 	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
! 	    /^CPU/{
! 		s: ::g
! 		p
! 	    }'`"
  	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
  	;;
--- 931,935 ----
  	#endif
  EOF
! 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
  	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
  	;;
***************
*** 932,958 ****
  	echo or32-unknown-linux-gnu
  	exit ;;
-     ppc:Linux:*:*)
- 	echo powerpc-unknown-linux-gnu
- 	exit ;;
-     ppc64:Linux:*:*)
- 	echo powerpc64-unknown-linux-gnu
- 	exit ;;
-     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 ;;
      padre:Linux:*:*)
  	echo sparc-unknown-linux-gnu
  	exit ;;
      parisc:Linux:*:* | hppa:Linux:*:*)
  	# Look for CPU level
--- 937,946 ----
  	echo or32-unknown-linux-gnu
  	exit ;;
      padre:Linux:*:*)
  	echo sparc-unknown-linux-gnu
  	exit ;;
+     parisc64:Linux:*:* | hppa64:Linux:*:*)
+ 	echo hppa64-unknown-linux-gnu
+ 	exit ;;
      parisc:Linux:*:* | hppa:Linux:*:*)
  	# Look for CPU level
***************
*** 963,968 ****
  	esac
  	exit ;;
!     parisc64:Linux:*:* | hppa64:Linux:*:*)
! 	echo hppa64-unknown-linux-gnu
  	exit ;;
      s390:Linux:*:* | s390x:Linux:*:*)
--- 951,959 ----
  	esac
  	exit ;;
!     ppc64:Linux:*:*)
! 	echo powerpc64-unknown-linux-gnu
! 	exit ;;
!     ppc:Linux:*:*)
! 	echo powerpc-unknown-linux-gnu
  	exit ;;
      s390:Linux:*:* | s390x:Linux:*:*)
***************
*** 987,1050 ****
      	echo ${UNAME_MACHINE}-unknown-linux-gnu
  	exit ;;
-     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.
- 	# 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 targets: *//
- 				    s/ .*//
- 				    p'`
-         case "$ld_supported_targets" in
- 	  elf32-i386)
- 		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
- 		;;
- 	  a.out-i386-linux)
- 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
- 		exit ;;
- 	  "")
- 		# 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 ;;
- 	esac
- 	# 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
- 	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
- 	LIBC=gnu
- 	#else
- 	LIBC=gnuaout
- 	#endif
- 	#endif
- 	#ifdef __dietlibc__
- 	LIBC=dietlibc
- 	#endif
- EOF
- 	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
- 	    /^LIBC/{
- 		s: ::g
- 		p
- 	    }'`"
- 	test x"${LIBC}" != x && {
- 		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
- 		exit
- 	}
- 	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
- 	;;
      i*86:DYNIX/ptx:4*:*)
  	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
--- 978,981 ----
***************
*** 1075,1079 ****
  	echo ${UNAME_MACHINE}-pc-syllable
  	exit ;;
!     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
  	echo i386-unknown-lynxos${UNAME_RELEASE}
  	exit ;;
--- 1006,1010 ----
  	echo ${UNAME_MACHINE}-pc-syllable
  	exit ;;
!     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
  	echo i386-unknown-lynxos${UNAME_RELEASE}
  	exit ;;
***************
*** 1183,1187 ****
  	echo rs6000-unknown-lynxos${UNAME_RELEASE}
  	exit ;;
!     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
  	echo powerpc-unknown-lynxos${UNAME_RELEASE}
  	exit ;;
--- 1114,1118 ----
  	echo rs6000-unknown-lynxos${UNAME_RELEASE}
  	exit ;;
!     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
  	echo powerpc-unknown-lynxos${UNAME_RELEASE}
  	exit ;;
***************
*** 1276,1279 ****
--- 1207,1220 ----
  	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
  	case $UNAME_PROCESSOR in
+ 	    i386)
+ 		eval $set_cc_for_build
+ 		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+ 		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+ 		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+ 		      grep IS_64BIT_ARCH >/dev/null
+ 		  then
+ 		      UNAME_PROCESSOR="x86_64"
+ 		  fi
+ 		fi ;;
  	    unknown) UNAME_PROCESSOR=powerpc ;;
  	esac

Index: config.sub
===================================================================
RCS file: /cvsroot/djvu/djvulibre-3.5/config/config.sub,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** config.sub	19 Mar 2010 20:39:50 -0000	1.14
--- config.sub	17 Aug 2010 09:08:26 -0000	1.15
***************
*** 2,9 ****
  # Configuration validation subroutine script.
  #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
! #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
  #   Free Software Foundation, Inc.

! timestamp='2009-04-17'

  # This file is (in principle) common to ALL GNU software.
--- 2,9 ----
  # Configuration validation subroutine script.
  #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
! #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
  #   Free Software Foundation, Inc.

! timestamp='2010-01-22'

  # This file is (in principle) common to ALL GNU software.
***************
*** 33,37 ****

  # Please send patches to <con...@gn...>.  Submit a context
! # diff and a properly formatted ChangeLog entry.
  #
  # Configuration subroutine to validate and canonicalize a configuration type.
--- 33,37 ----

  # Please send patches to <con...@gn...>.  Submit a context
! # diff and a properly formatted GNU ChangeLog entry.
  #
  # Configuration subroutine to validate and canonicalize a configuration type.
***************
*** 40,43 ****
--- 40,46 ----
  # Otherwise, we print the canonical config type on stdout and succeed.

+ # You can get the latest version of this script from:
+ # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+ 
  # This file is supposed to be the same for all GNU packages
  # and recognize all the CPU types, system types and aliases
***************
*** 73,78 ****
  GNU config.sub ($timestamp)

! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
! 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

  This is free software; see the source for copying conditions.  There is NO
--- 76,82 ----
  GNU config.sub ($timestamp)

! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
! 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
! Software Foundation, Inc.

  This is free software; see the source for copying conditions.  There is NO
***************
*** 150,157 ****
  	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
  	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
! 	-apple | -axis | -knuth | -cray)
  		os=
  		basic_machine=$1
  		;;
  	-sim | -cisco | -oki | -wec | -winbond)
  		os=
--- 154,164 ----
  	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
  	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
! 	-apple | -axis | -knuth | -cray | -microblaze)
  		os=
  		basic_machine=$1
  		;;
+         -bluegene*)
+ 	        os=-cnk
+ 		;;
  	-sim | -cisco | -oki | -wec | -winbond)
  		os=
***************
*** 282,285 ****
--- 289,293 ----
  	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
  	| pyramid \
+ 	| rx \
  	| score \
  	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
***************
*** 289,292 ****
--- 297,301 ----
  	| spu | strongarm \
  	| tahoe | thumb | tic4x | tic80 | tron \
+ 	| ubicom32 \
  	| v850 | v850e \
  	| we32k \
***************
*** 295,299 ****
  		basic_machine=$basic_machine-unknown
  		;;
! 	m6811 | m68hc11 | m6812 | m68hc12)
  		# Motorola 68HC11/12.
  		basic_machine=$basic_machine-unknown
--- 304,308 ----
  		basic_machine=$basic_machine-unknown
  		;;
! 	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
  		# Motorola 68HC11/12.
  		basic_machine=$basic_machine-unknown
***************
*** 338,342 ****
  	| m32c-* | m32r-* | m32rle-* \
  	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
! 	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
  	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
  	| mips16-* \
--- 347,351 ----
  	| m32c-* | m32r-* | m32rle-* \
  	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
! 	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
  	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
  	| mips16-* \
***************
*** 366,370 ****
  	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
  	| pyramid-* \
! 	| romp-* | rs6000-* \
  	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
  	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
--- 375,379 ----
  	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
  	| pyramid-* \
! 	| romp-* | rs6000-* | rx-* \
  	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
  	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
***************
*** 373,378 ****
  	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
  	| tahoe-* | thumb-* \
! 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
  	| tron-* \
  	| v850-* | v850e-* | vax-* \
  	| we32k-* \
--- 382,389 ----
  	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
  	| tahoe-* | thumb-* \
! 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
! 	| tile-* | tilegx-* \
  	| tron-* \
+ 	| ubicom32-* \
  	| v850-* | v850e-* | vax-* \
  	| we32k-* \
***************
*** 468,471 ****
--- 479,486 ----
  		os=-linux
  		;;
+ 	bluegene*)
+ 		basic_machine=powerpc-ibm
+ 		os=-cnk
+ 		;;
  	c90)
  		basic_machine=c90-cray
***************
*** 720,723 ****
--- 735,741 ----
  		os=-sysv
  		;;
+         microblaze)
+ 		basic_machine=microblaze-xilinx
+ 		;;
  	mingw32)
  		basic_machine=i386-pc
***************
*** 1070,1073 ****
--- 1088,1096 ----
  		os=-coff
  		;;
+         # This must be matched before tile*.
+         tilegx*)
+ 		basic_machine=tilegx-unknown
+ 		os=-linux-gnu
+ 		;;
  	tile*)
  		basic_machine=tile-unknown
***************
*** 1241,1244 ****
--- 1264,1270 ----
          # that might get confused with valid system types.
  	# -solaris* is a basic system type, with this one exception.
+         -auroraux)
+ 	        os=-auroraux
+ 		;;
  	-solaris1 | -solaris1.*)
  		os=`echo $os | sed -e 's|solaris1|sunos4|'`
***************
*** 1261,1267 ****
  	# -sysv* is not here because it comes later, after sysvr4.
  	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
! 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
! 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
! 	      | -kopensolaris* \
  	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
  	      | -aos* | -aros* \
--- 1287,1293 ----
  	# -sysv* is not here because it comes later, after sysvr4.
  	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
! 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
! 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
! 	      | -sym* | -kopensolaris* \
  	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
  	      | -aos* | -aros* \
***************
*** 1284,1288 ****
  	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
  	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
! 	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
  	# Remember, each alternative MUST END IN *, to match a version number.
  		;;
--- 1310,1314 ----
  	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
  	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
! 	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
  	# Remember, each alternative MUST END IN *, to match a version number.
  		;;
***************
*** 1417,1420 ****
--- 1443,1448 ----
  		os=-dicos
  		;;
+         -nacl*)
+ 	        ;;
  	-none)
  		;;
***************
*** 1614,1618 ****
  				vendor=sun
  				;;
! 			-aix*)
  				vendor=ibm
  				;;
--- 1642,1646 ----
  				vendor=sun
  				;;
! 			-cnk*|-aix*)
  				vendor=ibm
  				;;