~bkerensa/ubuntu/raring/yasm/fix-for-1064341

« back to all changes in this revision

Viewing changes to debian/patches/010_config_sub_guess.diff

  • Committer: Bazaar Package Importer
  • Author(s): Sam Hocevar
  • Date: 2009-07-14 08:23:59 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20090714082359-10x8mjty41gzkshs
Tags: 0.8.0-1
* New upstream release (Closes: #531047).
* Removed all tasm patches, they’ve been merged upstream.
* debian/control: set debhelper dependency to 5.0 and policy to 3.8.2.
* debian/control: mention TASM in the long description.
* debian/compat: set debhelper level to 5.
* debian/links: link tasm to ytasm and tasm.1.gz to ytasm.1.gz.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
--- yasm-0.4.0.orig/config/config.guess
2
 
+++ yasm-0.4.0/config/config.guess
3
 
@@ -1,9 +1,9 @@
 
1
Index: yasm-0.7.0/config/config.guess
 
2
===================================================================
 
3
--- yasm-0.7.0.orig/config/config.guess 2008-04-16 03:30:22.000000000 +0000
 
4
+++ yasm-0.7.0/config/config.guess      2008-10-09 09:14:06.000000000 +0000
 
5
@@ -1,9 +1,10 @@
4
6
 #! /bin/sh
5
7
 # Attempt to guess a canonical system name.
6
8
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
7
9
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
8
 
+#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
10
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 
11
+#   Free Software Foundation, Inc.
9
12
 
10
13
-timestamp='2003-07-02'
11
 
+timestamp='2005-08-03'
 
14
+timestamp='2008-01-23'
12
15
 
13
16
 # This file is free software; you can redistribute it and/or modify it
14
17
 # under the terms of the GNU General Public License as published by
15
 
@@ -17,13 +17,15 @@
 
18
@@ -17,13 +18,15 @@
16
19
 #
17
20
 # You should have received a copy of the GNU General Public License
18
21
 # along with this program; if not, write to the Free Software
29
32
 # Originally written by Per Bothner <per@bothner.com>.
30
33
 # Please send patches to <config-patches@gnu.org>.  Submit a context
31
34
 # diff and a properly formatted ChangeLog entry.
32
 
@@ -53,7 +55,7 @@
 
35
@@ -53,8 +56,8 @@
33
36
 GNU config.guess ($timestamp)
34
37
 
35
38
 Originally written by Per Bothner.
36
39
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
37
 
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
38
 
 Free Software Foundation, Inc.
 
40
-Free Software Foundation, Inc.
 
41
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
 
42
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
39
43
 
40
44
 This is free software; see the source for copying conditions.  There is NO
41
 
@@ -66,11 +68,11 @@
 
45
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 
46
@@ -66,11 +69,11 @@
42
47
 while test $# -gt 0 ; do
43
48
   case $1 in
44
49
     --time-stamp | --time* | -t )
53
58
     -- )     # Stop option processing
54
59
        shift; break ;;
55
60
     - )        # Use stdin as input.
56
 
@@ -123,7 +125,7 @@
 
61
@@ -104,7 +107,7 @@
 
62
 trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
 
63
 trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
 
64
 : ${TMPDIR=/tmp} ;
 
65
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
 
66
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
 
67
  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
 
68
  { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
 
69
  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
 
70
@@ -123,7 +126,7 @@
57
71
        ;;
58
72
  ,,*)   CC_FOR_BUILD=$CC ;;
59
73
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
62
76
 
63
77
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
64
78
 # (ghazi@noc.rutgers.edu 1994-08-24)
65
 
@@ -196,50 +198,29 @@
 
79
@@ -158,6 +161,7 @@
 
80
            arm*) machine=arm-unknown ;;
 
81
            sh3el) machine=shl-unknown ;;
 
82
            sh3eb) machine=sh-unknown ;;
 
83
+           sh5el) machine=sh5le-unknown ;;
 
84
            *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 
85
        esac
 
86
        # The Operating System including object format, if it has switched
 
87
@@ -196,50 +200,32 @@
66
88
        # contains redundant information, the shorter form:
67
89
        # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
68
90
        echo "${machine}-${os}${release}"
113
135
+    *:ekkoBSD:*:*)
114
136
+       echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
115
137
+       exit ;;
 
138
+    *:SolidBSD:*:*)
 
139
+       echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
 
140
+       exit ;;
116
141
+    macppc:MirBSD:*:*)
117
 
+       echo powerppc-unknown-mirbsd${UNAME_RELEASE}
 
142
+       echo powerpc-unknown-mirbsd${UNAME_RELEASE}
118
143
+       exit ;;
119
144
+    *:MirBSD:*:*)
120
145
+       echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
133
158
        # According to Compaq, /usr/sbin/psrinfo has been available on
134
159
        # OSF/1 and Tru64 systems produced since 1995.  I hope that
135
160
        # covers most systems running today.  This code pipes the CPU
136
 
@@ -277,42 +258,49 @@
 
161
@@ -277,42 +263,49 @@
137
162
            "EV7.9 (21364A)")
138
163
                UNAME_MACHINE="alphaev79" ;;
139
164
        esac
196
221
     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
197
222
        # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
198
223
        if test "`(/bin/universe) 2>/dev/null`" = att ; then
199
 
@@ -320,32 +308,32 @@
 
224
@@ -320,32 +313,32 @@
200
225
        else
201
226
                echo pyramid-pyramid-bsd
202
227
        fi
223
248
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
224
249
        echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
225
250
-       exit 0 ;;
 
251
-    i86pc:SunOS:5.*:*)
226
252
+       exit ;;
227
 
     i86pc:SunOS:5.*:*)
 
253
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
228
254
        echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
229
255
-       exit 0 ;;
230
256
+       exit ;;
238
264
     sun4*:SunOS:*:*)
239
265
        case "`/usr/bin/arch -k`" in
240
266
            Series*|S4*)
