aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2008-01-21 06:47:22 +0000
committerDan Nicolaescu2008-01-21 06:47:22 +0000
commit8ca7e0f152417725530073c8fbe2b0f99dcdb823 (patch)
treed3855c016cf349c103d3bcacff726e59396118b2
parentcf32108ec4fa2c2ce99071d97ccdbfe29e6b0921 (diff)
downloademacs-8ca7e0f152417725530073c8fbe2b0f99dcdb823.tar.gz
emacs-8ca7e0f152417725530073c8fbe2b0f99dcdb823.zip
Updated from master source.
-rw-r--r--ChangeLog4
-rwxr-xr-xconfig.guess47
-rwxr-xr-xconfig.sub54
3 files changed, 79 insertions, 26 deletions
diff --git a/ChangeLog b/ChangeLog
index 5d993d114f4..f78606d7367 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12008-01-21 Dan Nicolaescu <dann@ics.uci.edu>
2
3 * config.guess, config.sub: Updated from master source.
4
12008-01-17 Glenn Morris <rgm@gnu.org> 52008-01-17 Glenn Morris <rgm@gnu.org>
2 6
3 * configure.in (HAVE_X86_64_LIB64_DIR): Also set on s390x systems. 7 * configure.in (HAVE_X86_64_LIB64_DIR): Also set on s390x systems.
diff --git a/config.guess b/config.guess
index 1b63f307a6f..ca2a03ca4f1 100755
--- a/config.guess
+++ b/config.guess
@@ -1,10 +1,10 @@
1#! /bin/sh 1#! /bin/sh
2# Attempt to guess a canonical system name. 2# Attempt to guess a canonical system name.
3# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 3# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4# 2002, 2003, 2004, 2005, 2006, 2007 4# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
5# Free Software Foundation, Inc. 5# Free Software Foundation, Inc.
6 6
7timestamp='2007-02-26' 7timestamp='2008-01-08'
8 8
9# This file is free software; you can redistribute it and/or modify it 9# This file is free software; you can redistribute it and/or modify it
10# under the terms of the GNU General Public License as published by 10# under the terms of the GNU General Public License as published by
@@ -56,8 +56,8 @@ version="\
56GNU config.guess ($timestamp) 56GNU config.guess ($timestamp)
57 57
58Originally written by Per Bothner. 58Originally written by Per Bothner.
59Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 59Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
60Free Software Foundation, Inc. 602002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
61 61
62This is free software; see the source for copying conditions. There is NO 62This is free software; see the source for copying conditions. There is NO
63warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." 63warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -330,7 +330,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
330 sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) 330 sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
331 echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 331 echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
332 exit ;; 332 exit ;;
333 i86pc:SunOS:5.*:*) 333 i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
334 echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 334 echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
335 exit ;; 335 exit ;;
336 sun4*:SunOS:6*:*) 336 sun4*:SunOS:6*:*)
@@ -532,7 +532,7 @@ EOF
532 echo rs6000-ibm-aix3.2 532 echo rs6000-ibm-aix3.2
533 fi 533 fi
534 exit ;; 534 exit ;;
535 *:AIX:*:[45]) 535 *:AIX:*:[456])
536 IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` 536 IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
537 if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then 537 if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
538 IBM_ARCH=rs6000 538 IBM_ARCH=rs6000
@@ -791,12 +791,18 @@ EOF
791 i*:PW*:*) 791 i*:PW*:*)
792 echo ${UNAME_MACHINE}-pc-pw32 792 echo ${UNAME_MACHINE}-pc-pw32
793 exit ;; 793 exit ;;
794 x86:Interix*:[3456]*) 794 *:Interix*:[3456]*)
795 echo i586-pc-interix${UNAME_RELEASE} 795 case ${UNAME_MACHINE} in
796 exit ;; 796 x86)
797 EM64T:Interix*:[3456]* | authenticamd:Interix*:[3456]*) 797 echo i586-pc-interix${UNAME_RELEASE}
798 echo x86_64-unknown-interix${UNAME_RELEASE} 798 exit ;;
799 exit ;; 799 EM64T | authenticamd)
800 echo x86_64-unknown-interix${UNAME_RELEASE}
801 exit ;;
802 IA64)
803 echo ia64-unknown-interix${UNAME_RELEASE}
804 exit ;;
805 esac ;;
800 [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) 806 [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
801 echo i${UNAME_MACHINE}-pc-mks 807 echo i${UNAME_MACHINE}-pc-mks
802 exit ;; 808 exit ;;
@@ -830,7 +836,14 @@ EOF
830 echo ${UNAME_MACHINE}-pc-minix 836 echo ${UNAME_MACHINE}-pc-minix
831 exit ;; 837 exit ;;
832 arm*:Linux:*:*) 838 arm*:Linux:*:*)
833 echo ${UNAME_MACHINE}-unknown-linux-gnu 839 eval $set_cc_for_build
840 if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
841 | grep -q __ARM_EABI__
842 then
843 echo ${UNAME_MACHINE}-unknown-linux-gnu
844 else
845 echo ${UNAME_MACHINE}-unknown-linux-gnueabi
846 fi
834 exit ;; 847 exit ;;
835 avr32*:Linux:*:*) 848 avr32*:Linux:*:*)
836 echo ${UNAME_MACHINE}-unknown-linux-gnu 849 echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -951,8 +964,8 @@ EOF
951 x86_64:Linux:*:*) 964 x86_64:Linux:*:*)
952 echo x86_64-unknown-linux-gnu 965 echo x86_64-unknown-linux-gnu
953 exit ;; 966 exit ;;
954 xtensa:Linux:*:*) 967 xtensa*:Linux:*:*)
955 echo xtensa-unknown-linux-gnu 968 echo ${UNAME_MACHINE}-unknown-linux-gnu
956 exit ;; 969 exit ;;
957 i*86:Linux:*:*) 970 i*86:Linux:*:*)
958 # The BFD linker knows what the default object file format is, so 971 # The BFD linker knows what the default object file format is, so
diff --git a/config.sub b/config.sub
index c8d69e9a05f..6759825a5b7 100755
--- a/config.sub
+++ b/config.sub
@@ -1,10 +1,10 @@
1#! /bin/sh 1#! /bin/sh
2# Configuration validation subroutine script. 2# Configuration validation subroutine script.
3# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 3# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4# 2002, 2003, 2004, 2005, 2006, 2007 4# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
5# Free Software Foundation, Inc. 5# Free Software Foundation, Inc.
6 6
7timestamp='2007-02-26' 7timestamp='2008-01-16'
8 8
9# This file is (in principle) common to ALL GNU software. 9# This file is (in principle) common to ALL GNU software.
10# The presence of a machine in this file suggests that SOME GNU software 10# The presence of a machine in this file suggests that SOME GNU software
@@ -72,8 +72,8 @@ Report bugs and patches to <config-patches@gnu.org>."
72version="\ 72version="\
73GNU config.sub ($timestamp) 73GNU config.sub ($timestamp)
74 74
75Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 75Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
76Free Software Foundation, Inc. 762002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
77 77
78This is free software; see the source for copying conditions. There is NO 78This is free software; see the source for copying conditions. There is NO
79warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." 79warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -369,10 +369,14 @@ case $basic_machine in
369 | v850-* | v850e-* | vax-* \ 369 | v850-* | v850e-* | vax-* \
370 | we32k-* \ 370 | we32k-* \
371 | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ 371 | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
372 | xstormy16-* | xtensa-* \ 372 | xstormy16-* | xtensa*-* \
373 | ymp-* \ 373 | ymp-* \
374 | z8k-*) 374 | z8k-*)
375 ;; 375 ;;
376 # Recognize the basic CPU types without company name, with glob match.
377 xtensa*)
378 basic_machine=$basic_machine-unknown
379 ;;
376 # Recognize the various machine names and aliases which stand 380 # Recognize the various machine names and aliases which stand
377 # for a CPU type and a company and sometimes even an OS. 381 # for a CPU type and a company and sometimes even an OS.
378 386bsd) 382 386bsd)
@@ -443,6 +447,14 @@ case $basic_machine in
443 basic_machine=ns32k-sequent 447 basic_machine=ns32k-sequent
444 os=-dynix 448 os=-dynix
445 ;; 449 ;;
450 blackfin)
451 basic_machine=bfin-unknown
452 os=-linux
453 ;;
454 blackfin-*)
455 basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
456 os=-linux
457 ;;
446 c90) 458 c90)
447 basic_machine=c90-cray 459 basic_machine=c90-cray
448 os=-unicos 460 os=-unicos
@@ -475,8 +487,8 @@ case $basic_machine in
475 basic_machine=craynv-cray 487 basic_machine=craynv-cray
476 os=-unicosmp 488 os=-unicosmp
477 ;; 489 ;;
478 cr16c) 490 cr16)
479 basic_machine=cr16c-unknown 491 basic_machine=cr16-unknown
480 os=-elf 492 os=-elf
481 ;; 493 ;;
482 crds | unos) 494 crds | unos)
@@ -668,6 +680,14 @@ case $basic_machine in
668 basic_machine=m68k-isi 680 basic_machine=m68k-isi
669 os=-sysv 681 os=-sysv
670 ;; 682 ;;
683 m68knommu)
684 basic_machine=m68k-unknown
685 os=-linux
686 ;;
687 m68knommu-*)
688 basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
689 os=-linux
690 ;;
671 m88k-omron*) 691 m88k-omron*)
672 basic_machine=m88k-omron 692 basic_machine=m88k-omron
673 ;; 693 ;;
@@ -683,6 +703,10 @@ case $basic_machine in
683 basic_machine=i386-pc 703 basic_machine=i386-pc
684 os=-mingw32 704 os=-mingw32
685 ;; 705 ;;
706 mingw32ce)
707 basic_machine=arm-unknown
708 os=-mingw32ce
709 ;;
686 miniframe) 710 miniframe)
687 basic_machine=m68000-convergent 711 basic_machine=m68000-convergent
688 ;; 712 ;;
@@ -809,6 +833,14 @@ case $basic_machine in
809 basic_machine=i860-intel 833 basic_machine=i860-intel
810 os=-osf 834 os=-osf
811 ;; 835 ;;
836 parisc)
837 basic_machine=hppa-unknown
838 os=-linux
839 ;;
840 parisc-*)
841 basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
842 os=-linux
843 ;;
812 pbd) 844 pbd)
813 basic_machine=sparc-tti 845 basic_machine=sparc-tti
814 ;; 846 ;;
@@ -1017,6 +1049,10 @@ case $basic_machine in
1017 basic_machine=tic6x-unknown 1049 basic_machine=tic6x-unknown
1018 os=-coff 1050 os=-coff
1019 ;; 1051 ;;
1052 tile*)
1053 basic_machine=tile-unknown
1054 os=-linux-gnu
1055 ;;
1020 tx39) 1056 tx39)
1021 basic_machine=mipstx39-unknown 1057 basic_machine=mipstx39-unknown
1022 ;; 1058 ;;