apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject cvs commit: apr/build config.guess config.sub
Date Fri, 09 Jul 2004 10:15:10 GMT
jorton      2004/07/09 03:15:10

  Modified:    build    config.guess config.sub
  Log:
  * build/config.guess, build/config.sub: Update from gnu.org.
  
  Revision  Changes    Path
  1.11      +28 -29    apr/build/config.guess
  
  Index: config.guess
  ===================================================================
  RCS file: /home/cvs/apr/build/config.guess,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -d -w -u -r1.10 -r1.11
  --- config.guess	20 Feb 2004 16:23:04 -0000	1.10
  +++ config.guess	9 Jul 2004 10:15:10 -0000	1.11
  @@ -1,9 +1,9 @@
   #! /bin/sh
   # Attempt to guess a canonical system name.
   #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
  -#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
  +#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
   
  -timestamp='2004-02-16'
  +timestamp='2004-06-24'
   
   # 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
  @@ -53,7 +53,7 @@
   GNU config.guess ($timestamp)
   
   Originally written by Per Bothner.
  -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
  +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
   Free Software Foundation, Inc.
   
   This is free software; see the source for copying conditions.  There is NO
  @@ -212,6 +212,9 @@
       hp300:OpenBSD:*:*)
   	echo m68k-unknown-openbsd${UNAME_RELEASE}
   	exit 0 ;;
  +    luna88k:OpenBSD:*:*)
  +    	echo m88k-unknown-openbsd${UNAME_RELEASE}
  +	exit 0 ;;
       mac68k:OpenBSD:*:*)
   	echo m68k-unknown-openbsd${UNAME_RELEASE}
   	exit 0 ;;
  @@ -227,9 +230,6 @@
       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 ;;
  @@ -255,9 +255,14 @@
   	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
   	exit 0 ;;
       alpha:OSF1:*:*)
  -	if test $UNAME_RELEASE = "V4.0"; then
  +	case $UNAME_RELEASE in
  +	*4.0)
   		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
  -	fi
  +		;;
  +	*5.*)
  +	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
  +		;;
  +	esac
   	# 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
  @@ -295,14 +300,12 @@
   	    "EV7.9 (21364A)")
   		UNAME_MACHINE="alphaev79" ;;
   	esac
  +	# A Pn.n version is a patched version.
   	# 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.
  -	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