241
 
@@ -354,10 +342,10 @@
 
267
@@ -354,10 +347,10 @@
242
268
        esac
243
269
        # Japanese Language versions have a version number like `4.1.3-JL'.
244
270
        echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
251
277
     sun*:*:4.2BSD:*)
252
278
        UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
253
279
        test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
254
 
@@ -369,10 +357,10 @@
 
280
@@ -369,10 +362,10 @@
255
281
                echo sparc-sun-sunos${UNAME_RELEASE}
256
282
                ;;
257
283
        esac
264
290
     # The situation for MiNT is a little confusing.  The machine name
265
291
     # can be virtually everything (everything which is not
266
292
     # "atarist" or "atariste" at least should have a processor
267
 
@@ -383,37 +371,40 @@
 
293
@@ -383,37 +376,40 @@
268
294
     # be no problem.
269
295
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
270
296
         echo m68k-atari-mint${UNAME_RELEASE}
316
342
     mips:*:*:UMIPS | mips:*:*:RISCos)
317
343
        eval $set_cc_for_build
318
344
        sed 's/^        //' << EOF >$dummy.c
319
 
@@ -437,32 +428,33 @@
 
345
@@ -437,32 +433,33 @@
320
346
          exit (-1);
321
347
        }
322
348
 EOF
361
387
     AViiON:dgux:*:*)
362
388
         # DG/UX returns AViiON for all architectures
363
389
         UNAME_PROCESSOR=`/usr/bin/uname -p`
364
 
@@ -478,29 +470,29 @@
 
390
@@ -478,29 +475,29 @@
365
391
        else
366
392
            echo i586-dg-dgux${UNAME_RELEASE}
367
393
        fi
400
426
     ia64:AIX:*:*)
401
427
        if [ -x /usr/bin/oslevel ] ; then
402
428
                IBM_REV=`/usr/bin/oslevel`
403
 
@@ -508,7 +500,7 @@
 
429
@@ -508,7 +505,7 @@
404
430
                IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
405
431
        fi
406
432
        echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
409
435
     *:AIX:2:3)
410
436
        if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
411
437
                eval $set_cc_for_build
412
 
@@ -523,14 +515,18 @@
 
438
@@ -523,15 +520,19 @@
413
439
                        exit(0);
414
440
                        }
415
441
 EOF
427
453
                echo rs6000-ibm-aix3.2
428
454
        fi
429
455
-       exit 0 ;;
 
456
-    *:AIX:*:[45])
430
457
+       exit ;;
431
 
     *:AIX:*:[45])
 
458
+    *:AIX:*:[456])
432
459
        IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
433
460
        if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
434
 
@@ -544,28 +540,28 @@
 
461
                IBM_ARCH=rs6000
 
462
@@ -544,28 +545,28 @@
435
463
                IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
436
464
        fi
437
465
        echo ${IBM_ARCH}-ibm-aix${IBM_REV}
468
496
     9000/[34678]??:HP-UX:*:*)
469
497
        HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
470
498
        case "${UNAME_MACHINE}" in
471
 
@@ -627,9 +623,19 @@
 
499
@@ -627,9 +628,19 @@
472
500
        esac
473
501
        if [ ${HP_ARCH} = "hppa2.0w" ]
474
502
        then
491
519
            then
492
520
                HP_ARCH="hppa2.0w"
493
521
            else
494
 
@@ -637,11 +643,11 @@
 
522
@@ -637,11 +648,11 @@
495
523
            fi
496
524
        fi
497
525
        echo ${HP_ARCH}-hp-hpux${HPUX_REV}
505
533
     3050*:HI-UX:*:*)
506
534
        eval $set_cc_for_build
507
535
        sed 's/^        //' << EOF >$dummy.c
508
 
@@ -669,153 +675,166 @@
 
536
@@ -669,153 +680,192 @@
509
537
          exit (0);
510
538
        }
511
539
 EOF
640
668
-       exit 0 ;;
641
669
+       exit ;;
642
670
+    *:FreeBSD:*:*)
643
 
+       echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 
671
+       case ${UNAME_MACHINE} in
 
672
+           pc98)
 
673
+               echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 
674
+           amd64)
 
675
+               echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 
676
+           *)
 
677
+               echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 
678
+       esac
644
679
+       exit ;;
645
680
     i*:CYGWIN*:*)
646
681
        echo ${UNAME_MACHINE}-pc-cygwin
647
682
-       exit 0 ;;
 
683
-    i*:MINGW*:*)
648
684
+       exit ;;
649
 
     i*:MINGW*:*)
 
685
+    *:MINGW*:*)
650
686
        echo ${UNAME_MACHINE}-pc-mingw32
651
687
-       exit 0 ;;
652
688
+       exit ;;
657
693
     i*:PW*:*)
658
694
        echo ${UNAME_MACHINE}-pc-pw32
659
695
-       exit 0 ;;
660
 
+       exit ;;
661
 
     x86:Interix*:[34]*)
662
 
        echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
 
696
-    x86:Interix*:[34]*)
 
697
-       echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
663
698
-       exit 0 ;;
664
699
+       exit ;;
 
700
+    *:Interix*:[3456]*)
 
701
+       case ${UNAME_MACHINE} in
 
702
+           x86)
 
703
+               echo i586-pc-interix${UNAME_RELEASE}
 
704
+               exit ;;
 
705
+           EM64T | authenticamd)
 
706
+               echo x86_64-unknown-interix${UNAME_RELEASE}
 
707
+               exit ;;
 
708
+           IA64)
 
709
+               echo ia64-unknown-interix${UNAME_RELEASE}
 
710
+               exit ;;
 
711
+       esac ;;
665
712
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
666
713
        echo i${UNAME_MACHINE}-pc-mks
667
714
-       exit 0 ;;
702
749
-       exit 0 ;;
703
750
+       exit ;;
704
751
     arm*:Linux:*:*)
 
