debian/patches/02_automake_config.sub.diff

   1 --- config.sub  2004-12-30 08:00:40.000000000 -0800
   2 +++ /usr/share/automake-1.7/config.sub  2004-12-23 18:40:32.000000000 -0800
   3 @@ -1,9 +1,9 @@
   4  #! /bin/sh
   5  # Configuration validation subroutine script.
   6  #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
   7 -#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
   8 +#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
   9
  10 -timestamp='2003-07-04'
  11 +timestamp='2004-11-30'
  12
  13  # This file is (in principle) common to ALL GNU software.
  14  # The presence of a machine in this file suggests that SOME GNU software
  15 @@ -70,7 +70,7 @@
  16  version="\
  17  GNU config.sub ($timestamp)
  18
  19 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
  20 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
  21  Free Software Foundation, Inc.
  22
  23  This is free software; see the source for copying conditions.  There is NO
  24 @@ -118,7 +118,8 @@
  25  # Here we must recognize all the valid KERNEL-OS combinations.
  26  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
  27  case $maybe_os in
  28 -  nto-qnx* | linux-gnu* | kfreebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
  29 +  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
  30 +  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
  31      os=-$maybe_os
  32      basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
  33      ;;
  34 @@ -144,7 +145,7 @@
  35         -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
  36         -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
  37         -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
  38 -       -apple | -axis)
  39 +       -apple | -axis | -knuth | -cray)
  40                 os=
  41                 basic_machine=$1
  42                 ;;
  43 @@ -228,14 +229,15 @@
  44         | a29k \
  45         | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
  46         | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
  47 +       | am33_2.0 \
  48         | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
  49         | c4x | clipper \
  50         | d10v | d30v | dlx | dsp16xx \
  51         | fr30 | frv \
  52         | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
  53         | i370 | i860 | i960 | ia64 \
  54 -       | ip2k \
  55 -       | m32r | m68000 | m68k | m88k | mcore \
  56 +       | ip2k | iq2000 \
  57 +       | m32r | m32rle | m68000 | m68k | m88k | mcore \
  58         | mips | mipsbe | mipseb | mipsel | mipsle \
  59         | mips16 \
  60         | mips64 | mips64el \
  61 @@ -247,6 +249,7 @@
  62         | mipsisa32 | mipsisa32el \
  63         | mipsisa32r2 | mipsisa32r2el \
  64         | mipsisa64 | mipsisa64el \
  65 +       | mipsisa64r2 | mipsisa64r2el \
  66         | mipsisa64sb1 | mipsisa64sb1el \
  67         | mipsisa64sr71k | mipsisa64sr71kel \
  68         | mipstx39 | mipstx39el \
  69 @@ -259,12 +262,12 @@
  70         | pyramid \
  71         | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
  72         | sh64 | sh64le \
  73 -       | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
  74 +       | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
  75         | strongarm \
  76         | tahoe | thumb | tic4x | tic80 | tron \
  77         | v850 | v850e \
  78         | we32k \
  79 -       | x86 | xscale | xstormy16 | xtensa \
  80 +       | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
  81         | z8k)
  82                 basic_machine=$basic_machine-unknown
  83                 ;;
  84 @@ -292,20 +295,20 @@
  85         | a29k-* \
  86         | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
  87         | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
  88 -       | alphapca5[67]-* | alpha64pca5[67]-* | amd64-* | arc-* \
  89 +       | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
  90         | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
  91         | avr-* \
  92         | bs2000-* \
  93         | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
  94 -       | clipper-* | cydra-* \
  95 +       | clipper-* | craynv-* | cydra-* \
  96         | d10v-* | d30v-* | dlx-* \
  97         | elxsi-* \
  98         | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
  99         | h8300-* | h8500-* \
 100         | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 101         | i*86-* | i860-* | i960-* | ia64-* \
 102 -       | ip2k-* \
 103 -       | m32r-* \
 104 +       | ip2k-* | iq2000-* \
 105 +       | m32r-* | m32rle-* \
 106         | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 107         | m88110-* | m88k-* | mcore-* \
 108         | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 109 @@ -319,11 +322,13 @@
 110         | mipsisa32-* | mipsisa32el-* \
 111         | mipsisa32r2-* | mipsisa32r2el-* \
 112         | mipsisa64-* | mipsisa64el-* \
 113 +       | mipsisa64r2-* | mipsisa64r2el-* \
 114         | mipsisa64sb1-* | mipsisa64sb1el-* \
 115         | mipsisa64sr71k-* | mipsisa64sr71kel-* \
 116         | mipstx39-* | mipstx39el-* \
 117 +       | mmix-* \
 118         | msp430-* \
 119 -       | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
 120 +       | none-* | np1-* | ns16k-* | ns32k-* \
 121         | orion-* \
 122         | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 123         | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 124 @@ -332,14 +337,14 @@
 125         | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
 126         | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 127         | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
 128 -       | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
 129 +       | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
 130         | tahoe-* | thumb-* \
 131         | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 132         | tron-* \
 133         | v850-* | v850e-* | vax-* \
 134         | we32k-* \
 135 -       | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
 136 -       | xtensa-* \
 137 +       | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
 138 +       | xstormy16-* | xtensa-* \
 139         | ymp-* \
 140         | z8k-*)
 141                 ;;
 142 @@ -359,6 +364,9 @@
 143                 basic_machine=a29k-amd
 144                 os=-udi
 145                 ;;
 146 +       abacus)
 147 +               basic_machine=abacus-unknown
 148 +               ;;
 149         adobe68k)
 150                 basic_machine=m68010-adobe
 151                 os=-scout
 152 @@ -376,6 +384,9 @@
 153         amd64)
 154                 basic_machine=x86_64-pc
 155                 ;;
 156 +       amd64-*)
 157 +               basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
 158 +               ;;
 159         amdahl)
 160                 basic_machine=580-amdahl
 161                 os=-sysv
 162 @@ -435,12 +446,27 @@
 163                 basic_machine=j90-cray
 164                 os=-unicos
 165                 ;;
 166 +       craynv)
 167 +               basic_machine=craynv-cray
 168 +               os=-unicosmp
 169 +               ;;
 170 +       cr16c)
 171 +               basic_machine=cr16c-unknown
 172 +               os=-elf
 173 +               ;;
 174         crds | unos)
 175                 basic_machine=m68k-crds
 176                 ;;
 177 +       crisv32 | crisv32-* | etraxfs*)
 178 +               basic_machine=crisv32-axis
 179 +               ;;
 180         cris | cris-* | etrax*)
 181                 basic_machine=cris-axis
 182                 ;;
 183 +       crx)
 184 +               basic_machine=crx-unknown
 185 +               os=-elf
 186 +               ;;
 187         da30 | da30-*)
 188                 basic_machine=m68k-da30
 189                 ;;
 190 @@ -463,6 +489,10 @@
 191                 basic_machine=m88k-motorola
 192                 os=-sysv3
 193                 ;;
 194 +       djgpp)
 195 +               basic_machine=i586-pc
 196 +               os=-msdosdjgpp
 197 +               ;;
 198         dpx20 | dpx20-*)
 199                 basic_machine=rs6000-bull
 200                 os=-bosx
 201 @@ -641,10 +671,6 @@
 202         mips3*)
 203                 basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
 204                 ;;
 205 -       mmix*)
 206 -               basic_machine=mmix-knuth
 207 -               os=-mmixware
 208 -               ;;
 209         monitor)
 210                 basic_machine=m68k-rom68k
 211                 os=-coff
 212 @@ -725,10 +751,6 @@
 213         np1)
 214                 basic_machine=np1-gould
 215                 ;;
 216 -       nv1)
 217 -               basic_machine=nv1-cray
 218 -               os=-unicosmp
 219 -               ;;
 220         nsr-tandem)
 221                 basic_machine=nsr-tandem
 222                 ;;
 223 @@ -740,6 +762,10 @@
 224                 basic_machine=or32-unknown
 225                 os=-coff
 226                 ;;
 227 +       os400)
 228 +               basic_machine=powerpc-ibm
 229 +               os=-os400
 230 +               ;;
 231         OSE68000 | ose68000)
 232                 basic_machine=m68000-ericsson
 233                 os=-ose
 234 @@ -960,6 +986,10 @@
 235         tower | tower-32)
 236                 basic_machine=m68k-ncr
 237                 ;;
 238 +       tpf)
 239 +               basic_machine=s390x-ibm
 240 +               os=-tpf
 241 +               ;;
 242         udi29k)
 243                 basic_machine=a29k-amd
 244                 os=-udi
 245 @@ -1003,6 +1033,10 @@
 246                 basic_machine=hppa1.1-winbond
 247                 os=-proelf
 248                 ;;
 249 +       xbox)
 250 +               basic_machine=i686-pc
 251 +               os=-mingw32
 252 +               ;;
 253         xps | xps100)
 254                 basic_machine=xps100-honeywell
 255                 ;;
 256 @@ -1033,6 +1067,9 @@
 257         romp)
 258                 basic_machine=romp-ibm
 259                 ;;
 260 +       mmix)
 261 +               basic_machine=mmix-knuth
 262 +               ;;
 263         rs6000)
 264                 basic_machine=rs6000-ibm
 265                 ;;
 266 @@ -1055,7 +1092,7 @@
 267         sh64)
 268                 basic_machine=sh64-unknown
 269                 ;;
 270 -       sparc | sparcv9 | sparcv9b)
 271 +       sparc | sparcv8 | sparcv9 | sparcv9b)
 272                 basic_machine=sparc-sun
 273                 ;;
 274         cydra)
 275 @@ -1128,19 +1165,20 @@
 276               | -aos* \
 277               | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 278               | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 279 -             | -hiux* | -386bsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
 280 -             | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 281 +             | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
 282 +             | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 283 +             | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 284               | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 285               | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 286               | -chorusos* | -chorusrdb* \
 287               | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 288 -             | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
 289 +             | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
 290               | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 291               | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 292               | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 293               | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 294               | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 295 -             | -powermax* | -dnix* | -nx6 | -nx7 | -sei*)
 296 +             | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
 297         # Remember, each alternative MUST END IN *, to match a version number.
 298                 ;;
 299         -qnx*)
 300 @@ -1164,6 +1202,9 @@
 301         -mac*)
 302                 os=`echo $os | sed -e 's|mac|macos|'`
 303                 ;;
 304 +       -linux-dietlibc)
 305 +               os=-linux-dietlibc
 306 +               ;;
 307         -linux*)
 308                 os=`echo $os | sed -e 's|linux|linux-gnu|'`
 309                 ;;
 310 @@ -1176,6 +1217,9 @@
 311         -opened*)
 312                 os=-openedition
 313                 ;;
 314 +        -os400*)
 315 +               os=-os400
 316 +               ;;
 317         -wince*)
 318                 os=-wince
 319                 ;;
 320 @@ -1197,6 +1241,9 @@
 321         -atheos*)
 322                 os=-atheos
 323                 ;;
 324 +       -syllable*)
 325 +               os=-syllable
 326 +               ;;
 327         -386bsd)
 328                 os=-bsd
 329                 ;;
 330 @@ -1219,6 +1266,9 @@
 331         -sinix*)
 332                 os=-sysv4
 333                 ;;
 334 +        -tpf*)
 335 +               os=-tpf
 336 +               ;;
 337         -triton*)
 338                 os=-sysv3
 339                 ;;
 340 @@ -1255,6 +1305,9 @@
 341         -kaos*)
 342                 os=-kaos
 343                 ;;
 344 +       -zvmoe)
 345 +               os=-zvmoe
 346 +               ;;
 347         -none)
 348                 ;;
 349         *)
 350 @@ -1335,6 +1388,9 @@
 351         *-ibm)
 352                 os=-aix
 353                 ;;
 354 +       *-knuth)
 355 +               os=-mmixware
 356 +               ;;
 357         *-wec)
 358                 os=-proelf
 359                 ;;
 360 @@ -1467,9 +1523,15 @@
 361                         -mvs* | -opened*)
 362                                 vendor=ibm
 363                                 ;;
 364 +                       -os400*)
 365 +                               vendor=ibm
 366 +                               ;;
 367                         -ptx*)
 368                                 vendor=sequent
 369                                 ;;
 370 +                       -tpf*)
 371 +                               vendor=ibm
 372 +                               ;;
 373                         -vxsim* | -vxworks* | -windiss*)
 374                                 vendor=wrs
 375                                 ;;