pthbs

Packaging Through Hashed Build Scripts
git clone https://ccx.te2000.cz/git/pthbs
Log | Files | Refs | Submodules | README

mcm-mpfr-4.0.2.patch (22003B)


      1 diff -ru mpfr-4.0.2.orig/config.sub mpfr-4.0.2/config.sub
      2 --- mpfr-4.0.2.orig/config.sub	2019-01-31 21:43:20.000000000 +0100
      3 +++ mpfr-4.0.2/config.sub	2023-06-13 00:16:33.905074826 +0200
      4 @@ -1,8 +1,8 @@
      5  #! /bin/sh
      6  # Configuration validation subroutine script.
      7 -#   Copyright 1992-2018 Free Software Foundation, Inc.
      8 +#   Copyright 1992-2016 Free Software Foundation, Inc.
      9  
     10 -timestamp='2018-02-22'
     11 +timestamp='2016-03-30'
     12  
     13  # This file is free software; you can redistribute it and/or modify it
     14  # under the terms of the GNU General Public License as published by
     15 @@ -15,7 +15,7 @@
     16  # General Public License for more details.
     17  #
     18  # You should have received a copy of the GNU General Public License
     19 -# along with this program; if not, see <https://www.gnu.org/licenses/>.
     20 +# along with this program; if not, see <http://www.gnu.org/licenses/>.
     21  #
     22  # As a special exception to the GNU General Public License, if you
     23  # distribute this file as part of a program that contains a
     24 @@ -33,7 +33,7 @@
     25  # Otherwise, we print the canonical config type on stdout and succeed.
     26  
     27  # You can get the latest version of this script from:
     28 -# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
     29 +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
     30  
     31  # This file is supposed to be the same for all GNU packages
     32  # and recognize all the CPU types, system types and aliases
     33 @@ -57,7 +57,7 @@
     34  
     35  Canonicalize a configuration name.
     36  
     37 -Options:
     38 +Operation modes:
     39    -h, --help         print this help, then exit
     40    -t, --time-stamp   print date of last modification, then exit
     41    -v, --version      print version number, then exit
     42 @@ -67,7 +67,7 @@
     43  version="\
     44  GNU config.sub ($timestamp)
     45  
     46 -Copyright 1992-2018 Free Software Foundation, Inc.
     47 +Copyright 1992-2016 Free Software Foundation, Inc.
     48  
     49  This is free software; see the source for copying conditions.  There is NO
     50  warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
     51 @@ -94,7 +94,7 @@
     52  
     53      *local*)
     54         # First pass through any local machine types.
     55 -       echo "$1"
     56 +       echo $1
     57         exit ;;
     58  
     59      * )
     60 @@ -112,24 +112,24 @@
     61  
     62  # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
     63  # Here we must recognize all the valid KERNEL-OS combinations.
     64 -maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
     65 +maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
     66  case $maybe_os in
     67    nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
     68    linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
     69    knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
     70 -  kopensolaris*-gnu* | cloudabi*-eabi* | \
     71 +  kopensolaris*-gnu* | \
     72    storm-chaos* | os2-emx* | rtmk-nova*)
     73      os=-$maybe_os
     74 -    basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     75 +    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     76      ;;
     77    android-linux)
     78      os=-linux-android
     79 -    basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
     80 +    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
     81      ;;
     82    *)
     83 -    basic_machine=`echo "$1" | sed 's/-[^-]*$//'`
     84 -    if [ "$basic_machine" != "$1" ]
     85 -    then os=`echo "$1" | sed 's/.*-/-/'`
     86 +    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
     87 +    if [ $basic_machine != $1 ]
     88 +    then os=`echo $1 | sed 's/.*-/-/'`
     89      else os=; fi
     90      ;;
     91  esac
     92 @@ -178,44 +178,44 @@
     93  		;;
     94  	-sco6)
     95  		os=-sco5v6
     96 -		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
     97 +		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
     98  		;;
     99  	-sco5)
    100  		os=-sco3.2v5
    101 -		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
    102 +		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
    103  		;;
    104  	-sco4)
    105  		os=-sco3.2v4
    106 -		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
    107 +		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
    108  		;;
    109  	-sco3.2.[4-9]*)
    110  		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
    111 -		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
    112 +		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
    113  		;;
    114  	-sco3.2v[4-9]*)
    115  		# Don't forget version if it is 3.2v4 or newer.
    116 -		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
    117 +		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
    118  		;;
    119  	-sco5v6*)
    120  		# Don't forget version if it is 3.2v4 or newer.
    121 -		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
    122 +		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
    123  		;;
    124  	-sco*)
    125  		os=-sco3.2v2
    126 -		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
    127 +		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
    128  		;;
    129  	-udk*)
    130 -		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
    131 +		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
    132  		;;
    133  	-isc)
    134  		os=-isc2.2
    135 -		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
    136 +		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
    137  		;;
    138  	-clix*)
    139  		basic_machine=clipper-intergraph
    140  		;;
    141  	-isc*)
    142 -		basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
    143 +		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
    144  		;;
    145  	-lynx*178)
    146  		os=-lynxos178
    147 @@ -227,7 +227,10 @@
    148  		os=-lynxos
    149  		;;
    150  	-ptx*)
    151 -		basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'`
    152 +		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
    153 +		;;
    154 +	-windowsnt*)
    155 +		os=`echo $os | sed -e 's/windowsnt/winnt/'`
    156  		;;
    157  	-psos*)
    158  		os=-psos
    159 @@ -260,7 +263,7 @@
    160  	| fido | fr30 | frv | ft32 \
    161  	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
    162  	| hexagon \
    163 -	| i370 | i860 | i960 | ia16 | ia64 \
    164 +	| i370 | i860 | i960 | ia64 \
    165  	| ip2k | iq2000 \
    166  	| k1om \
    167  	| le32 | le64 \
    168 @@ -296,9 +299,8 @@
    169  	| nios | nios2 | nios2eb | nios2el \
    170  	| ns16k | ns32k \
    171  	| open8 | or1k | or1knd | or32 \
    172 -	| pdp10 | pj | pjl \
    173 +	| pdp10 | pdp11 | pj | pjl \
    174  	| powerpc | powerpc64 | powerpc64le | powerpcle \
    175 -	| pru \
    176  	| pyramid \
    177  	| riscv32 | riscv64 \
    178  	| rl78 | rx \
    179 @@ -312,7 +314,7 @@
    180  	| ubicom32 \
    181  	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
    182  	| visium \
    183 -	| wasm32 \
    184 +	| we32k \
    185  	| x86 | xc16x | xstormy16 | xtensa \
    186  	| z8k | z80)
    187  		basic_machine=$basic_machine-unknown
    188 @@ -333,7 +335,7 @@
    189  		basic_machine=$basic_machine-unknown
    190  		os=-none
    191  		;;
    192 -	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
    193 +	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
    194  		;;
    195  	ms1)
    196  		basic_machine=mt-unknown
    197 @@ -362,7 +364,7 @@
    198  	  ;;
    199  	# Object if more than one company name word.
    200  	*-*-*)
    201 -		echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
    202 +		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
    203  		exit 1
    204  		;;
    205  	# Recognize the basic CPU types with company name.
    206 @@ -385,7 +387,7 @@
    207  	| h8300-* | h8500-* \
    208  	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
    209  	| hexagon-* \
    210 -	| i*86-* | i860-* | i960-* | ia16-* | ia64-* \
    211 +	| i*86-* | i860-* | i960-* | ia64-* \
    212  	| ip2k-* | iq2000-* \
    213  	| k1om-* \
    214  	| le32-* | le64-* \
    215 @@ -426,7 +428,6 @@
    216  	| orion-* \
    217  	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
    218  	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
    219 -	| pru-* \
    220  	| pyramid-* \
    221  	| riscv32-* | riscv64-* \
    222  	| rl78-* | romp-* | rs6000-* | rx-* \
    223 @@ -443,7 +444,6 @@
    224  	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
    225  	| vax-* \
    226  	| visium-* \
    227 -	| wasm32-* \
    228  	| we32k-* \
    229  	| x86-* | x86_64-* | xc16x-* | xps100-* \
    230  	| xstormy16-* | xtensa*-* \
    231 @@ -457,7 +457,7 @@
    232  	# Recognize the various machine names and aliases which stand
    233  	# for a CPU type and a company and sometimes even an OS.
    234  	386bsd)
    235 -		basic_machine=i386-pc
    236 +		basic_machine=i386-unknown
    237  		os=-bsd
    238  		;;
    239  	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
    240 @@ -491,7 +491,7 @@
    241  		basic_machine=x86_64-pc
    242  		;;
    243  	amd64-*)
    244 -		basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
    245 +		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
    246  		;;
    247  	amdahl)
    248  		basic_machine=580-amdahl
    249 @@ -536,7 +536,7 @@
    250  		os=-linux
    251  		;;
    252  	blackfin-*)
    253 -		basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'`
    254 +		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
    255  		os=-linux
    256  		;;
    257  	bluegene*)
    258 @@ -544,13 +544,13 @@
    259  		os=-cnk
    260  		;;
    261  	c54x-*)
    262 -		basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
    263 +		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
    264  		;;
    265  	c55x-*)
    266 -		basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
    267 +		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
    268  		;;
    269  	c6x-*)
    270 -		basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
    271 +		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
    272  		;;
    273  	c90)
    274  		basic_machine=c90-cray
    275 @@ -639,18 +639,10 @@
    276  		basic_machine=rs6000-bull
    277  		os=-bosx
    278  		;;
    279 -	dpx2*)
    280 +	dpx2* | dpx2*-bull)
    281  		basic_machine=m68k-bull
    282  		os=-sysv3
    283  		;;
    284 -	e500v[12])
    285 -		basic_machine=powerpc-unknown
    286 -		os=$os"spe"
    287 -		;;
    288 -	e500v[12]-*)
    289 -		basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
    290 -		os=$os"spe"
    291 -		;;
    292  	ebmon29k)
    293  		basic_machine=a29k-amd
    294  		os=-ebmon
    295 @@ -740,6 +732,9 @@
    296  	hp9k8[0-9][0-9] | hp8[0-9][0-9])
    297  		basic_machine=hppa1.0-hp
    298  		;;
    299 +	hppa-next)
    300 +		os=-nextstep3
    301 +		;;
    302  	hppaosf)
    303  		basic_machine=hppa1.1-hp
    304  		os=-osf
    305 @@ -752,26 +747,26 @@
    306  		basic_machine=i370-ibm
    307  		;;
    308  	i*86v32)
    309 -		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
    310 +		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
    311  		os=-sysv32
    312  		;;
    313  	i*86v4*)
    314 -		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
    315 +		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
    316  		os=-sysv4
    317  		;;
    318  	i*86v)
    319 -		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
    320 +		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
    321  		os=-sysv
    322  		;;
    323  	i*86sol2)
    324 -		basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
    325 +		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
    326  		os=-solaris2
    327  		;;
    328  	i386mach)
    329  		basic_machine=i386-mach
    330  		os=-mach
    331  		;;
    332 -	vsta)
    333 +	i386-vsta | vsta)
    334  		basic_machine=i386-unknown
    335  		os=-vsta
    336  		;;
    337 @@ -790,16 +785,19 @@
    338  		os=-sysv
    339  		;;
    340  	leon-*|leon[3-9]-*)
    341 -		basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'`
    342 +		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
    343  		;;
    344  	m68knommu)
    345  		basic_machine=m68k-unknown
    346  		os=-linux
    347  		;;
    348  	m68knommu-*)
    349 -		basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'`
    350 +		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
    351  		os=-linux
    352  		;;
    353 +	m88k-omron*)
    354 +		basic_machine=m88k-omron
    355 +		;;
    356  	magnum | m3230)
    357  		basic_machine=mips-mips
    358  		os=-sysv
    359 @@ -831,10 +829,10 @@
    360  		os=-mint
    361  		;;
    362  	mips3*-*)
    363 -		basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`
    364 +		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
    365  		;;
    366  	mips3*)
    367 -		basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown
    368 +		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
    369  		;;
    370  	monitor)
    371  		basic_machine=m68k-rom68k
    372 @@ -853,7 +851,7 @@
    373  		os=-msdos
    374  		;;
    375  	ms1-*)
    376 -		basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'`
    377 +		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
    378  		;;
    379  	msys)
    380  		basic_machine=i686-pc
    381 @@ -895,7 +893,7 @@
    382  		basic_machine=v70-nec
    383  		os=-sysv
    384  		;;
    385 -	next | m*-next)
    386 +	next | m*-next )
    387  		basic_machine=m68k-next
    388  		case $os in
    389  		    -nextstep* )
    390 @@ -940,12 +938,6 @@
    391  	nsr-tandem)
    392  		basic_machine=nsr-tandem
    393  		;;
    394 -	nsv-tandem)
    395 -		basic_machine=nsv-tandem
    396 -		;;
    397 -	nsx-tandem)
    398 -		basic_machine=nsx-tandem
    399 -		;;
    400  	op50n-* | op60c-*)
    401  		basic_machine=hppa1.1-oki
    402  		os=-proelf
    403 @@ -978,7 +970,7 @@
    404  		os=-linux
    405  		;;
    406  	parisc-*)
    407 -		basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'`
    408 +		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
    409  		os=-linux
    410  		;;
    411  	pbd)
    412 @@ -994,7 +986,7 @@
    413  		basic_machine=i386-pc
    414  		;;
    415  	pc98-*)
    416 -		basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'`
    417 +		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
    418  		;;
    419  	pentium | p5 | k5 | k6 | nexgen | viac3)
    420  		basic_machine=i586-pc
    421 @@ -1009,16 +1001,16 @@
    422  		basic_machine=i786-pc
    423  		;;
    424  	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
    425 -		basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'`
    426 +		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
    427  		;;
    428  	pentiumpro-* | p6-* | 6x86-* | athlon-*)
    429 -		basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
    430 +		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
    431  		;;
    432  	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
    433 -		basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'`
    434 +		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
    435  		;;
    436  	pentium4-*)
    437 -		basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'`
    438 +		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
    439  		;;
    440  	pn)
    441  		basic_machine=pn-gould
    442 @@ -1028,23 +1020,23 @@
    443  	ppc | ppcbe)	basic_machine=powerpc-unknown
    444  		;;
    445  	ppc-* | ppcbe-*)
    446 -		basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
    447 +		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
    448  		;;
    449 -	ppcle | powerpclittle)
    450 +	ppcle | powerpclittle | ppc-le | powerpc-little)
    451  		basic_machine=powerpcle-unknown
    452  		;;
    453  	ppcle-* | powerpclittle-*)
    454 -		basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'`
    455 +		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
    456  		;;
    457  	ppc64)	basic_machine=powerpc64-unknown
    458  		;;
    459 -	ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
    460 +	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
    461  		;;
    462 -	ppc64le | powerpc64little)
    463 +	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
    464  		basic_machine=powerpc64le-unknown
    465  		;;
    466  	ppc64le-* | powerpc64little-*)
    467 -		basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'`
    468 +		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
    469  		;;
    470  	ps2)
    471  		basic_machine=i386-ibm
    472 @@ -1098,10 +1090,17 @@
    473  	sequent)
    474  		basic_machine=i386-sequent
    475  		;;
    476 +	sh)
    477 +		basic_machine=sh-hitachi
    478 +		os=-hms
    479 +		;;
    480  	sh5el)
    481  		basic_machine=sh5le-unknown
    482  		;;
    483 -	simso-wrs)
    484 +	sh64)
    485 +		basic_machine=sh64-unknown
    486 +		;;
    487 +	sparclite-wrs | simso-wrs)
    488  		basic_machine=sparclite-wrs
    489  		os=-vxworks
    490  		;;
    491 @@ -1120,7 +1119,7 @@
    492  		os=-sysv4
    493  		;;
    494  	strongarm-* | thumb-*)
    495 -		basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'`
    496 +		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
    497  		;;
    498  	sun2)
    499  		basic_machine=m68000-sun
    500 @@ -1242,9 +1241,6 @@
    501  		basic_machine=hppa1.1-winbond
    502  		os=-proelf
    503  		;;
    504 -	x64)
    505 -		basic_machine=x86_64-pc
    506 -		;;
    507  	xbox)
    508  		basic_machine=i686-pc
    509  		os=-mingw32
    510 @@ -1253,12 +1249,20 @@
    511  		basic_machine=xps100-honeywell
    512  		;;
    513  	xscale-* | xscalee[bl]-*)
    514 -		basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'`
    515 +		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
    516  		;;
    517  	ymp)
    518  		basic_machine=ymp-cray
    519  		os=-unicos
    520  		;;
    521 +	z8k-*-coff)
    522 +		basic_machine=z8k-unknown
    523 +		os=-sim
    524 +		;;
    525 +	z80-*-coff)
    526 +		basic_machine=z80-unknown
    527 +		os=-sim
    528 +		;;
    529  	none)
    530  		basic_machine=none-none
    531  		os=-none
    532 @@ -1287,6 +1291,10 @@
    533  	vax)
    534  		basic_machine=vax-dec
    535  		;;
    536 +	pdp10)
    537 +		# there are many clones, so DEC is not a safe bet
    538 +		basic_machine=pdp10-unknown
    539 +		;;
    540  	pdp11)
    541  		basic_machine=pdp11-dec
    542  		;;
    543 @@ -1296,6 +1304,9 @@
    544  	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
    545  		basic_machine=sh-unknown
    546  		;;
    547 +	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
    548 +		basic_machine=sparc-sun
    549 +		;;
    550  	cydra)
    551  		basic_machine=cydra-cydrome
    552  		;;
    553 @@ -1315,7 +1326,7 @@
    554  		# Make sure to match an already-canonicalized machine name.
    555  		;;
    556  	*)
    557 -		echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
    558 +		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
    559  		exit 1
    560  		;;
    561  esac
    562 @@ -1323,10 +1334,10 @@
    563  # Here we canonicalize certain aliases for manufacturers.
    564  case $basic_machine in
    565  	*-digital*)
    566 -		basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'`
    567 +		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
    568  		;;
    569  	*-commodore*)
    570 -		basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'`
    571 +		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
    572  		;;
    573  	*)
    574  		;;
    575 @@ -1337,8 +1348,8 @@
    576  if [ x"$os" != x"" ]
    577  then
    578  case $os in
    579 -	# First match some system type aliases that might get confused
    580 -	# with valid system types.
    581 +	# First match some system type aliases
    582 +	# that might get confused with valid system types.
    583  	# -solaris* is a basic system type, with this one exception.
    584  	-auroraux)
    585  		os=-auroraux
    586 @@ -1349,19 +1360,18 @@
    587  	-solaris)
    588  		os=-solaris2
    589  		;;
    590 +	-svr4*)
    591 +		os=-sysv4
    592 +		;;
    593  	-unixware*)
    594  		os=-sysv4.2uw
    595  		;;
    596  	-gnu/linux*)
    597  		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
    598  		;;
    599 -	# es1800 is here to avoid being matched by es* (a different OS)
    600 -	-es1800*)
    601 -		os=-ose
    602 -		;;
    603 -	# Now accept the basic system types.
    604 +	# First accept the basic system types.
    605  	# The portable systems comes first.
    606 -	# Each alternative MUST end in a * to match a version number.
    607 +	# Each alternative MUST END IN A *, to match a version number.
    608  	# -sysv* is not here because it comes later, after sysvr4.
    609  	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
    610  	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
    611 @@ -1371,26 +1381,25 @@
    612  	      | -aos* | -aros* | -cloudabi* | -sortix* \
    613  	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
    614  	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
    615 -	      | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \
    616 +	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
    617  	      | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
    618  	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
    619  	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
    620  	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
    621  	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
    622 -	      | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
    623 +	      | -chorusos* | -chorusrdb* | -cegcc* \
    624  	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
    625 -	      | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
    626 +	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
    627  	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
    628  	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
    629 -	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \
    630 +	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
    631  	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
    632  	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
    633  	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
    634 -	      | -morphos* | -superux* | -rtmk* | -windiss* \
    635 +	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
    636  	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
    637  	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
    638 -	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \
    639 -	      | -midnightbsd*)
    640 +	      | -onefs* | -tirtos*)
    641  	# Remember, each alternative MUST END IN *, to match a version number.
    642  		;;
    643  	-qnx*)
    644 @@ -1407,12 +1416,12 @@
    645  	-nto*)
    646  		os=`echo $os | sed -e 's|nto|nto-qnx|'`
    647  		;;
    648 -	-sim | -xray | -os68k* | -v88r* \
    649 -	      | -windows* | -osx | -abug | -netware* | -os9* \
    650 +	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
    651 +	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
    652  	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
    653  		;;
    654  	-mac*)
    655 -		os=`echo "$os" | sed -e 's|mac|macos|'`
    656 +		os=`echo $os | sed -e 's|mac|macos|'`
    657  		;;
    658  	-linux-dietlibc)
    659  		os=-linux-dietlibc
    660 @@ -1421,10 +1430,10 @@
    661  		os=`echo $os | sed -e 's|linux|linux-gnu|'`
    662  		;;
    663  	-sunos5*)
    664 -		os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
    665 +		os=`echo $os | sed -e 's|sunos5|solaris2|'`
    666  		;;
    667  	-sunos6*)
    668 -		os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
    669 +		os=`echo $os | sed -e 's|sunos6|solaris3|'`
    670  		;;
    671  	-opened*)
    672  		os=-openedition
    673 @@ -1435,6 +1444,12 @@
    674  	-wince*)
    675  		os=-wince
    676  		;;
    677 +	-osfrose*)
    678 +		os=-osfrose
    679 +		;;
    680 +	-osf*)
    681 +		os=-osf
    682 +		;;
    683  	-utek*)
    684  		os=-bsd
    685  		;;
    686 @@ -1459,7 +1474,7 @@
    687  	-nova*)
    688  		os=-rtmk-nova
    689  		;;
    690 -	-ns2)
    691 +	-ns2 )
    692  		os=-nextstep2
    693  		;;
    694  	-nsk*)
    695 @@ -1481,7 +1496,7 @@
    696  	-oss*)
    697  		os=-sysv3
    698  		;;
    699 -	-svr4*)
    700 +	-svr4)
    701  		os=-sysv4
    702  		;;
    703  	-svr3)
    704 @@ -1496,28 +1511,24 @@
    705  	-ose*)
    706  		os=-ose
    707  		;;
    708 +	-es1800*)
    709 +		os=-ose
    710 +		;;
    711 +	-xenix)
    712 +		os=-xenix
    713 +		;;
    714  	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
    715  		os=-mint
    716  		;;
    717 +	-aros*)
    718 +		os=-aros
    719 +		;;
    720  	-zvmoe)
    721  		os=-zvmoe
    722  		;;
    723  	-dicos*)
    724  		os=-dicos
    725  		;;
    726 -	-pikeos*)
    727 -		# Until real need of OS specific support for
    728 -		# particular features comes up, bare metal
    729 -		# configurations are quite functional.
    730 -		case $basic_machine in
    731 -		    arm*)
    732 -			os=-eabi
    733 -			;;
    734 -		    *)
    735 -			os=-elf
    736 -			;;
    737 -		esac
    738 -		;;
    739  	-nacl*)
    740  		;;
    741  	-ios)
    742 @@ -1527,7 +1538,7 @@
    743  	*)
    744  		# Get rid of the `-' at the beginning of $os.
    745  		os=`echo $os | sed 's/[^-]*-//'`
    746 -		echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2
    747 +		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
    748  		exit 1
    749  		;;
    750  esac
    751 @@ -1617,12 +1628,12 @@
    752  	sparc-* | *-sun)
    753  		os=-sunos4.1.1
    754  		;;
    755 -	pru-*)
    756 -		os=-elf
    757 -		;;
    758  	*-be)
    759  		os=-beos
    760  		;;
    761 +	*-haiku)
    762 +		os=-haiku
    763 +		;;
    764  	*-ibm)
    765  		os=-aix
    766  		;;
    767 @@ -1662,7 +1673,7 @@
    768  	m88k-omron*)
    769  		os=-luna
    770  		;;
    771 -	*-next)
    772 +	*-next )
    773  		os=-nextstep
    774  		;;
    775  	*-sequent)
    776 @@ -1677,6 +1688,9 @@
    777  	i370-*)
    778  		os=-mvs
    779  		;;
    780 +	*-next)
    781 +		os=-nextstep3
    782 +		;;
    783  	*-gould)
    784  		os=-sysv
    785  		;;
    786 @@ -1786,15 +1800,15 @@
    787  				vendor=stratus
    788  				;;
    789  		esac
    790 -		basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"`
    791 +		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
    792  		;;
    793  esac
    794  
    795 -echo "$basic_machine$os"
    796 +echo $basic_machine$os
    797  exit
    798  
    799  # Local variables:
    800 -# eval: (add-hook 'write-file-functions 'time-stamp)
    801 +# eval: (add-hook 'write-file-hooks 'time-stamp)
    802  # time-stamp-start: "timestamp='"
    803  # time-stamp-format: "%:y-%02m-%02d"
    804  # time-stamp-end: "'"