752
+       eval $set_cc_for_build
 
753
+       if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 
754
+           | grep -q __ARM_EABI__
 
755
+       then
 
756
+           echo ${UNAME_MACHINE}-unknown-linux-gnu
 
757
+       else
 
758
+           echo ${UNAME_MACHINE}-unknown-linux-gnueabi
 
759
+       fi
 
760
+       exit ;;
 
761
+    avr32*:Linux:*:*)
705
762
        echo ${UNAME_MACHINE}-unknown-linux-gnu
706
763
-       exit 0 ;;
707
764
+       exit ;;
729
786
     mips:Linux:*:*)
730
787
        eval $set_cc_for_build
731
788
        sed 's/^        //' << EOF >$dummy.c
732
 
@@ -833,7 +852,7 @@
 
789
@@ -832,8 +882,12 @@
 
790
        #endif
733
791
        #endif
734
792
 EOF
735
 
        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
 
793
-       eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
736
794
-       test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
 
795
+       eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
 
796
+           /^CPU/{
 
797
+               s: ::g
 
798
+               p
 
799
+           }'`"
737
800
+       test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
738
801
        ;;
739
802
     mips64:Linux:*:*)
740
803
        eval $set_cc_for_build
741
 
@@ -852,14 +871,17 @@
 
804
@@ -851,15 +905,22 @@
 
805
        #endif
742
806
        #endif
743
807
 EOF
744
 
        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
 
808
-       eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
745
809
-       test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
 
810
+       eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
 
811
+           /^CPU/{
 
812
+               s: ::g
 
813
+               p
 
814
+           }'`"
746
815
+       test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
747
816
        ;;
748
817
+    or32:Linux:*:*)
759
828
     alpha:Linux:*:*)
760
829
        case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
761
830
          EV5)   UNAME_MACHINE=alphaev5 ;;
762
 
@@ -873,7 +895,7 @@
 
831
@@ -873,7 +934,7 @@
763
832
        objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
764
833
        if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
765
834
        echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
768
837
     parisc:Linux:*:* | hppa:Linux:*:*)
769
838
        # Look for CPU level
770
839
        case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
771
 
@@ -881,25 +903,25 @@
 
840
@@ -881,25 +942,31 @@
772
841
          PA8*) echo hppa2.0-unknown-linux-gnu ;;
773
842
          *)    echo hppa-unknown-linux-gnu ;;
774
843
        esac
794
863
        echo ${UNAME_MACHINE}-unknown-linux-gnu
795
864
-       exit 0 ;;
796
865
+       exit ;;
 
866
+    vax:Linux:*:*)
 
867
+       echo ${UNAME_MACHINE}-dec-linux-gnu
 
868
+       exit ;;
797
869
     x86_64:Linux:*:*)
798
870
        echo x86_64-unknown-linux-gnu
799
871
-       exit 0 ;;
800
872
+       exit ;;
 
873
+    xtensa*:Linux:*:*)
 
874
+       echo ${UNAME_MACHINE}-unknown-linux-gnu
 
875
+       exit ;;
801
876
     i*86:Linux:*:*)
802
877
        # The BFD linker knows what the default object file format is, so
803
878
        # first see if it will tell us. cd to the root directory to prevent
804
 
@@ -917,15 +939,15 @@
 
879
@@ -917,15 +984,15 @@
805
880
                ;;
806
881
          a.out-i386-linux)
807
882
                echo "${UNAME_MACHINE}-pc-linux-gnuaout"
820
895
        esac
821
896
        # Determine whether the default compiler is a.out or elf
822
897
        eval $set_cc_for_build
823
 
@@ -948,17 +970,23 @@
 
898
@@ -942,23 +1009,33 @@
 
899
        LIBC=gnulibc1
 
900
        # endif
 
901
        #else
 
902
-       #ifdef __INTEL_COMPILER
 
903
+       #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
 
904
        LIBC=gnu
 
905
        #else
824
906
        LIBC=gnuaout
825
907
        #endif
826
908
        #endif
828
910
+       LIBC=dietlibc
829
911
+       #endif
830
912
 EOF
831
 
        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
 
913
-       eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
832
914
-       test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
833
915
-       test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
 
916
+       eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
 
917
+           /^LIBC/{
 
918
+               s: ::g
 
919
+               p
 
920
+           }'`"
834
921
+       test x"${LIBC}" != x && {
835
922
+               echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
836
923
+               exit
847
934
     i*86:UNIX_SV:4.2MP:2.*)
848
935
         # Unixware is an offshoot of SVR4, but it has its own version
849
936
         # number series starting with 2...
850
 
@@ -966,24 +994,27 @@
 
937
@@ -966,24 +1043,27 @@
851
938
        # I just have to hope.  -- rms.
852
939
         # Use sysv4.2uw... so that sysv4* matches it.
853
940
        echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
881
968
     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
882
969
        UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
883
970
        if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
884
 
@@ -991,15 +1022,16 @@
 
971
@@ -991,15 +1071,16 @@
885
972
        else
886
973
                echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
887
974
        fi
901
988
     i*86:*:3.2:*)
902
989
        if test -f /usr/options/cb.name; then
903
990
                UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
904
 
@@ -1017,73 +1049,73 @@
 
991
@@ -1017,73 +1098,73 @@
905
992
        else
906
993
                echo ${UNAME_MACHINE}-pc-sysv32
907
994
        fi
997
1084
     *:SINIX-*:*:*)
998
1085
        if uname -p 2>/dev/null >/dev/null ; then
999
1086
                UNAME_MACHINE=`(uname -p) 2>/dev/null`
1000
 
@@ -1091,68 +1123,73 @@
 
1087
@@ -1091,68 +1172,81 @@
1001
1088
        else
1002
1089
                echo ns32k-sni-sysv
1003
1090
        fi
1068
1155
        echo sx6-nec-superux${UNAME_RELEASE}
1069
1156
-       exit 0 ;;
1070
1157
+       exit ;;
 