'abcdefghijklmnopqrstuvwxyz'`
  -	exit 0 ;;
  -    Alpha*:OpenVMS:*:*)
  -	echo alpha-hp-vms
  +	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
'abcdefghijklmnopqrstuvwxyz'`
   	exit 0 ;;
       Alpha\ *:Windows_NT*:*)
   	# How do we know it's Interix rather than the generic POSIX subsystem?
  @@ -758,7 +761,7 @@
   	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
   	exit 0 ;;
       *:UNICOS/mp:*:*)
  -	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
  +	echo craynv-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'`
  @@ -781,21 +784,7 @@
   	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
   	exit 0 ;;
       *:FreeBSD:*:*)
  -	# 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}
  +	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
   	exit 0 ;;
       i*:CYGWIN*:*)
   	echo ${UNAME_MACHINE}-pc-cygwin
  @@ -847,6 +836,9 @@
       ia64:Linux:*:*)
   	echo ${UNAME_MACHINE}-unknown-linux-gnu
   	exit 0 ;;
  +    m32r*:Linux:*:*)
  +	echo ${UNAME_MACHINE}-unknown-linux-gnu
  +	exit 0 ;;
       m68*:Linux:*:*)
   	echo ${UNAME_MACHINE}-unknown-linux-gnu
   	exit 0 ;;
  @@ -1087,7 +1079,7 @@
       M680?0:D-NIX:5.3:*)
   	echo m68k-diab-dnix
   	exit 0 ;;
  -    M68*:*:R3V[567]*:*)
  +    M68*:*:R3V[5678]*:*)
   	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 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=''
  @@ -1251,6 +1243,13 @@
       *:DragonFly:*:*)
   	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
   	exit 0 ;;
  +    *:*VMS:*:*)
  +    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
  +	case "${UNAME_MACHINE}" in
  +	    A*) echo alpha-dec-vms && exit 0 ;;
  +	    I*) echo ia64-dec-vms && exit 0 ;;
  +	    V*) echo vax-dec-vms && exit 0 ;;
  +	esac
   esac
   
   #echo '(No uname command or uname output not recognized.)' 1>&2
  
  
  
  1.10      +26 -19    apr/build/config.sub
  
  Index: config.sub
  ===================================================================
  RCS file: /home/cvs/apr/build/config.sub,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -d -w -u -r1.9 -r1.10
  --- config.sub	20 Feb 2004 16:23:04 -0000	1.9
  +++ config.sub	9 Jul 2004 10:15:10 -0000	1.10
  @@ -1,9 +1,9 @@
   #! /bin/sh
   # Configuration validation subroutine script.
   #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
  -#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
  +#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
   
  -timestamp='2004-02-16'
  +timestamp='2004-06-24'
   
   # This file is (in principle) common to ALL GNU software.
   # The presence of a machine in this file suggests that SOME GNU software
  @@ -70,7 +70,7 @@
   version="\
   GNU config.sub ($timestamp)
   
  -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
  +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
   Free Software Foundation, Inc.
   
   This is free software; see the source for copying conditions.  There is NO
  @@ -145,7 +145,7 @@
   	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
   	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
   	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
  -	-apple | -axis)
  +	-apple | -axis | -knuth | -cray)
   		os=
   		basic_machine=$1
   		;;
  @@ -237,7 +237,7 @@
   	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
   	| i370 | i860 | i960 | ia64 \
   	| ip2k | iq2000 \
  -	| m32r | m68000 | m68k | m88k | mcore \
  +	| m32r | m32rle | m68000 | m68k | m88k | mcore \
   	| mips | mipsbe | mipseb | mipsel | mipsle \
   	| mips16 \
   	| mips64 | mips64el \
  @@ -262,7 +262,7 @@
   	| 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 \
  +	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
   	| strongarm \
   	| tahoe | thumb | tic4x | tic80 | tron \
   	| v850 | v850e \
  @@ -300,7 +300,7 @@
   	| avr-* \
   	| bs2000-* \
   	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
  -	| clipper-* | cydra-* \
  +	| clipper-* | craynv-* | cydra-* \
   	| d10v-* | d30v-* | dlx-* \
   	| elxsi-* \
   	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
  @@ -308,7 +308,7 @@
   	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
   	| i*86-* | i860-* | i960-* | ia64-* \
   	| ip2k-* | iq2000-* \
  -	| m32r-* \
  +	| m32r-* | m32rle-* \
   	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
   	| m88110-* | m88k-* | mcore-* \
   	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
  @@ -326,8 +326,9 @@
   	| mipsisa64sb1-* | mipsisa64sb1el-* \
   	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
   	| mipstx39-* | mipstx39el-* \
  +	| mmix-* \
   	| msp430-* \
  -	| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
  +	| none-* | np1-* | ns16k-* | ns32k-* \
   	| orion-* \
   	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
   	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
  @@ -336,7 +337,7 @@
   	| 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?-* \
  +	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
   	| tahoe-* | thumb-* \
   	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
   	| tron-* \
  @@ -445,6 +446,10 @@
   		basic_machine=j90-cray
   		os=-unicos
   		;;
  +	craynv)
  +		basic_machine=craynv-cray
  +		os=-unicosmp
  +		;;
   	cr16c)
   		basic_machine=cr16c-unknown
   		os=-elf
  @@ -455,6 +460,10 @@
   	cris | cris-* | etrax*)
   		basic_machine=cris-axis
   		;;
  +	crx)
  +		basic_machine=crx-unknown
  +		os=-elf
  +		;;
   	da30 | da30-*)
   		basic_machine=m68k-da30
   		;;
  @@ -655,10 +664,6 @@
   	mips3*)
   		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
   		;;
  -	mmix*)
  -		basic_machine=mmix-knuth
  -		os=-mmixware
  -		;;
   	monitor)
   		basic_machine=m68k-rom68k
   		os=-coff
  @@ -739,10 +744,6 @@
   	np1)
   		basic_machine=np1-gould
   		;;
  -	nv1)
  -		basic_machine=nv1-cray
  -		os=-unicosmp
  -		;;
   	nsr-tandem)
   		basic_machine=nsr-tandem
   		;;
  @@ -1055,6 +1056,9 @@
   	romp)
   		basic_machine=romp-ibm
   		;;
  +	mmix)
  +		basic_machine=mmix-knuth
  +		;;
   	rs6000)
   		basic_machine=rs6000-ibm
   		;;
  @@ -1077,7 +1081,7 @@
   	sh64)
   		basic_machine=sh64-unknown
   		;;
  -	sparc | sparcv9 | sparcv9b)
  +	sparc | sparcv8 | sparcv9 | sparcv9b)
   		basic_machine=sparc-sun
   		;;
   	cydra)
  @@ -1369,6 +1373,9 @@
   		;;
   	*-ibm)
   		os=-aix
  +		;;
  +    	*-knuth)
  +		os=-mmixware
   		;;
   	*-wec)
   		os=-proelf
  
  
  

Mime
View raw message