diff options
author | Colin Watson <cjwatson@debian.org> | 2004-03-05 09:50:57 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2004-03-05 09:50:57 +0000 |
commit | 5178253aab15f0eef84e220f98bac611c8fdd553 (patch) | |
tree | 2c80f49b2accb73050d4ab6b0e311c17ebe84110 | |
parent | c631a88f06ff2c2ea5f1dfae0ae26677aecbe224 (diff) |
Update config.guess and config.sub from autotools-dev 20040105.1.
-rwxr-xr-x | config.guess | 177 | ||||
-rwxr-xr-x | config.sub | 53 | ||||
-rw-r--r-- | debian/changelog | 1 |
3 files changed, 134 insertions, 97 deletions
diff --git a/config.guess b/config.guess index 59d4b87a5..e8c6fc0c3 100755 --- a/config.guess +++ b/config.guess | |||
@@ -3,7 +3,7 @@ | |||
3 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, | 3 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
4 | # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. | 4 | # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. |
5 | 5 | ||
6 | timestamp='2003-10-07' | 6 | timestamp='2004-01-05' |
7 | 7 | ||
8 | # This file is free software; you can redistribute it and/or modify it | 8 | # This file is free software; you can redistribute it and/or modify it |
9 | # under the terms of the GNU General Public License as published by | 9 | # under the terms of the GNU General Public License as published by |
@@ -176,7 +176,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | |||
176 | fi | 176 | fi |
177 | ;; | 177 | ;; |
178 | *) | 178 | *) |
179 | os=netbsd | 179 | os=netbsd |
180 | ;; | 180 | ;; |
181 | esac | 181 | esac |
182 | # The OS release | 182 | # The OS release |
@@ -221,6 +221,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | |||
221 | mvmeppc:OpenBSD:*:*) | 221 | mvmeppc:OpenBSD:*:*) |
222 | echo powerpc-unknown-openbsd${UNAME_RELEASE} | 222 | echo powerpc-unknown-openbsd${UNAME_RELEASE} |
223 | exit 0 ;; | 223 | exit 0 ;; |
224 | pegasos:OpenBSD:*:*) | ||
225 | echo powerpc-unknown-openbsd${UNAME_RELEASE} | ||
226 | exit 0 ;; | ||
224 | pmax:OpenBSD:*:*) | 227 | pmax:OpenBSD:*:*) |
225 | echo mipsel-unknown-openbsd${UNAME_RELEASE} | 228 | echo mipsel-unknown-openbsd${UNAME_RELEASE} |
226 | exit 0 ;; | 229 | exit 0 ;; |
@@ -307,6 +310,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | |||
307 | *:OS/390:*:*) | 310 | *:OS/390:*:*) |
308 | echo i370-ibm-openedition | 311 | echo i370-ibm-openedition |
309 | exit 0 ;; | 312 | exit 0 ;; |
313 | *:OS400:*:*) | ||
314 | echo powerpc-ibm-os400 | ||
315 | exit 0 ;; | ||
310 | arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) | 316 | arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) |
311 | echo arm-acorn-riscix${UNAME_RELEASE} | 317 | echo arm-acorn-riscix${UNAME_RELEASE} |
312 | exit 0;; | 318 | exit 0;; |
@@ -382,23 +388,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | |||
382 | # MiNT. But MiNT is downward compatible to TOS, so this should | 388 | # MiNT. But MiNT is downward compatible to TOS, so this should |
383 | # be no problem. | 389 | # be no problem. |
384 | atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) | 390 | atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) |
385 | echo m68k-atari-mint${UNAME_RELEASE} | 391 | echo m68k-atari-mint${UNAME_RELEASE} |
386 | exit 0 ;; | 392 | exit 0 ;; |
387 | atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) | 393 | atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) |
388 | echo m68k-atari-mint${UNAME_RELEASE} | 394 | echo m68k-atari-mint${UNAME_RELEASE} |
389 | exit 0 ;; | 395 | exit 0 ;; |
390 | *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) | 396 | *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) |
391 | echo m68k-atari-mint${UNAME_RELEASE} | 397 | echo m68k-atari-mint${UNAME_RELEASE} |
392 | exit 0 ;; | 398 | exit 0 ;; |
393 | milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) | 399 | milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) |
394 | echo m68k-milan-mint${UNAME_RELEASE} | 400 | echo m68k-milan-mint${UNAME_RELEASE} |
395 | exit 0 ;; | 401 | exit 0 ;; |
396 | hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) | 402 | hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) |
397 | echo m68k-hades-mint${UNAME_RELEASE} | 403 | echo m68k-hades-mint${UNAME_RELEASE} |
398 | exit 0 ;; | 404 | exit 0 ;; |
399 | *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) | 405 | *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) |
400 | echo m68k-unknown-mint${UNAME_RELEASE} | 406 | echo m68k-unknown-mint${UNAME_RELEASE} |
401 | exit 0 ;; | 407 | exit 0 ;; |
402 | powerpc:machten:*:*) | 408 | powerpc:machten:*:*) |
403 | echo powerpc-apple-machten${UNAME_RELEASE} | 409 | echo powerpc-apple-machten${UNAME_RELEASE} |
404 | exit 0 ;; | 410 | exit 0 ;; |
@@ -464,8 +470,8 @@ EOF | |||
464 | echo m88k-motorola-sysv3 | 470 | echo m88k-motorola-sysv3 |
465 | exit 0 ;; | 471 | exit 0 ;; |
466 | AViiON:dgux:*:*) | 472 | AViiON:dgux:*:*) |
467 | # DG/UX returns AViiON for all architectures | 473 | # DG/UX returns AViiON for all architectures |
468 | UNAME_PROCESSOR=`/usr/bin/uname -p` | 474 | UNAME_PROCESSOR=`/usr/bin/uname -p` |
469 | if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] | 475 | if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] |
470 | then | 476 | then |
471 | if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ | 477 | if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ |
@@ -478,7 +484,7 @@ EOF | |||
478 | else | 484 | else |
479 | echo i586-dg-dgux${UNAME_RELEASE} | 485 | echo i586-dg-dgux${UNAME_RELEASE} |
480 | fi | 486 | fi |
481 | exit 0 ;; | 487 | exit 0 ;; |
482 | M88*:DolphinOS:*:*) # DolphinOS (SVR3) | 488 | M88*:DolphinOS:*:*) # DolphinOS (SVR3) |
483 | echo m88k-dolphin-sysv3 | 489 | echo m88k-dolphin-sysv3 |
484 | exit 0 ;; | 490 | exit 0 ;; |
@@ -574,52 +580,52 @@ EOF | |||
574 | 9000/[678][0-9][0-9]) | 580 | 9000/[678][0-9][0-9]) |
575 | if [ -x /usr/bin/getconf ]; then | 581 | if [ -x /usr/bin/getconf ]; then |
576 | sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` | 582 | sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` |
577 | sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` | 583 | sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` |
578 | case "${sc_cpu_version}" in | 584 | case "${sc_cpu_version}" in |
579 | 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 | 585 | 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 |
580 | 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 | 586 | 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 |
581 | 532) # CPU_PA_RISC2_0 | 587 | 532) # CPU_PA_RISC2_0 |
582 | case "${sc_kernel_bits}" in | 588 | case "${sc_kernel_bits}" in |
583 | 32) HP_ARCH="hppa2.0n" ;; | 589 | 32) HP_ARCH="hppa2.0n" ;; |
584 | 64) HP_ARCH="hppa2.0w" ;; | 590 | 64) HP_ARCH="hppa2.0w" ;; |
585 | '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 | 591 | '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 |
586 | esac ;; | 592 | esac ;; |
587 | esac | 593 | esac |
588 | fi | 594 | fi |
589 | if [ "${HP_ARCH}" = "" ]; then | 595 | if [ "${HP_ARCH}" = "" ]; then |
590 | eval $set_cc_for_build | 596 | eval $set_cc_for_build |
591 | sed 's/^ //' << EOF >$dummy.c | 597 | sed 's/^ //' << EOF >$dummy.c |
592 | 598 | ||
593 | #define _HPUX_SOURCE | 599 | #define _HPUX_SOURCE |
594 | #include <stdlib.h> | 600 | #include <stdlib.h> |
595 | #include <unistd.h> | 601 | #include <unistd.h> |
596 | 602 | ||
597 | int main () | 603 | int main () |
598 | { | 604 | { |
599 | #if defined(_SC_KERNEL_BITS) | 605 | #if defined(_SC_KERNEL_BITS) |
600 | long bits = sysconf(_SC_KERNEL_BITS); | 606 | long bits = sysconf(_SC_KERNEL_BITS); |
601 | #endif | 607 | #endif |
602 | long cpu = sysconf (_SC_CPU_VERSION); | 608 | long cpu = sysconf (_SC_CPU_VERSION); |
603 | 609 | ||
604 | switch (cpu) | 610 | switch (cpu) |
605 | { | 611 | { |
606 | case CPU_PA_RISC1_0: puts ("hppa1.0"); break; | 612 | case CPU_PA_RISC1_0: puts ("hppa1.0"); break; |
607 | case CPU_PA_RISC1_1: puts ("hppa1.1"); break; | 613 | case CPU_PA_RISC1_1: puts ("hppa1.1"); break; |
608 | case CPU_PA_RISC2_0: | 614 | case CPU_PA_RISC2_0: |
609 | #if defined(_SC_KERNEL_BITS) | 615 | #if defined(_SC_KERNEL_BITS) |
610 | switch (bits) | 616 | switch (bits) |
611 | { | 617 | { |
612 | case 64: puts ("hppa2.0w"); break; | 618 | case 64: puts ("hppa2.0w"); break; |
613 | case 32: puts ("hppa2.0n"); break; | 619 | case 32: puts ("hppa2.0n"); break; |
614 | default: puts ("hppa2.0"); break; | 620 | default: puts ("hppa2.0"); break; |
615 | } break; | 621 | } break; |
616 | #else /* !defined(_SC_KERNEL_BITS) */ | 622 | #else /* !defined(_SC_KERNEL_BITS) */ |
617 | puts ("hppa2.0"); break; | 623 | puts ("hppa2.0"); break; |
618 | #endif | 624 | #endif |
619 | default: puts ("hppa1.0"); break; | 625 | default: puts ("hppa1.0"); break; |
620 | } | 626 | } |
621 | exit (0); | 627 | exit (0); |
622 | } | 628 | } |
623 | EOF | 629 | EOF |
624 | (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` | 630 | (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` |
625 | test -z "$HP_ARCH" && HP_ARCH=hppa | 631 | test -z "$HP_ARCH" && HP_ARCH=hppa |
@@ -699,22 +705,22 @@ EOF | |||
699 | exit 0 ;; | 705 | exit 0 ;; |
700 | C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) | 706 | C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) |
701 | echo c1-convex-bsd | 707 | echo c1-convex-bsd |
702 | exit 0 ;; | 708 | exit 0 ;; |
703 | C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) | 709 | C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) |
704 | if getsysinfo -f scalar_acc | 710 | if getsysinfo -f scalar_acc |
705 | then echo c32-convex-bsd | 711 | then echo c32-convex-bsd |
706 | else echo c2-convex-bsd | 712 | else echo c2-convex-bsd |
707 | fi | 713 | fi |
708 | exit 0 ;; | 714 | exit 0 ;; |
709 | C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) | 715 | C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) |
710 | echo c34-convex-bsd | 716 | echo c34-convex-bsd |
711 | exit 0 ;; | 717 | exit 0 ;; |
712 | C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) | 718 | C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) |
713 | echo c38-convex-bsd | 719 | echo c38-convex-bsd |
714 | exit 0 ;; | 720 | exit 0 ;; |
715 | C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) | 721 | C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) |
716 | echo c4-convex-bsd | 722 | echo c4-convex-bsd |
717 | exit 0 ;; | 723 | exit 0 ;; |
718 | CRAY*Y-MP:*:*:*) | 724 | CRAY*Y-MP:*:*:*) |
719 | echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' | 725 | echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' |
720 | exit 0 ;; | 726 | exit 0 ;; |
@@ -738,9 +744,14 @@ EOF | |||
738 | exit 0 ;; | 744 | exit 0 ;; |
739 | F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) | 745 | F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) |
740 | FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` | 746 | FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` |
741 | FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` | 747 | FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
742 | FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` | 748 | FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` |
743 | echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" | 749 | echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
750 | exit 0 ;; | ||
751 | 5000:UNIX_System_V:4.*:*) | ||
752 | FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` | ||
753 | FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` | ||
754 | echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" | ||
744 | exit 0 ;; | 755 | exit 0 ;; |
745 | i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) | 756 | i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) |
746 | echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} | 757 | echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} |
@@ -874,7 +885,7 @@ EOF | |||
874 | EV6) UNAME_MACHINE=alphaev6 ;; | 885 | EV6) UNAME_MACHINE=alphaev6 ;; |
875 | EV67) UNAME_MACHINE=alphaev67 ;; | 886 | EV67) UNAME_MACHINE=alphaev67 ;; |
876 | EV68*) UNAME_MACHINE=alphaev68 ;; | 887 | EV68*) UNAME_MACHINE=alphaev68 ;; |
877 | esac | 888 | esac |
878 | objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null | 889 | objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null |
879 | if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi | 890 | if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi |
880 | echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} | 891 | echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} |
@@ -916,7 +927,7 @@ EOF | |||
916 | s/.*supported targets: *// | 927 | s/.*supported targets: *// |
917 | s/ .*// | 928 | s/ .*// |
918 | p'` | 929 | p'` |
919 | case "$ld_supported_targets" in | 930 | case "$ld_supported_targets" in |
920 | elf32-i386) | 931 | elf32-i386) |
921 | TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" | 932 | TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" |
922 | ;; | 933 | ;; |
@@ -968,11 +979,11 @@ EOF | |||
968 | echo i386-sequent-sysv4 | 979 | echo i386-sequent-sysv4 |
969 | exit 0 ;; | 980 | exit 0 ;; |
970 | i*86:UNIX_SV:4.2MP:2.*) | 981 | i*86:UNIX_SV:4.2MP:2.*) |
971 | # Unixware is an offshoot of SVR4, but it has its own version | 982 | # Unixware is an offshoot of SVR4, but it has its own version |
972 | # number series starting with 2... | 983 | # number series starting with 2... |
973 | # I am not positive that other SVR4 systems won't match this, | 984 | # I am not positive that other SVR4 systems won't match this, |
974 | # I just have to hope. -- rms. | 985 | # I just have to hope. -- rms. |
975 | # Use sysv4.2uw... so that sysv4* matches it. | 986 | # Use sysv4.2uw... so that sysv4* matches it. |
976 | echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} | 987 | echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} |
977 | exit 0 ;; | 988 | exit 0 ;; |
978 | i*86:OS/2:*:*) | 989 | i*86:OS/2:*:*) |
@@ -986,6 +997,9 @@ EOF | |||
986 | i*86:atheos:*:*) | 997 | i*86:atheos:*:*) |
987 | echo ${UNAME_MACHINE}-unknown-atheos | 998 | echo ${UNAME_MACHINE}-unknown-atheos |
988 | exit 0 ;; | 999 | exit 0 ;; |
1000 | i*86:syllable:*:*) | ||
1001 | echo ${UNAME_MACHINE}-pc-syllable | ||
1002 | exit 0 ;; | ||
989 | i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) | 1003 | i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) |
990 | echo i386-unknown-lynxos${UNAME_RELEASE} | 1004 | echo i386-unknown-lynxos${UNAME_RELEASE} |
991 | exit 0 ;; | 1005 | exit 0 ;; |
@@ -1028,10 +1042,10 @@ EOF | |||
1028 | exit 0 ;; | 1042 | exit 0 ;; |
1029 | pc:*:*:*) | 1043 | pc:*:*:*) |
1030 | # Left here for compatibility: | 1044 | # Left here for compatibility: |
1031 | # uname -m prints for DJGPP always 'pc', but it prints nothing about | 1045 | # uname -m prints for DJGPP always 'pc', but it prints nothing about |
1032 | # the processor, so we play safe by assuming i386. | 1046 | # the processor, so we play safe by assuming i386. |
1033 | echo i386-pc-msdosdjgpp | 1047 | echo i386-pc-msdosdjgpp |
1034 | exit 0 ;; | 1048 | exit 0 ;; |
1035 | Intel:Mach:3*:*) | 1049 | Intel:Mach:3*:*) |
1036 | echo i386-pc-mach3 | 1050 | echo i386-pc-mach3 |
1037 | exit 0 ;; | 1051 | exit 0 ;; |
@@ -1066,8 +1080,8 @@ EOF | |||
1066 | /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ | 1080 | /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ |
1067 | && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; | 1081 | && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; |
1068 | 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) | 1082 | 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) |
1069 | /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ | 1083 | /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ |
1070 | && echo i486-ncr-sysv4 && exit 0 ;; | 1084 | && echo i486-ncr-sysv4 && exit 0 ;; |
1071 | m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) | 1085 | m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) |
1072 | echo m68k-unknown-lynxos${UNAME_RELEASE} | 1086 | echo m68k-unknown-lynxos${UNAME_RELEASE} |
1073 | exit 0 ;; | 1087 | exit 0 ;; |
@@ -1101,9 +1115,9 @@ EOF | |||
1101 | fi | 1115 | fi |
1102 | exit 0 ;; | 1116 | exit 0 ;; |
1103 | PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort | 1117 | PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort |
1104 | # says <Richard.M.Bartel@ccMail.Census.GOV> | 1118 | # says <Richard.M.Bartel@ccMail.Census.GOV> |
1105 | echo i586-unisys-sysv4 | 1119 | echo i586-unisys-sysv4 |
1106 | exit 0 ;; | 1120 | exit 0 ;; |
1107 | *:UNIX_System_V:4*:FTX*) | 1121 | *:UNIX_System_V:4*:FTX*) |
1108 | # From Gerald Hewes <hewes@openmarket.com>. | 1122 | # From Gerald Hewes <hewes@openmarket.com>. |
1109 | # How about differentiating between stratus architectures? -djm | 1123 | # How about differentiating between stratus architectures? -djm |
@@ -1125,11 +1139,11 @@ EOF | |||
1125 | exit 0 ;; | 1139 | exit 0 ;; |
1126 | R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) | 1140 | R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) |
1127 | if [ -d /usr/nec ]; then | 1141 | if [ -d /usr/nec ]; then |
1128 | echo mips-nec-sysv${UNAME_RELEASE} | 1142 | echo mips-nec-sysv${UNAME_RELEASE} |
1129 | else | 1143 | else |
1130 | echo mips-unknown-sysv${UNAME_RELEASE} | 1144 | echo mips-unknown-sysv${UNAME_RELEASE} |
1131 | fi | 1145 | fi |
1132 | exit 0 ;; | 1146 | exit 0 ;; |
1133 | BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. | 1147 | BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. |
1134 | echo powerpc-be-beos | 1148 | echo powerpc-be-beos |
1135 | exit 0 ;; | 1149 | exit 0 ;; |
@@ -1172,7 +1186,7 @@ EOF | |||
1172 | *:QNX:*:4*) | 1186 | *:QNX:*:4*) |
1173 | echo i386-pc-qnx | 1187 | echo i386-pc-qnx |
1174 | exit 0 ;; | 1188 | exit 0 ;; |
1175 | NSR-[DGKLNPTVWY]:NONSTOP_KERNEL:*:*) | 1189 | NSR-?:NONSTOP_KERNEL:*:*) |
1176 | echo nsr-tandem-nsk${UNAME_RELEASE} | 1190 | echo nsr-tandem-nsk${UNAME_RELEASE} |
1177 | exit 0 ;; | 1191 | exit 0 ;; |
1178 | *:NonStop-UX:*:*) | 1192 | *:NonStop-UX:*:*) |
@@ -1216,6 +1230,9 @@ EOF | |||
1216 | SEI:*:*:SEIUX) | 1230 | SEI:*:*:SEIUX) |
1217 | echo mips-sei-seiux${UNAME_RELEASE} | 1231 | echo mips-sei-seiux${UNAME_RELEASE} |
1218 | exit 0 ;; | 1232 | exit 0 ;; |
1233 | *:DRAGONFLY:*:*) | ||
1234 | echo ${UNAME_MACHINE}-unknown-dragonfly${UNAME_RELEASE} | ||
1235 | exit 0 ;; | ||
1219 | esac | 1236 | esac |
1220 | 1237 | ||
1221 | #echo '(No uname command or uname output not recognized.)' 1>&2 | 1238 | #echo '(No uname command or uname output not recognized.)' 1>&2 |
@@ -1238,11 +1255,11 @@ main () | |||
1238 | #include <sys/param.h> | 1255 | #include <sys/param.h> |
1239 | printf ("m68k-sony-newsos%s\n", | 1256 | printf ("m68k-sony-newsos%s\n", |
1240 | #ifdef NEWSOS4 | 1257 | #ifdef NEWSOS4 |
1241 | "4" | 1258 | "4" |
1242 | #else | 1259 | #else |
1243 | "" | 1260 | "" |
1244 | #endif | 1261 | #endif |
1245 | ); exit (0); | 1262 | ); exit (0); |
1246 | #endif | 1263 | #endif |
1247 | #endif | 1264 | #endif |
1248 | 1265 | ||
diff --git a/config.sub b/config.sub index d77dd77b4..463186dbf 100755 --- a/config.sub +++ b/config.sub | |||
@@ -3,7 +3,7 @@ | |||
3 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, | 3 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
4 | # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. | 4 | # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. |
5 | 5 | ||
6 | timestamp='2003-10-07' | 6 | timestamp='2004-01-05' |
7 | 7 | ||
8 | # This file is (in principle) common to ALL GNU software. | 8 | # This file is (in principle) common to ALL GNU software. |
9 | # The presence of a machine in this file suggests that SOME GNU software | 9 | # The presence of a machine in this file suggests that SOME GNU software |
@@ -118,7 +118,8 @@ esac | |||
118 | # Here we must recognize all the valid KERNEL-OS combinations. | 118 | # Here we must recognize all the valid KERNEL-OS combinations. |
119 | maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` | 119 | maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` |
120 | case $maybe_os in | 120 | case $maybe_os in |
121 | nto-qnx* | linux-gnu* | linux-dietlibc | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) | 121 | nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ |
122 | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) | ||
122 | os=-$maybe_os | 123 | os=-$maybe_os |
123 | basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` | 124 | basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` |
124 | ;; | 125 | ;; |
@@ -162,10 +163,10 @@ case $os in | |||
162 | os=-chorusos | 163 | os=-chorusos |
163 | basic_machine=$1 | 164 | basic_machine=$1 |
164 | ;; | 165 | ;; |
165 | -chorusrdb) | 166 | -chorusrdb) |
166 | os=-chorusrdb | 167 | os=-chorusrdb |
167 | basic_machine=$1 | 168 | basic_machine=$1 |
168 | ;; | 169 | ;; |
169 | -hiux*) | 170 | -hiux*) |
170 | os=-hiuxwe2 | 171 | os=-hiuxwe2 |
171 | ;; | 172 | ;; |
@@ -379,6 +380,9 @@ case $basic_machine in | |||
379 | amd64) | 380 | amd64) |
380 | basic_machine=x86_64-pc | 381 | basic_machine=x86_64-pc |
381 | ;; | 382 | ;; |
383 | amd64-*) | ||
384 | basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` | ||
385 | ;; | ||
382 | amdahl) | 386 | amdahl) |
383 | basic_machine=580-amdahl | 387 | basic_machine=580-amdahl |
384 | os=-sysv | 388 | os=-sysv |
@@ -743,6 +747,10 @@ case $basic_machine in | |||
743 | basic_machine=or32-unknown | 747 | basic_machine=or32-unknown |
744 | os=-coff | 748 | os=-coff |
745 | ;; | 749 | ;; |
750 | os400) | ||
751 | basic_machine=powerpc-ibm | ||
752 | os=-os400 | ||
753 | ;; | ||
746 | OSE68000 | ose68000) | 754 | OSE68000 | ose68000) |
747 | basic_machine=m68000-ericsson | 755 | basic_machine=m68000-ericsson |
748 | os=-ose | 756 | os=-ose |
@@ -926,10 +934,6 @@ case $basic_machine in | |||
926 | basic_machine=sv1-cray | 934 | basic_machine=sv1-cray |
927 | os=-unicos | 935 | os=-unicos |
928 | ;; | 936 | ;; |
929 | sx*-nec) | ||
930 | basic_machine=sx6-nec | ||
931 | os=-sysv | ||
932 | ;; | ||
933 | symmetry) | 937 | symmetry) |
934 | basic_machine=i386-sequent | 938 | basic_machine=i386-sequent |
935 | os=-dynix | 939 | os=-dynix |
@@ -967,6 +971,10 @@ case $basic_machine in | |||
967 | tower | tower-32) | 971 | tower | tower-32) |
968 | basic_machine=m68k-ncr | 972 | basic_machine=m68k-ncr |
969 | ;; | 973 | ;; |
974 | tpf) | ||
975 | basic_machine=s390x-ibm | ||
976 | os=-tpf | ||
977 | ;; | ||
970 | udi29k) | 978 | udi29k) |
971 | basic_machine=a29k-amd | 979 | basic_machine=a29k-amd |
972 | os=-udi | 980 | os=-udi |
@@ -1010,10 +1018,6 @@ case $basic_machine in | |||
1010 | basic_machine=hppa1.1-winbond | 1018 | basic_machine=hppa1.1-winbond |
1011 | os=-proelf | 1019 | os=-proelf |
1012 | ;; | 1020 | ;; |
1013 | windows32) | ||
1014 | basic_machine=i386-pc | ||
1015 | os=-windows32-msvcrt | ||
1016 | ;; | ||
1017 | xps | xps100) | 1021 | xps | xps100) |
1018 | basic_machine=xps100-honeywell | 1022 | basic_machine=xps100-honeywell |
1019 | ;; | 1023 | ;; |
@@ -1110,8 +1114,8 @@ esac | |||
1110 | if [ x"$os" != x"" ] | 1114 | if [ x"$os" != x"" ] |
1111 | then | 1115 | then |
1112 | case $os in | 1116 | case $os in |
1113 | # First match some system type aliases | 1117 | # First match some system type aliases |
1114 | # that might get confused with valid system types. | 1118 | # that might get confused with valid system types. |
1115 | # -solaris* is a basic system type, with this one exception. | 1119 | # -solaris* is a basic system type, with this one exception. |
1116 | -solaris1 | -solaris1.*) | 1120 | -solaris1 | -solaris1.*) |
1117 | os=`echo $os | sed -e 's|solaris1|sunos4|'` | 1121 | os=`echo $os | sed -e 's|solaris1|sunos4|'` |
@@ -1145,13 +1149,13 @@ case $os in | |||
1145 | | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | 1149 | | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ |
1146 | | -chorusos* | -chorusrdb* \ | 1150 | | -chorusos* | -chorusrdb* \ |
1147 | | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | 1151 | | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ |
1148 | | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ | 1152 | | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ |
1149 | | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | 1153 | | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ |
1150 | | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | 1154 | | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ |
1151 | | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | 1155 | | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ |
1152 | | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | 1156 | | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ |
1153 | | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | 1157 | | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ |
1154 | | -powermax* | -dnix* | -nx6 | -nx7 | -sei*) | 1158 | | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) |
1155 | # Remember, each alternative MUST END IN *, to match a version number. | 1159 | # Remember, each alternative MUST END IN *, to match a version number. |
1156 | ;; | 1160 | ;; |
1157 | -qnx*) | 1161 | -qnx*) |
@@ -1190,6 +1194,9 @@ case $os in | |||
1190 | -opened*) | 1194 | -opened*) |
1191 | os=-openedition | 1195 | os=-openedition |
1192 | ;; | 1196 | ;; |
1197 | -os400*) | ||
1198 | os=-os400 | ||
1199 | ;; | ||
1193 | -wince*) | 1200 | -wince*) |
1194 | os=-wince | 1201 | os=-wince |
1195 | ;; | 1202 | ;; |
@@ -1211,6 +1218,9 @@ case $os in | |||
1211 | -atheos*) | 1218 | -atheos*) |
1212 | os=-atheos | 1219 | os=-atheos |
1213 | ;; | 1220 | ;; |
1221 | -syllable*) | ||
1222 | os=-syllable | ||
1223 | ;; | ||
1214 | -386bsd) | 1224 | -386bsd) |
1215 | os=-bsd | 1225 | os=-bsd |
1216 | ;; | 1226 | ;; |
@@ -1233,6 +1243,9 @@ case $os in | |||
1233 | -sinix*) | 1243 | -sinix*) |
1234 | os=-sysv4 | 1244 | os=-sysv4 |
1235 | ;; | 1245 | ;; |
1246 | -tpf*) | ||
1247 | os=-tpf | ||
1248 | ;; | ||
1236 | -triton*) | 1249 | -triton*) |
1237 | os=-sysv3 | 1250 | os=-sysv3 |
1238 | ;; | 1251 | ;; |
@@ -1481,9 +1494,15 @@ case $basic_machine in | |||
1481 | -mvs* | -opened*) | 1494 | -mvs* | -opened*) |
1482 | vendor=ibm | 1495 | vendor=ibm |
1483 | ;; | 1496 | ;; |
1497 | -os400*) | ||
1498 | vendor=ibm | ||
1499 | ;; | ||
1484 | -ptx*) | 1500 | -ptx*) |
1485 | vendor=sequent | 1501 | vendor=sequent |
1486 | ;; | 1502 | ;; |
1503 | -tpf*) | ||
1504 | vendor=ibm | ||
1505 | ;; | ||
1487 | -vxsim* | -vxworks* | -windiss*) | 1506 | -vxsim* | -vxworks* | -windiss*) |
1488 | vendor=wrs | 1507 | vendor=wrs |
1489 | ;; | 1508 | ;; |
diff --git a/debian/changelog b/debian/changelog index c15d3c7e0..5a05d0f3e 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -21,6 +21,7 @@ openssh (1:3.8p1-1) UNRELEASED; urgency=low | |||
21 | ssh_config(5) for details. | 21 | ssh_config(5) for details. |
22 | * Remove -fno-builtin-log, -DHAVE_MMAP_ANON_SHARED, and | 22 | * Remove -fno-builtin-log, -DHAVE_MMAP_ANON_SHARED, and |
23 | -D__FILE_OFFSET_BITS=64 compiler options, which are no longer necessary. | 23 | -D__FILE_OFFSET_BITS=64 compiler options, which are no longer necessary. |
24 | * Update config.guess and config.sub from autotools-dev 20040105.1. | ||
24 | * Darren Tucker: | 25 | * Darren Tucker: |
25 | - Reset signal status when starting pam auth thread, prevent hanging | 26 | - Reset signal status when starting pam auth thread, prevent hanging |
26 | during PAM keyboard-interactive authentications. | 27 | during PAM keyboard-interactive authentications. |