1158
+    SX-7:SUPER-UX:*:*)
 
1159
+       echo sx7-nec-superux${UNAME_RELEASE}
 
1160
+       exit ;;
 
1161
+    SX-8:SUPER-UX:*:*)
 
1162
+       echo sx8-nec-superux${UNAME_RELEASE}
 
1163
+       exit ;;
 
1164
+    SX-8R:SUPER-UX:*:*)
 
1165
+       echo sx8r-nec-superux${UNAME_RELEASE}
 
1166
+       exit ;;
1071
1167
     Power*:Rhapsody:*:*)
1072
1168
        echo powerpc-apple-rhapsody${UNAME_RELEASE}
1073
1169
-       exit 0 ;;
1078
1174
+       exit ;;
1079
1175
     *:Darwin:*:*)
1080
1176
-       case `uname -p` in
 
1177
-           *86) UNAME_PROCESSOR=i686 ;;
 
1178
-           powerpc) UNAME_PROCESSOR=powerpc ;;
1081
1179
+       UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
1082
1180
+       case $UNAME_PROCESSOR in
1083
 
            *86) UNAME_PROCESSOR=i686 ;;
1084
 
-           powerpc) UNAME_PROCESSOR=powerpc ;;
1085
1181
+           unknown) UNAME_PROCESSOR=powerpc ;;
1086
1182
        esac
1087
1183
        echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
1090
1186
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
1091
1187
        UNAME_PROCESSOR=`uname -p`
1092
1188
        if test "$UNAME_PROCESSOR" = "x86"; then
1093
 
@@ -1160,22 +1197,25 @@
 
1189
@@ -1160,22 +1254,25 @@
1094
1190
                UNAME_MACHINE=pc
1095
1191
        fi
1096
1192
        echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
1123
1219
     *:Plan9:*:*)
1124
1220
        # "uname -m" is not consistent, so use $cputype instead. 386
1125
1221
        # is converted to i386 for consistency with other x86
1126
 
@@ -1186,28 +1226,44 @@
 
1222
@@ -1186,28 +1283,47 @@
1127
1223
            UNAME_MACHINE="$cputype"
1128
1224
        fi
1129
1225
        echo ${UNAME_MACHINE}-unknown-plan9
1173
1269
+    i*86:skyos:*:*)
1174
1270
+       echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
1175
1271
+       exit ;;
 
1272
+    i*86:rdos:*:*)
 
1273
+       echo ${UNAME_MACHINE}-pc-rdos
 
1274
+       exit ;;
1176
1275
 esac
1177
1276
 
1178
1277
 #echo '(No uname command or uname output not recognized.)' 1>&2
1179
 
@@ -1239,7 +1295,7 @@
 
1278
@@ -1239,7 +1355,7 @@
1180
1279
 #endif
1181
1280
 
1182
1281
 #if defined (__arm) && defined (__acorn) && defined (__unix)
1185
1284
 #endif
1186
1285
 
1187
1286
 #if defined (hp300) && !defined (hpux)
1188
 
@@ -1328,11 +1384,12 @@
 
1287
@@ -1328,11 +1444,12 @@
1189
1288
 }
1190
1289
 EOF
1191
1290
 
1200
1299
 
1201
1300
 # Convex versions that predate uname can use getsysinfo(1)
1202
1301
 
1203
 
@@ -1341,22 +1398,22 @@
 
1302
@@ -1341,22 +1458,22 @@
1204
1303
     case `getsysinfo -f cpu_type` in
1205
1304
     c1*)
1206
1305
        echo c1-convex-bsd
1228
1327
     esac
1229
1328
 fi
1230
1329
 
1231
 
@@ -1367,7 +1424,9 @@
 
1330
@@ -1367,7 +1484,9 @@
1232
1331
 the operating system you are using. It is advised that you
1233
1332
 download the most up to date version of the config scripts from
1234
1333
 
1235
1334
-    ftp://ftp.gnu.org/pub/gnu/config/
1236
 
+  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
 
1335
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
1237
1336
+and
1238
 
+  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
 
1337
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
1239
1338
 
1240
1339
 If the version you run ($0) is already up to date, please
1241
1340
 send the following data and any information you think might be
1242
 
--- yasm-0.4.0.orig/config/config.sub
1243
 
+++ yasm-0.4.0/config/config.sub
1244
 
@@ -1,9 +1,9 @@
 
1341
Index: yasm-0.7.0/config/config.sub
 
1342
===================================================================
 
1343
--- yasm-0.7.0.orig/config/config.sub   2008-04-16 03:30:22.000000000 +0000
 
1344
+++ yasm-0.7.0/config/config.sub        2008-10-09 09:14:09.000000000 +0000
 
1345
@@ -1,9 +1,10 @@
1245
1346
 #! /bin/sh
1246
1347
 # Configuration validation subroutine script.
1247
1348
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
1248
1349
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
1249
 
+#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
1350
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 
1351
+#   Free Software Foundation, Inc.
1250
1352
 
1251
1353
-timestamp='2003-07-04'
1252
 
+timestamp='2005-07-08'
 
1354
+timestamp='2008-01-16'
1253
1355
 
1254
1356
 # This file is (in principle) common to ALL GNU software.
1255
1357
 # The presence of a machine in this file suggests that SOME GNU software
1256
 
@@ -21,14 +21,15 @@
 
1358
@@ -21,14 +22,15 @@
1257
1359
 #
1258
1360
 # You should have received a copy of the GNU General Public License
1259
1361
 # along with this program; if not, write to the Free Software
1272
1374
 # Please send patches to <config-patches@gnu.org>.  Submit a context
1273
1375
 # diff and a properly formatted ChangeLog entry.
1274
1376
 #
1275
 
@@ -70,7 +71,7 @@
 
1377
@@ -70,8 +72,8 @@
1276
1378
 version="\
1277
1379
 GNU config.sub ($timestamp)
1278
1380
 
1279
1381
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
1280
 
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
1281
 
 Free Software Foundation, Inc.
 
1382
-Free Software Foundation, Inc.
 
1383
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
 
1384
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
1282
1385
 
1283
1386
 This is free software; see the source for copying conditions.  There is NO
1284
 
@@ -83,11 +84,11 @@
 
1387
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 
1388
@@ -83,11 +85,11 @@
1285
1389
 while test $# -gt 0 ; do
1286
1390
   case $1 in
1287
1391
     --time-stamp | --time* | -t )
1296
1400
     -- )     # Stop option processing
1297
1401
        shift; break ;;
1298
1402
     - )        # Use stdin as input.
1299
 
@@ -99,7 +100,7 @@
 
1403
@@ -99,7 +101,7 @@
1300
1404
     *local*)
1301
1405
        # First pass through any local machine types.
1302
1406
        echo $1
1305
1409
 
1306
1410
     * )
1307
1411
        break ;;
1308
 
@@ -118,7 +119,8 @@
 
1412
@@ -118,7 +120,9 @@
1309
1413
 # Here we must recognize all the valid KERNEL-OS combinations.
1310
1414
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
1311
1415
 case $maybe_os in
1312
1416
-  nto-qnx* | linux-gnu* | kfreebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
1313
 
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
1314
 
+  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
 
1417
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
 
1418
+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
 
1419
+  storm-chaos* | os2-emx* | rtmk-nova*)
1315
1420
     os=-$maybe_os
1316
1421
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
1317
1422
     ;;
1318
 
@@ -144,7 +146,7 @@
 
1423
@@ -144,7 +148,7 @@
1319
1424
        -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
1320
1425
        -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
1321
1426
        -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
1324
1429
                os=
1325
1430
                basic_machine=$1
1326
1431
                ;;
1327
 
@@ -228,14 +230,16 @@
 
1432
@@ -169,6 +173,10 @@
 
1433
        -hiux*)
 
1434
                os=-hiuxwe2
 
1435
                ;;
 
1436
+       -sco6)
 
1437
+               os=-sco5v6
 
1438
+               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 
1439
+               ;;
 
1440
        -sco5)
 
1441
                os=-sco3.2v5
 
1442
                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 
1443
@@ -185,6 +193,10 @@
 
1444
                # Don't forget version if it is 3.2v4 or newer.
 
1445
                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 
1446
                ;;
 
1447
+       -sco5v6*)
 
1448
+               # Don't forget version if it is 3.2v4 or newer.
 
1449
+               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 
1450
+               ;;
 
1451
        -sco*)
 
1452
                os=-sco3.2v2
 
1453
                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 
1454
@@ -228,14 +240,17 @@
1328
1455
        | a29k \
1329
1456
        | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
1330
1457
        | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 
1458
-       | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
1331
1459
+       | am33_2.0 \
1332
 
        | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
 
1460
+       | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
1333
1461
+       | bfin \
1334
1462
        | c4x | clipper \
1335
1463
        | d10v | d30v | dlx | dsp16xx \
1336
 
        | fr30 | frv \
 
1464
-       | fr30 | frv \
 
1465
+       | fido | fr30 | frv \
1337
1466
        | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
1338
1467
        | i370 | i860 | i960 | ia64 \
1339
1468
-       | ip2k \
1340
1469
-       | m32r | m68000 | m68k | m88k | mcore \
1341
1470
+       | ip2k | iq2000 \
1342
 
+       | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
 
1471
+       | m32c | m32r | m32rle | m68000 | m68k | m88k \
 
1472
+       | maxq | mb | microblaze | mcore | mep \
1343
1473
        | mips | mipsbe | mipseb | mipsel | mipsle \
1344
1474
        | mips16 \
1345
1475
        | mips64 | mips64el \
1346
 
@@ -244,30 +248,37 @@
 
1476
@@ -244,27 +259,33 @@
1347
1477
        | mips64vr4100 | mips64vr4100el \
1348
1478
        | mips64vr4300 | mips64vr4300el \
1349
1479
        | mips64vr5000 | mips64vr5000el \
1356
1486
        | mipsisa64sr71k | mipsisa64sr71kel \
1357
1487
        | mipstx39 | mipstx39el \
1358
1488
        | mn10200 | mn10300 \
1359
 
+       | ms1 \
 
1489
+       | mt \
1360
1490
        | msp430 \
 
1491
+       | nios | nios2 \
1361
1492
        | ns16k | ns32k \
1362
1493
-       | openrisc | or32 \
1363
1494
+       | or32 \
1365
1496
        | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
1366
1497
        | pyramid \
1367
1498
-       | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
1368
 
+       | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
 
1499
+       | score \
 
1500
+       | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
1369
1501
        | sh64 | sh64le \
1370
1502
-       | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
1371
 
+       | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
1372
 
+       | sparcv8 | sparcv9 | sparcv9b \
1373
 
        | strongarm \
 
1503
-       | strongarm \
 
1504
+       | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 
1505
+       | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
 
1506
+       | spu | strongarm \
1374
1507
        | tahoe | thumb | tic4x | tic80 | tron \
1375
1508
        | v850 | v850e \
1376
1509
        | we32k \
1377
1510
-       | x86 | xscale | xstormy16 | xtensa \
1378
 
+       | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
 
1511
+       | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
1379
1512
        | z8k)
1380
1513
                basic_machine=$basic_machine-unknown
1381
1514
                ;;
1382
 
+       m32c)
1383
 
+               basic_machine=$basic_machine-unknown
 
1515
@@ -275,6 +296,9 @@
 
1516
                ;;
 
1517
        m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 
1518
                ;;
 
1519
+       ms1)
 
1520
+               basic_machine=mt-unknown
1384
1521
+               ;;
1385
 
        m6811 | m68hc11 | m6812 | m68hc12)
1386
 
                # Motorola 68HC11/12.
1387
 
                basic_machine=$basic_machine-unknown
1388
 
@@ -292,22 +303,22 @@
 
1522
 
 
1523
        # We use `pc' rather than `unknown'
 
1524
        # because (1) that's what they normally are, and
 
1525
@@ -292,22 +316,22 @@
1389
1526
        | a29k-* \
1390
1527
        | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
1391
1528
        | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
1392
1529
-       | alphapca5[67]-* | alpha64pca5[67]-* | amd64-* | arc-* \
1393
1530
+       | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
1394
1531
        | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
1395
 
        | avr-* \
 
1532
-       | avr-* \
1396
1533
-       | bs2000-* \
 
1534
+       | avr-* | avr32-* \
1397
1535
+       | bfin-* | bs2000-* \
1398
1536
        | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
1399
1537
-       | clipper-* | cydra-* \
1400
1538
+       | clipper-* | craynv-* | cydra-* \
1401
1539
        | d10v-* | d30v-* | dlx-* \
1402
1540
        | elxsi-* \
1403
 
        | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
 
1541
-       | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
 
1542
+       | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
1404
1543
        | h8300-* | h8500-* \
1405
1544
        | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
1406
1545
        | i*86-* | i860-* | i960-* | ia64-* \
1407
1546
-       | ip2k-* \
1408
1547
-       | m32r-* \
1409
1548
+       | ip2k-* | iq2000-* \
1410
 
+       | m32r-* | m32rle-* \
 
1549
+       | m32c-* | m32r-* | m32rle-* \
1411
1550
        | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
1412
1551
-       | m88110-* | m88k-* | mcore-* \
1413
1552
+       | m88110-* | m88k-* | maxq-* | mcore-* \
1414
1553
        | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
1415
1554
        | mips16-* \
1416
1555
        | mips64-* | mips64el-* \
1417
 
@@ -316,33 +327,40 @@
 
1556
@@ -316,33 +340,43 @@
1418
1557
        | mips64vr4100-* | mips64vr4100el-* \
1419
1558
        | mips64vr4300-* | mips64vr4300el-* \
1420
1559
        | mips64vr5000-* | mips64vr5000el-* \
1427
1566
        | mipsisa64sr71k-* | mipsisa64sr71kel-* \
1428
1567
        | mipstx39-* | mipstx39el-* \
1429
1568
+       | mmix-* \
1430
 
+       | ms1-* \
 
1569
+       | mt-* \
1431
1570
        | msp430-* \
1432
1571
-       | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
 
1572
+       | nios-* | nios2-* \
1433
1573
+       | none-* | np1-* | ns16k-* | ns32k-* \
1434
1574
        | orion-* \
1435
1575
        | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
1437
1577
        | pyramid-* \
1438
1578
        | romp-* | rs6000-* \
1439
1579
-       | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
1440
 
+       | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
 
1580
+       | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
1441
1581
        | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
1442
1582
-       | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
1443
1583
-       | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
1444
 
+       | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
 
1584
+       | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
1445
1585
+       | sparclite-* \
1446
 
+       | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
 
1586
+       | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
1447
1587
        | tahoe-* | thumb-* \
1448
1588
        | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
1449
1589
        | tron-* \
1451
1591
        | we32k-* \
1452
1592
-       | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
1453
1593
-       | xtensa-* \
1454
 
+       | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
1455
 
+       | xstormy16-* | xtensa-* \
 
1594
+       | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
 
1595
+       | xstormy16-* | xtensa*-* \
1456
1596
        | ymp-* \
1457
1597
        | z8k-*)
1458
1598
                ;;
1459
 
+       m32c-*)
 
1599
+       # Recognize the basic CPU types without company name, with glob match.
 
1600
+       xtensa*)
 
1601
+               basic_machine=$basic_machine-unknown
1460
1602
+               ;;
1461
1603
        # Recognize the various machine names and aliases which stand
1462
1604
        # for a CPU type and a company and sometimes even an OS.
1463
1605
        386bsd)
1464
 
@@ -359,6 +377,9 @@
 
1606
@@ -359,6 +393,9 @@
1465
1607
                basic_machine=a29k-amd
1466
1608
                os=-udi
1467
1609
                ;;
1471
1613
        adobe68k)
1472
1614
                basic_machine=m68010-adobe
1473
1615
                os=-scout
1474
 
@@ -376,6 +397,9 @@
 
1616
@@ -376,6 +413,9 @@
1475
1617
        amd64)
1476
1618
                basic_machine=x86_64-pc
1477
1619
                ;;
1481
1623
        amdahl)
1482
1624
                basic_machine=580-amdahl
1483
1625
                os=-sysv
1484
 
@@ -435,12 +459,27 @@
 
1626
@@ -407,6 +447,14 @@
 
1627
                basic_machine=ns32k-sequent
 
1628
                os=-dynix
 
1629
                ;;
 
1630
+       blackfin)
 
1631
+               basic_machine=bfin-unknown
 
1632
+               os=-linux
 
1633
+               ;;
 
1634
+       blackfin-*)
 
1635
+               basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
 
1636
+               os=-linux
 
1637
+               ;;
 
1638
        c90)
 
1639
                basic_machine=c90-cray
 
1640
                os=-unicos
 
1641
@@ -435,12 +483,27 @@
1485
1642
                basic_machine=j90-cray
1486
1643
                os=-unicos
1487
1644
                ;;
1489
1646
+               basic_machine=craynv-cray
1490
1647
+               os=-unicosmp
1491
1648
+               ;;
1492
 
+       cr16c)
1493
 
+               basic_machine=cr16c-unknown
 
1649
+       cr16)
 
1650
+               basic_machine=cr16-unknown
1494
1651
+               os=-elf
1495
1652
+               ;;
1496
1653
        crds | unos)
1509
1666
        da30 | da30-*)
1510
1667
                basic_machine=m68k-da30
1511
1668
                ;;
1512
 
@@ -463,6 +502,10 @@
 
1669
@@ -463,6 +526,10 @@
1513
1670
                basic_machine=m88k-motorola
1514
1671
                os=-sysv3
1515
1672
                ;;
1520
1677
        dpx20 | dpx20-*)
1521
1678
                basic_machine=rs6000-bull
1522
1679
                os=-bosx
1523
 
@@ -641,10 +684,6 @@
 
1680
@@ -613,6 +680,14 @@
 
1681
                basic_machine=m68k-isi
 
1682
                os=-sysv
 
1683
                ;;
 
1684
+       m68knommu)
 
1685
+               basic_machine=m68k-unknown
 
1686
+               os=-linux
 
1687
+               ;;
 
1688
+       m68knommu-*)
 
1689
+               basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
 
1690
+               os=-linux
 
1691
+               ;;
 
1692
        m88k-omron*)
 
1693
                basic_machine=m88k-omron
 
1694
                ;;
 
1695
@@ -628,6 +703,10 @@
 
1696
                basic_machine=i386-pc
 
1697
                os=-mingw32
 
1698
                ;;
 
1699
+       mingw32ce)
 
1700
+               basic_machine=arm-unknown
 
1701
+               os=-mingw32ce
 
1702
+               ;;
 
1703
        miniframe)
 
1704
                basic_machine=m68000-convergent
 
1705
                ;;
 
1706
@@ -641,10 +720,6 @@
1524
1707
        mips3*)
1525
1708
                basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
1526
1709
                ;;
1531
1714
        monitor)
1532
1715
                basic_machine=m68k-rom68k
1533
1716
                os=-coff
1534
 
@@ -725,10 +764,6 @@
 
1717
@@ -657,6 +732,9 @@
 
1718
                basic_machine=i386-pc
 
1719
                os=-msdos
 
1720
                ;;
 
1721
+       ms1-*)
 
1722
+               basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
 
1723
+               ;;
 
1724
        mvs)
 
1725
                basic_machine=i370-ibm
 
1726
                os=-mvs
 
1727
@@ -725,10 +803,6 @@
1535
1728
        np1)
1536
1729
                basic_machine=np1-gould
1537
1730
                ;;
1542
1735
        nsr-tandem)
1543
1736
                basic_machine=nsr-tandem
1544
1737
                ;;
1545
 
@@ -736,9 +771,12 @@
 
1738
@@ -736,9 +810,12 @@
1546
1739
                basic_machine=hppa1.1-oki
1547
1740
                os=-proelf
1548
1741
                ;;
1557
1750
                ;;
1558
1751
        OSE68000 | ose68000)
1559
1752
                basic_machine=m68000-ericsson
1560
 
@@ -960,6 +998,10 @@
 
1753
@@ -756,6 +833,14 @@
 
1754
                basic_machine=i860-intel
 
1755
                os=-osf
 
1756
                ;;
 
1757
+       parisc)
 
1758
+               basic_machine=hppa-unknown
 
1759
+               os=-linux
 
1760
+               ;;
 
1761
+       parisc-*)
 
1762
+               basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
 
1763
+               os=-linux
 
1764
+               ;;
 
1765
        pbd)
 
1766
                basic_machine=sparc-tti
 
1767
                ;;
 
1768
@@ -765,6 +850,12 @@
 
1769
        pc532 | pc532-*)
 
1770
                basic_machine=ns32k-pc532
 
1771
                ;;
 
1772
+       pc98)
 
1773
+               basic_machine=i386-pc
 
1774
+               ;;
 
1775
+       pc98-*)
 
1776
+               basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
 
1777
+               ;;
 
1778
        pentium | p5 | k5 | k6 | nexgen | viac3)
 
1779
                basic_machine=i586-pc
 
1780
                ;;
 
1781
@@ -821,6 +912,10 @@
 
1782
                basic_machine=i586-unknown
 
1783
                os=-pw32
 
1784
                ;;
 
1785
+       rdos)
 
1786
+               basic_machine=i386-pc
 
1787
+               os=-rdos
 
1788
+               ;;
 
1789
        rom68k)
 
1790
                basic_machine=m68k-rom68k
 
1791
                os=-coff
 
1792
@@ -847,6 +942,10 @@
 
1793
        sb1el)
 
1794
                basic_machine=mipsisa64sb1el-unknown
 
1795
                ;;
 
1796
+       sde)
 
1797
+               basic_machine=mipsisa32-sde
 
1798
+               os=-elf
 
1799
+               ;;
 
1800
        sei)
 
1801
                basic_machine=mips-sei
 
1802
                os=-seiux
 
1803
@@ -858,6 +957,9 @@
 
1804
                basic_machine=sh-hitachi
 
1805
                os=-hms
 
1806
                ;;
 
1807
+       sh5el)
 
1808
+               basic_machine=sh5le-unknown
 
1809
+               ;;
 
1810
        sh64)
 
1811
                basic_machine=sh64-unknown
 
1812
                ;;
 
1813
@@ -947,6 +1049,10 @@
 
1814
                basic_machine=tic6x-unknown
 
1815
                os=-coff
 
1816
                ;;
 
1817
+       tile*)
 
1818
+               basic_machine=tile-unknown
 
1819
+               os=-linux-gnu
 
1820
+               ;;
 
1821
        tx39)
 
1822
                basic_machine=mipstx39-unknown
 
1823
                ;;
 
1824
@@ -960,6 +1066,10 @@
1561
1825
        tower | tower-32)
1562
1826
                basic_machine=m68k-ncr
1563
1827
                ;;
1568
1832
        udi29k)
1569
1833
                basic_machine=a29k-amd
1570
1834
                os=-udi
1571
 
@@ -1003,6 +1045,10 @@
 
1835
@@ -1003,6 +1113,10 @@
1572
1836
                basic_machine=hppa1.1-winbond
1573
1837
                os=-proelf
1574
1838
                ;;
1579
1843
        xps | xps100)
1580
1844
                basic_machine=xps100-honeywell
1581
1845
                ;;
1582
 
@@ -1033,6 +1079,9 @@
 
1846
@@ -1033,6 +1147,9 @@
1583
1847
        romp)
1584
1848
                basic_machine=romp-ibm
1585
1849
                ;;
1589
1853
        rs6000)
1590
1854
                basic_machine=rs6000-ibm
1591
1855
                ;;
1592
 
@@ -1049,13 +1098,10 @@
 
1856
@@ -1049,13 +1166,10 @@
1593
1857
        we32k)
1594
1858
                basic_machine=we32k-att
1595
1859
                ;;
1601
1865
-               basic_machine=sh64-unknown
1602
1866
-               ;;
1603
1867
-       sparc | sparcv9 | sparcv9b)
1604
 
+       sparc | sparcv8 | sparcv9 | sparcv9b)
 
1868
+       sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
1605
1869
                basic_machine=sparc-sun
1606
1870
                ;;
1607
1871
        cydra)
1608
 
@@ -1128,19 +1174,21 @@
 
1872
@@ -1128,19 +1242,23 @@
1609
1873
              | -aos* \
1610
1874
              | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
1611
1875
              | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
1612
1876
-             | -hiux* | -386bsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
1613
1877
-             | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
1614
 
+             | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
 
1878
+             | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
 
1879
+             | -openbsd* | -solidbsd* \
1615
1880
+             | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
1616
1881
+             | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
1617
1882
              | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
1619
1884
              | -chorusos* | -chorusrdb* \
1620
1885
              | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1621
1886
-             | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
1622
 
+             | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
 
1887
+             | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
 
1888
+             | -uxpv* | -beos* | -mpeix* | -udk* \
1623
1889
              | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
1624
1890
              | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
1625
1891
              | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
1627
1893
              | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
1628
1894
-             | -powermax* | -dnix* | -nx6 | -nx7 | -sei*)
1629
1895
+             | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
1630
 
+             | -skyos* | -haiku*)
 
1896
+             | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
1631
1897
        # Remember, each alternative MUST END IN *, to match a version number.
1632
1898
                ;;
1633
1899
        -qnx*)
1634
 
@@ -1158,12 +1206,15 @@
 
1900
@@ -1158,12 +1276,15 @@
1635
1901
                os=`echo $os | sed -e 's|nto|nto-qnx|'`
1636
1902
                ;;
1637
1903
        -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
1648
1914
        -linux*)
1649
1915
                os=`echo $os | sed -e 's|linux|linux-gnu|'`
1650
1916
                ;;
1651
 
@@ -1176,6 +1227,9 @@
 
1917
@@ -1176,6 +1297,9 @@
1652
1918
        -opened*)
1653
1919
                os=-openedition
1654
1920
                ;;
1658
1924
        -wince*)
1659
1925
                os=-wince
1660
1926
                ;;
1661
 
@@ -1197,6 +1251,9 @@
 
1927
@@ -1197,6 +1321,9 @@
1662
1928
        -atheos*)
1663
1929
                os=-atheos
1664
1930
                ;;
1668
1934
        -386bsd)
1669
1935
                os=-bsd
1670
1936
                ;;
1671
 
@@ -1219,6 +1276,9 @@
 
1937
@@ -1219,6 +1346,9 @@
1672
1938
        -sinix*)
1673
1939
                os=-sysv4
1674
1940
                ;;
1678
1944
        -triton*)
1679
1945
                os=-sysv3
1680
1946
                ;;
1681
 
@@ -1255,6 +1315,9 @@
 
1947
@@ -1255,6 +1385,9 @@
1682
1948
        -kaos*)
1683
1949
                os=-kaos
1684
1950
                ;;
1688
1954
        -none)
1689
1955
                ;;
1690
1956
        *)
1691
 
@@ -1332,9 +1395,15 @@
 
1957
@@ -1277,6 +1410,12 @@
 
1958
 # system, and we'll never get to this point.
 
1959
 
 
1960
 case $basic_machine in
 
1961
+        score-*)
 
1962
+               os=-elf
 
1963
+               ;;
 
1964
+        spu-*)
 
1965
+               os=-elf
 
1966
+               ;;
 
1967
        *-acorn)
 
1968
                os=-riscix1.2
 
1969
                ;;
 
1970
@@ -1286,9 +1425,9 @@
 
1971
        arm*-semi)
 
1972
                os=-aout
 
1973
                ;;
 
1974
-    c4x-* | tic4x-*)
 
1975
-        os=-coff
 
1976
-        ;;
 
1977
+        c4x-* | tic4x-*)
 
1978
+               os=-coff
 
1979
+               ;;
 
1980
        # This must come before the *-dec entry.
 
1981
        pdp10-*)
 
1982
                os=-tops20
 
1983
@@ -1314,6 +1453,9 @@
 
1984
        m68*-cisco)
 
1985
                os=-aout
 
1986
                ;;
 
1987
+        mep-*)
 
1988
+               os=-elf
 
1989
+               ;;
 
1990
        mips*-cisco)
 
1991
                os=-elf
 
1992
                ;;
 
1993
@@ -1332,9 +1474,15 @@
1692
1994
        *-be)
1693
1995
                os=-beos
1694
1996
                ;;
1704
2006
        *-wec)
1705
2007
                os=-proelf
1706
2008
                ;;
1707
 
@@ -1467,9 +1536,15 @@
 
2009
@@ -1467,9 +1615,15 @@
1708
2010
                        -mvs* | -opened*)
1709
2011
                                vendor=ibm
1710
2012
                                ;;
1720
2022
                        -vxsim* | -vxworks* | -windiss*)
1721
2023
                                vendor=wrs
1722
2024
                                ;;
1723
 
@@ -1494,7 +1569,7 @@
 
2025
@@ -1494,7 +1648,7 @@
1724
2026
 esac
1725
2027
 
1726
2028
 echo $basic_machine$os