aboutsummaryrefslogtreecommitdiffstats
path: root/build-aux
diff options
context:
space:
mode:
authorPaul Eggert2018-05-21 11:42:18 -0700
committerPaul Eggert2018-05-21 11:43:07 -0700
commit79f15092b9d16631840cd42db034b787fae762ac (patch)
tree86f3e4917944af36516547d4d19d5dda758684f1 /build-aux
parentf21db9e1206f830ee5e991a26f9e30056f68efb8 (diff)
downloademacs-79f15092b9d16631840cd42db034b787fae762ac.tar.gz
emacs-79f15092b9d16631840cd42db034b787fae762ac.zip
Update from Gnulib
This incorporates: 2018-05-21 crypto: omit stream ops Emacs doesn’t need 2018-05-13 truncate: Fix compilation error on Android 2018-05-13 imaxdiv: Fix compilation error on Android 2018-05-13 Support selective inclusion of recent mingw.org headers 2018-05-13 Add cross-compilation guesses for Linux systems sans glibc 2018-05-13 stdioext: Fix compilation errors with newer Android headers 2018-05-07 af_alg: Pacify --enable-gcc-warnings 2018-05-06 af_alg: Fix bug with streams that are not at position 0 2018-05-06 Followup to 'af_alg: New module' 2018-05-05 crypto/{md5,sha1,sha256,sha512}: simplify 2018-05-05 af_alg: New module 2018-05-05 af_alg: Improve function signature 2018-04-28 md5sum: Use AF_ALG when available 2018-04-28 sha512sum: Use AF_ALG when available 2018-04-28 sha256sum: Use AF_ALG when available 2018-04-28 sha1sum: Use AF_ALG when available 2018-05-05 all: Replace more http URLs by https URLs 2018-05-03 maint: port more modules to GCC 8 2018-05-03 Simplify code; drop support for Borland C++ on Windows * admin/merge-gnulib (GNULIB_MODULES): Use crypto/md5-buffer rather than crypto/md5, since Emacs doesn’t use the stream operations that in recent Gnulib pull in other stuff Emacs doesn’t need. Similarly for crypto/sha1-buffer, crypto/sha256-buffer, crypto/sha512-buffer. * build-aux/config.guess, build-aux/config.sub, lib/dosname.h: * lib/dup2.c, lib/errno.in.h, lib/euidaccess.c, lib/fcntl.c: * lib/fcntl.in.h, lib/fpending.c, lib/fsync.c, lib/getdtablesize.c: * lib/getopt.c, lib/gettimeofday.c, lib/inttypes.in.h, lib/md5.c: * lib/md5.h, lib/open.c, lib/pipe2.c, lib/putenv.c, lib/sha1.c: * lib/sha1.h, lib/sha256.c, lib/sha256.h, lib/sha512.c: * lib/sha512.h, lib/stat-time.h, lib/stdio-impl.h, lib/stdio.in.h: * lib/stdlib.in.h, lib/sys_stat.in.h, lib/sys_types.in.h: * lib/timespec.h, lib/unistd.in.h, lib/utimens.c, m4/c-strtod.m4: * m4/gnulib-common.m4, m4/inttypes.m4, m4/lstat.m4, m4/nocrash.m4: * m4/pselect.m4, m4/readlink.m4, m4/stdio_h.m4, m4/symlink.m4: * m4/unistd_h.m4, m4/utimens.m4: Copy from Gnulib. * lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate.
Diffstat (limited to 'build-aux')
-rwxr-xr-xbuild-aux/config.guess6
-rwxr-xr-xbuild-aux/config.sub1402
2 files changed, 719 insertions, 689 deletions
diff --git a/build-aux/config.guess b/build-aux/config.guess
index 256083a70d3..883a6713bf0 100755
--- a/build-aux/config.guess
+++ b/build-aux/config.guess
@@ -2,7 +2,7 @@
2# Attempt to guess a canonical system name. 2# Attempt to guess a canonical system name.
3# Copyright 1992-2018 Free Software Foundation, Inc. 3# Copyright 1992-2018 Free Software Foundation, Inc.
4 4
5timestamp='2018-03-08' 5timestamp='2018-05-19'
6 6
7# This file is free software; you can redistribute it and/or modify it 7# This file is free software; you can redistribute it and/or modify it
8# under the terms of the GNU General Public License as published by 8# under the terms of the GNU General Public License as published by
@@ -106,7 +106,7 @@ trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
106 { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; 106 { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
107dummy=$tmp/dummy ; 107dummy=$tmp/dummy ;
108tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; 108tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
109case $CC_FOR_BUILD,$HOST_CC,$CC in 109case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in
110 ,,) echo "int x;" > "$dummy.c" ; 110 ,,) echo "int x;" > "$dummy.c" ;
111 for c in cc gcc c89 c99 ; do 111 for c in cc gcc c89 c99 ; do
112 if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then 112 if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
@@ -237,7 +237,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
237 # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: 237 # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
238 # contains redundant information, the shorter form: 238 # contains redundant information, the shorter form:
239 # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. 239 # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
240 echo "$machine-${os}${release}${abi}" 240 echo "$machine-${os}${release}${abi-}"
241 exit ;; 241 exit ;;
242 *:Bitrig:*:*) 242 *:Bitrig:*:*)
243 UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` 243 UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
diff --git a/build-aux/config.sub b/build-aux/config.sub
index ba37cf99e26..f38250f1daa 100755
--- a/build-aux/config.sub
+++ b/build-aux/config.sub
@@ -2,7 +2,7 @@
2# Configuration validation subroutine script. 2# Configuration validation subroutine script.
3# Copyright 1992-2018 Free Software Foundation, Inc. 3# Copyright 1992-2018 Free Software Foundation, Inc.
4 4
5timestamp='2018-04-24' 5timestamp='2018-05-19'
6 6
7# This file is free software; you can redistribute it and/or modify it 7# This file is free software; you can redistribute it and/or modify it
8# under the terms of the GNU General Public License as published by 8# under the terms of the GNU General Public License as published by
@@ -110,28 +110,434 @@ case $# in
110 exit 1;; 110 exit 1;;
111esac 111esac
112 112
113# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). 113# Split fields of configuration type
114# Here we must recognize all the valid KERNEL-OS combinations. 114IFS="-" read -r field1 field2 field3 field4 <<EOF
115maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` 115$1
116case $maybe_os in 116EOF
117 nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ 117
118 linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ 118# Separate into logical components for further validation
119 knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ 119case $1 in
120 kopensolaris*-gnu* | cloudabi*-eabi* | \ 120 *-*-*-*-*)
121 storm-chaos* | os2-emx* | rtmk-nova*) 121 echo Invalid configuration \`"$1"\': more than four components >&2
122 os=-$maybe_os 122 exit 1
123 basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` 123 ;;
124 ;; 124 *-*-*-*)
125 android-linux) 125 basic_machine=$field1-$field2
126 os=-linux-android 126 os=$field3-$field4
127 basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown 127 ;;
128 ;; 128 *-*-*)
129 *) 129 # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two
130 basic_machine=`echo "$1" | sed 's/-[^-]*$//'` 130 # parts
131 if [ "$basic_machine" != "$1" ] 131 maybe_os=$field2-$field3
132 then os=`echo "$1" | sed 's/.*-/-/'` 132 case $maybe_os in
133 else os=; fi 133 nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc \
134 ;; 134 | linux-newlib* | linux-musl* | linux-uclibc* | uclinux-uclibc* \
135 | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
136 | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
137 | storm-chaos* | os2-emx* | rtmk-nova*)
138 basic_machine=$field1
139 os=$maybe_os
140 ;;
141 android-linux)
142 basic_machine=$field1-unknown
143 os=linux-android
144 ;;
145 *)
146 basic_machine=$field1-$field2
147 os=$field3
148 ;;
149 esac
150 ;;
151 *-*)
152 basic_machine=$field1
153 os=$field2
154 ;;
155 *)
156 # Convert single-component short-hands not valid as part of
157 # multi-component configurations.
158 case $field1 in
159 386bsd)
160 basic_machine=i386-pc
161 os=bsd
162 ;;
163 a29khif)
164 basic_machine=a29k-amd
165 os=udi
166 ;;
167 adobe68k)
168 basic_machine=m68010-adobe
169 os=scout
170 ;;
171 am29k)
172 basic_machine=a29k-none
173 os=bsd
174 ;;
175 amdahl)
176 basic_machine=580-amdahl
177 os=sysv
178 ;;
179 amigaos | amigados)
180 basic_machine=m68k-unknown
181 os=amigaos
182 ;;
183 amigaunix | amix)
184 basic_machine=m68k-unknown
185 os=sysv4
186 ;;
187 apollo68)
188 basic_machine=m68k-apollo
189 os=sysv
190 ;;
191 apollo68bsd)
192 basic_machine=m68k-apollo
193 os=bsd
194 ;;
195 aros)
196 basic_machine=i386-pc
197 os=aros
198 ;;
199 aux)
200 basic_machine=m68k-apple
201 os=aux
202 ;;
203 balance)
204 basic_machine=ns32k-sequent
205 os=dynix
206 ;;
207 blackfin)
208 basic_machine=bfin-unknown
209 os=linux
210 ;;
211 cegcc)
212 basic_machine=arm-unknown
213 os=cegcc
214 ;;
215 cray)
216 basic_machine=j90-cray
217 os=unicos
218 ;;
219 craynv)
220 basic_machine=craynv-cray
221 os=unicosmp
222 ;;
223 delta88)
224 basic_machine=m88k-motorola
225 os=sysv3
226 ;;
227 dicos)
228 basic_machine=i686-pc
229 os=dicos
230 ;;
231 djgpp)
232 basic_machine=i586-pc
233 os=msdosdjgpp
234 ;;
235 ebmon29k)
236 basic_machine=a29k-amd
237 os=ebmon
238 ;;
239 es1800 | OSE68k | ose68k | ose | OSE)
240 basic_machine=m68k-ericsson
241 os=ose
242 ;;
243 gmicro)
244 basic_machine=tron-gmicro
245 os=sysv
246 ;;
247 go32)
248 basic_machine=i386-pc
249 os=go32
250 ;;
251 h8300hms)
252 basic_machine=h8300-hitachi
253 os=hms
254 ;;
255 h8300xray)
256 basic_machine=h8300-hitachi
257 os=xray
258 ;;
259 h8500hms)
260 basic_machine=h8500-hitachi
261 os=hms
262 ;;
263 harris)
264 basic_machine=m88k-harris
265 os=sysv3
266 ;;
267 hp300bsd)
268 basic_machine=m68k-hp
269 os=bsd
270 ;;
271 hp300hpux)
272 basic_machine=m68k-hp
273 os=hpux
274 ;;
275 hppaosf)
276 basic_machine=hppa1.1-hp
277 os=osf
278 ;;
279 hppro)
280 basic_machine=hppa1.1-hp
281 os=proelf
282 ;;
283 i386mach)
284 basic_machine=i386-mach
285 os=mach
286 ;;
287 vsta)
288 basic_machine=i386-unknown
289 os=vsta
290 ;;
291 isi68 | isi)
292 basic_machine=m68k-isi
293 os=sysv
294 ;;
295 m68knommu)
296 basic_machine=m68k-unknown
297 os=linux
298 ;;
299 magnum | m3230)
300 basic_machine=mips-mips
301 os=sysv
302 ;;
303 merlin)
304 basic_machine=ns32k-utek
305 os=sysv
306 ;;
307 mingw64)
308 basic_machine=x86_64-pc
309 os=mingw64
310 ;;
311 mingw32)
312 basic_machine=i686-pc
313 os=mingw32
314 ;;
315 mingw32ce)
316 basic_machine=arm-unknown
317 os=mingw32ce
318 ;;
319 monitor)
320 basic_machine=m68k-rom68k
321 os=coff
322 ;;
323 morphos)
324 basic_machine=powerpc-unknown
325 os=morphos
326 ;;
327 moxiebox)
328 basic_machine=moxie-unknown
329 os=moxiebox
330 ;;
331 msdos)
332 basic_machine=i386-pc
333 os=msdos
334 ;;
335 msys)
336 basic_machine=i686-pc
337 os=msys
338 ;;
339 mvs)
340 basic_machine=i370-ibm
341 os=mvs
342 ;;
343 nacl)
344 basic_machine=le32-unknown
345 os=nacl
346 ;;
347 ncr3000)
348 basic_machine=i486-ncr
349 os=sysv4
350 ;;
351 netbsd386)
352 basic_machine=i386-unknown
353 os=netbsd
354 ;;
355 netwinder)
356 basic_machine=armv4l-rebel
357 os=linux
358 ;;
359 news | news700 | news800 | news900)
360 basic_machine=m68k-sony
361 os=newsos
362 ;;
363 news1000)
364 basic_machine=m68030-sony
365 os=newsos
366 ;;
367 necv70)
368 basic_machine=v70-nec
369 os=sysv
370 ;;
371 nh3000)
372 basic_machine=m68k-harris
373 os=cxux
374 ;;
375 nh[45]000)
376 basic_machine=m88k-harris
377 os=cxux
378 ;;
379 nindy960)
380 basic_machine=i960-intel
381 os=nindy
382 ;;
383 mon960)
384 basic_machine=i960-intel
385 os=mon960
386 ;;
387 nonstopux)
388 basic_machine=mips-compaq
389 os=nonstopux
390 ;;
391 os400)
392 basic_machine=powerpc-ibm
393 os=os400
394 ;;
395 OSE68000 | ose68000)
396 basic_machine=m68000-ericsson
397 os=ose
398 ;;
399 os68k)
400 basic_machine=m68k-none
401 os=os68k
402 ;;
403 paragon)
404 basic_machine=i860-intel
405 os=osf
406 ;;
407 parisc)
408 basic_machine=hppa-unknown
409 os=linux
410 ;;
411 pw32)
412 basic_machine=i586-unknown
413 os=pw32
414 ;;
415 rdos | rdos64)
416 basic_machine=x86_64-pc
417 os=rdos
418 ;;
419 rdos32)
420 basic_machine=i386-pc
421 os=rdos
422 ;;
423 rom68k)
424 basic_machine=m68k-rom68k
425 os=coff
426 ;;
427 sa29200)
428 basic_machine=a29k-amd
429 os=udi
430 ;;
431 sei)
432 basic_machine=mips-sei
433 os=seiux
434 ;;
435 sps7)
436 basic_machine=m68k-bull
437 os=sysv2
438 ;;
439 stratus)
440 basic_machine=i860-stratus
441 os=sysv4
442 ;;
443 sun2os3)
444 basic_machine=m68000-sun
445 os=sunos3
446 ;;
447 sun2os4)
448 basic_machine=m68000-sun
449 os=sunos4
450 ;;
451 sun3os3)
452 basic_machine=m68k-sun
453 os=sunos3
454 ;;
455 sun3os4)
456 basic_machine=m68k-sun
457 os=sunos4
458 ;;
459 sun4os3)
460 basic_machine=sparc-sun
461 os=sunos3
462 ;;
463 sun4os4)
464 basic_machine=sparc-sun
465 os=sunos4
466 ;;
467 sun4sol2)
468 basic_machine=sparc-sun
469 os=solaris2
470 ;;
471 sv1)
472 basic_machine=sv1-cray
473 os=unicos
474 ;;
475 symmetry)
476 basic_machine=i386-sequent
477 os=dynix
478 ;;
479 t3e)
480 basic_machine=alphaev5-cray
481 os=unicos
482 ;;
483 t90)
484 basic_machine=t90-cray
485 os=unicos
486 ;;
487 toad1)
488 basic_machine=pdp10-xkl
489 os=tops20
490 ;;
491 tpf)
492 basic_machine=s390x-ibm
493 os=tpf
494 ;;
495 udi29k)
496 basic_machine=a29k-amd
497 os=udi
498 ;;
499 ultra3)
500 basic_machine=a29k-nyu
501 os=sym1
502 ;;
503 v810 | necv810)
504 basic_machine=v810-nec
505 os=none
506 ;;
507 vaxv)
508 basic_machine=vax-dec
509 os=sysv
510 ;;
511 vms)
512 basic_machine=vax-dec
513 os=vms
514 ;;
515 vxworks960)
516 basic_machine=i960-wrs
517 os=vxworks
518 ;;
519 vxworks68)
520 basic_machine=m68k-wrs
521 os=vxworks
522 ;;
523 vxworks29k)
524 basic_machine=a29k-wrs
525 os=vxworks
526 ;;
527 xbox)
528 basic_machine=i686-pc
529 os=mingw32
530 ;;
531 ymp)
532 basic_machine=ymp-cray
533 os=unicos
534 ;;
535 *)
536 basic_machine=$1
537 os=
538 ;;
539 esac
540 ;;
135esac 541esac
136 542
137### Let's recognize common machines as not being operating systems so 543### Let's recognize common machines as not being operating systems so
@@ -139,102 +545,102 @@ esac
139### recognize some manufacturers as not being operating systems, so we 545### recognize some manufacturers as not being operating systems, so we
140### can provide default operating systems below. 546### can provide default operating systems below.
141case $os in 547case $os in
142 -sun*os*) 548 sun*os*)
143 # Prevent following clause from handling this invalid input. 549 # Prevent following clause from handling this invalid input.
144 ;; 550 ;;
145 -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ 551 dec* | mips* | sequent* | encore* | pc532* | sgi* | sony* | \
146 -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ 552 att* | 7300* | 3300* | delta* | motorola* | sun[234]* | \
147 -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ 553 unicom* | ibm* | next | hp | isi* | apollo | altos* | \
148 -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ 554 convergent* | ncr* | news | 32* | 3600* | 3100* | hitachi* |\
149 -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ 555 c[123]* | convex* | sun | crds | omron* | dg | ultra | tti* | \
150 -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ 556 harris | dolphin | highlevel | gould | cbm | ns | masscomp | \
151 -apple | -axis | -knuth | -cray | -microblaze*) 557 apple | axis | knuth | cray | microblaze*)
152 os= 558 os=
153 basic_machine=$1 559 basic_machine=$1
154 ;; 560 ;;
155 -bluegene*) 561 bluegene*)
156 os=-cnk 562 os=cnk
157 ;; 563 ;;
158 -sim | -cisco | -oki | -wec | -winbond) 564 sim | cisco | oki | wec | winbond)
159 os= 565 os=
160 basic_machine=$1 566 basic_machine=$1
161 ;; 567 ;;
162 -scout) 568 scout)
163 ;; 569 ;;
164 -wrs) 570 wrs)
165 os=-vxworks 571 os=vxworks
166 basic_machine=$1 572 basic_machine=$1
167 ;; 573 ;;
168 -chorusos*) 574 chorusos*)
169 os=-chorusos 575 os=chorusos
170 basic_machine=$1 576 basic_machine=$1
171 ;; 577 ;;
172 -chorusrdb) 578 chorusrdb)
173 os=-chorusrdb 579 os=chorusrdb
174 basic_machine=$1 580 basic_machine=$1
175 ;; 581 ;;
176 -hiux*) 582 hiux*)
177 os=-hiuxwe2 583 os=hiuxwe2
178 ;; 584 ;;
179 -sco6) 585 sco6)
180 os=-sco5v6 586 os=sco5v6
181 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` 587 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
182 ;; 588 ;;
183 -sco5) 589 sco5)
184 os=-sco3.2v5 590 os=sco3.2v5
185 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` 591 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
186 ;; 592 ;;
187 -sco4) 593 sco4)
188 os=-sco3.2v4 594 os=sco3.2v4
189 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` 595 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
190 ;; 596 ;;
191 -sco3.2.[4-9]*) 597 sco3.2.[4-9]*)
192 os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` 598 os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
193 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` 599 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
194 ;; 600 ;;
195 -sco3.2v[4-9]*) 601 sco3.2v[4-9]*)
196 # Don't forget version if it is 3.2v4 or newer. 602 # Don't forget version if it is 3.2v4 or newer.
197 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` 603 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
198 ;; 604 ;;
199 -sco5v6*) 605 sco5v6*)
200 # Don't forget version if it is 3.2v4 or newer. 606 # Don't forget version if it is 3.2v4 or newer.
201 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` 607 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
202 ;; 608 ;;
203 -sco*) 609 sco*)
204 os=-sco3.2v2 610 os=sco3.2v2
205 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` 611 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
206 ;; 612 ;;
207 -udk*) 613 udk*)
208 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` 614 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
209 ;; 615 ;;
210 -isc) 616 isc)
211 os=-isc2.2 617 os=isc2.2
212 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` 618 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
213 ;; 619 ;;
214 -clix*) 620 clix*)
215 basic_machine=clipper-intergraph 621 basic_machine=clipper-intergraph
216 ;; 622 ;;
217 -isc*) 623 isc*)
218 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` 624 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'`
219 ;; 625 ;;
220 -lynx*178) 626 lynx*178)
221 os=-lynxos178 627 os=lynxos178
222 ;; 628 ;;
223 -lynx*5) 629 lynx*5)
224 os=-lynxos5 630 os=lynxos5
225 ;; 631 ;;
226 -lynx*) 632 lynx*)
227 os=-lynxos 633 os=lynxos
228 ;; 634 ;;
229 -ptx*) 635 ptx*)
230 basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'` 636 basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'`
231 ;; 637 ;;
232 -psos*) 638 psos*)
233 os=-psos 639 os=psos
234 ;; 640 ;;
235 -mint | -mint[0-9]*) 641 mint | mint[0-9]*)
236 basic_machine=m68k-atari 642 basic_machine=m68k-atari
237 os=-mint 643 os=mint
238 ;; 644 ;;
239esac 645esac
240 646
@@ -293,6 +699,7 @@ case $basic_machine in
293 | mt \ 699 | mt \
294 | msp430 \ 700 | msp430 \
295 | nds32 | nds32le | nds32be \ 701 | nds32 | nds32le | nds32be \
702 | nfp \
296 | nios | nios2 | nios2eb | nios2el \ 703 | nios | nios2 | nios2eb | nios2el \
297 | ns16k | ns32k \ 704 | ns16k | ns32k \
298 | open8 | or1k | or1knd | or32 \ 705 | open8 | or1k | or1knd | or32 \
@@ -331,24 +738,23 @@ case $basic_machine in
331 ;; 738 ;;
332 m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) 739 m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
333 basic_machine=$basic_machine-unknown 740 basic_machine=$basic_machine-unknown
334 os=-none 741 os=${os:-none}
335 ;; 742 ;;
336 m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65) 743 m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
337 ;; 744 ;;
338 m9s12z | m68hcs12z | hcs12z | s12z) 745 m9s12z | m68hcs12z | hcs12z | s12z)
339 basic_machine=s12z-unknown 746 basic_machine=s12z-unknown
340 os=-none 747 os=${os:-none}
341 ;; 748 ;;
342 ms1) 749 ms1)
343 basic_machine=mt-unknown 750 basic_machine=mt-unknown
344 ;; 751 ;;
345
346 strongarm | thumb | xscale) 752 strongarm | thumb | xscale)
347 basic_machine=arm-unknown 753 basic_machine=arm-unknown
348 ;; 754 ;;
349 xgate) 755 xgate)
350 basic_machine=$basic_machine-unknown 756 basic_machine=$basic_machine-unknown
351 os=-none 757 os=${os:-none}
352 ;; 758 ;;
353 xscaleeb) 759 xscaleeb)
354 basic_machine=armeb-unknown 760 basic_machine=armeb-unknown
@@ -364,11 +770,6 @@ case $basic_machine in
364 i*86 | x86_64) 770 i*86 | x86_64)
365 basic_machine=$basic_machine-pc 771 basic_machine=$basic_machine-pc
366 ;; 772 ;;
367 # Object if more than one company name word.
368 *-*-*)
369 echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
370 exit 1
371 ;;
372 # Recognize the basic CPU types with company name. 773 # Recognize the basic CPU types with company name.
373 580-* \ 774 580-* \
374 | a29k-* \ 775 | a29k-* \
@@ -423,6 +824,7 @@ case $basic_machine in
423 | mt-* \ 824 | mt-* \
424 | msp430-* \ 825 | msp430-* \
425 | nds32-* | nds32le-* | nds32be-* \ 826 | nds32-* | nds32le-* | nds32be-* \
827 | nfp-* \
426 | nios-* | nios2-* | nios2eb-* | nios2el-* \ 828 | nios-* | nios2-* | nios2eb-* | nios2el-* \
427 | none-* | np1-* | ns16k-* | ns32k-* \ 829 | none-* | np1-* | ns16k-* | ns32k-* \
428 | open8-* \ 830 | open8-* \
@@ -460,92 +862,40 @@ case $basic_machine in
460 ;; 862 ;;
461 # Recognize the various machine names and aliases which stand 863 # Recognize the various machine names and aliases which stand
462 # for a CPU type and a company and sometimes even an OS. 864 # for a CPU type and a company and sometimes even an OS.
463 386bsd)
464 basic_machine=i386-pc
465 os=-bsd
466 ;;
467 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) 865 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
468 basic_machine=m68000-att 866 basic_machine=m68000-att
469 ;; 867 ;;
470 3b*) 868 3b*)
471 basic_machine=we32k-att 869 basic_machine=we32k-att
472 ;; 870 ;;
473 a29khif)
474 basic_machine=a29k-amd
475 os=-udi
476 ;;
477 abacus) 871 abacus)
478 basic_machine=abacus-unknown 872 basic_machine=abacus-unknown
479 ;; 873 ;;
480 adobe68k)
481 basic_machine=m68010-adobe
482 os=-scout
483 ;;
484 alliant | fx80) 874 alliant | fx80)
485 basic_machine=fx80-alliant 875 basic_machine=fx80-alliant
486 ;; 876 ;;
487 altos | altos3068) 877 altos | altos3068)
488 basic_machine=m68k-altos 878 basic_machine=m68k-altos
489 ;; 879 ;;
490 am29k)
491 basic_machine=a29k-none
492 os=-bsd
493 ;;
494 amd64) 880 amd64)
495 basic_machine=x86_64-pc 881 basic_machine=x86_64-pc
496 ;; 882 ;;
497 amd64-*) 883 amd64-*)
498 basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'` 884 basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
499 ;; 885 ;;
500 amdahl)
501 basic_machine=580-amdahl
502 os=-sysv
503 ;;
504 amiga | amiga-*) 886 amiga | amiga-*)
505 basic_machine=m68k-unknown 887 basic_machine=m68k-unknown
506 ;; 888 ;;
507 amigaos | amigados)
508 basic_machine=m68k-unknown
509 os=-amigaos
510 ;;
511 amigaunix | amix)
512 basic_machine=m68k-unknown
513 os=-sysv4
514 ;;
515 apollo68)
516 basic_machine=m68k-apollo
517 os=-sysv
518 ;;
519 apollo68bsd)
520 basic_machine=m68k-apollo
521 os=-bsd
522 ;;
523 aros)
524 basic_machine=i386-pc
525 os=-aros
526 ;;
527 asmjs) 889 asmjs)
528 basic_machine=asmjs-unknown 890 basic_machine=asmjs-unknown
529 ;; 891 ;;
530 aux)
531 basic_machine=m68k-apple
532 os=-aux
533 ;;
534 balance)
535 basic_machine=ns32k-sequent
536 os=-dynix
537 ;;
538 blackfin)
539 basic_machine=bfin-unknown
540 os=-linux
541 ;;
542 blackfin-*) 892 blackfin-*)
543 basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'` 893 basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'`
544 os=-linux 894 os=linux
545 ;; 895 ;;
546 bluegene*) 896 bluegene*)
547 basic_machine=powerpc-ibm 897 basic_machine=powerpc-ibm
548 os=-cnk 898 os=cnk
549 ;; 899 ;;
550 c54x-*) 900 c54x-*)
551 basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'` 901 basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'`
@@ -558,43 +908,31 @@ case $basic_machine in
558 ;; 908 ;;
559 c90) 909 c90)
560 basic_machine=c90-cray 910 basic_machine=c90-cray
561 os=-unicos 911 os=${os:-unicos}
562 ;;
563 cegcc)
564 basic_machine=arm-unknown
565 os=-cegcc
566 ;; 912 ;;
567 convex-c1) 913 convex-c1)
568 basic_machine=c1-convex 914 basic_machine=c1-convex
569 os=-bsd 915 os=bsd
570 ;; 916 ;;
571 convex-c2) 917 convex-c2)
572 basic_machine=c2-convex 918 basic_machine=c2-convex
573 os=-bsd 919 os=bsd
574 ;; 920 ;;
575 convex-c32) 921 convex-c32)
576 basic_machine=c32-convex 922 basic_machine=c32-convex
577 os=-bsd 923 os=bsd
578 ;; 924 ;;
579 convex-c34) 925 convex-c34)
580 basic_machine=c34-convex 926 basic_machine=c34-convex
581 os=-bsd 927 os=bsd
582 ;; 928 ;;
583 convex-c38) 929 convex-c38)
584 basic_machine=c38-convex 930 basic_machine=c38-convex
585 os=-bsd 931 os=bsd
586 ;;
587 cray | j90)
588 basic_machine=j90-cray
589 os=-unicos
590 ;;
591 craynv)
592 basic_machine=craynv-cray
593 os=-unicosmp
594 ;; 932 ;;
595 cr16 | cr16-*) 933 cr16 | cr16-*)
596 basic_machine=cr16-unknown 934 basic_machine=cr16-unknown
597 os=-elf 935 os=${os:-elf}
598 ;; 936 ;;
599 crds | unos) 937 crds | unos)
600 basic_machine=m68k-crds 938 basic_machine=m68k-crds
@@ -607,7 +945,7 @@ case $basic_machine in
607 ;; 945 ;;
608 crx) 946 crx)
609 basic_machine=crx-unknown 947 basic_machine=crx-unknown
610 os=-elf 948 os=${os:-elf}
611 ;; 949 ;;
612 da30 | da30-*) 950 da30 | da30-*)
613 basic_machine=m68k-da30 951 basic_machine=m68k-da30
@@ -617,35 +955,23 @@ case $basic_machine in
617 ;; 955 ;;
618 decsystem10* | dec10*) 956 decsystem10* | dec10*)
619 basic_machine=pdp10-dec 957 basic_machine=pdp10-dec
620 os=-tops10 958 os=tops10
621 ;; 959 ;;
622 decsystem20* | dec20*) 960 decsystem20* | dec20*)
623 basic_machine=pdp10-dec 961 basic_machine=pdp10-dec
624 os=-tops20 962 os=tops20
625 ;; 963 ;;
626 delta | 3300 | motorola-3300 | motorola-delta \ 964 delta | 3300 | motorola-3300 | motorola-delta \
627 | 3300-motorola | delta-motorola) 965 | 3300-motorola | delta-motorola)
628 basic_machine=m68k-motorola 966 basic_machine=m68k-motorola
629 ;; 967 ;;
630 delta88)
631 basic_machine=m88k-motorola
632 os=-sysv3
633 ;;
634 dicos)
635 basic_machine=i686-pc
636 os=-dicos
637 ;;
638 djgpp)
639 basic_machine=i586-pc
640 os=-msdosdjgpp
641 ;;
642 dpx20 | dpx20-*) 968 dpx20 | dpx20-*)
643 basic_machine=rs6000-bull 969 basic_machine=rs6000-bull
644 os=-bosx 970 os=${os:-bosx}
645 ;; 971 ;;
646 dpx2*) 972 dpx2*)
647 basic_machine=m68k-bull 973 basic_machine=m68k-bull
648 os=-sysv3 974 os=sysv3
649 ;; 975 ;;
650 e500v[12]) 976 e500v[12])
651 basic_machine=powerpc-unknown 977 basic_machine=powerpc-unknown
@@ -655,20 +981,12 @@ case $basic_machine in
655 basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` 981 basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'`
656 os=$os"spe" 982 os=$os"spe"
657 ;; 983 ;;
658 ebmon29k)
659 basic_machine=a29k-amd
660 os=-ebmon
661 ;;
662 elxsi)
663 basic_machine=elxsi-elxsi
664 os=-bsd
665 ;;
666 encore | umax | mmax) 984 encore | umax | mmax)
667 basic_machine=ns32k-encore 985 basic_machine=ns32k-encore
668 ;; 986 ;;
669 es1800 | OSE68k | ose68k | ose | OSE) 987 elxsi)
670 basic_machine=m68k-ericsson 988 basic_machine=elxsi-elxsi
671 os=-ose 989 os=${os:-bsd}
672 ;; 990 ;;
673 fx2800) 991 fx2800)
674 basic_machine=i860-alliant 992 basic_machine=i860-alliant
@@ -676,45 +994,13 @@ case $basic_machine in
676 genix) 994 genix)
677 basic_machine=ns32k-ns 995 basic_machine=ns32k-ns
678 ;; 996 ;;
679 gmicro)
680 basic_machine=tron-gmicro
681 os=-sysv
682 ;;
683 go32)
684 basic_machine=i386-pc
685 os=-go32
686 ;;
687 h3050r* | hiux*) 997 h3050r* | hiux*)
688 basic_machine=hppa1.1-hitachi 998 basic_machine=hppa1.1-hitachi
689 os=-hiuxwe2 999 os=hiuxwe2
690 ;;
691 h8300hms)
692 basic_machine=h8300-hitachi
693 os=-hms
694 ;;
695 h8300xray)
696 basic_machine=h8300-hitachi
697 os=-xray
698 ;;
699 h8500hms)
700 basic_machine=h8500-hitachi
701 os=-hms
702 ;;
703 harris)
704 basic_machine=m88k-harris
705 os=-sysv3
706 ;; 1000 ;;
707 hp300-*) 1001 hp300-*)
708 basic_machine=m68k-hp 1002 basic_machine=m68k-hp
709 ;; 1003 ;;
710 hp300bsd)
711 basic_machine=m68k-hp
712 os=-bsd
713 ;;
714 hp300hpux)
715 basic_machine=m68k-hp
716 os=-hpux
717 ;;
718 hp3k9[0-9][0-9] | hp9[0-9][0-9]) 1004 hp3k9[0-9][0-9] | hp9[0-9][0-9])
719 basic_machine=hppa1.0-hp 1005 basic_machine=hppa1.0-hp
720 ;; 1006 ;;
@@ -744,95 +1030,55 @@ case $basic_machine in
744 hp9k8[0-9][0-9] | hp8[0-9][0-9]) 1030 hp9k8[0-9][0-9] | hp8[0-9][0-9])
745 basic_machine=hppa1.0-hp 1031 basic_machine=hppa1.0-hp
746 ;; 1032 ;;
747 hppaosf)
748 basic_machine=hppa1.1-hp
749 os=-osf
750 ;;
751 hppro)
752 basic_machine=hppa1.1-hp
753 os=-proelf
754 ;;
755 i370-ibm* | ibm*) 1033 i370-ibm* | ibm*)
756 basic_machine=i370-ibm 1034 basic_machine=i370-ibm
757 ;; 1035 ;;
758 i*86v32) 1036 i*86v32)
759 basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` 1037 basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
760 os=-sysv32 1038 os=sysv32
761 ;; 1039 ;;
762 i*86v4*) 1040 i*86v4*)
763 basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` 1041 basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
764 os=-sysv4 1042 os=sysv4
765 ;; 1043 ;;
766 i*86v) 1044 i*86v)
767 basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` 1045 basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
768 os=-sysv 1046 os=sysv
769 ;; 1047 ;;
770 i*86sol2) 1048 i*86sol2)
771 basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` 1049 basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'`
772 os=-solaris2 1050 os=solaris2
773 ;;
774 i386mach)
775 basic_machine=i386-mach
776 os=-mach
777 ;; 1051 ;;
778 vsta) 1052 j90 | j90-cray)
779 basic_machine=i386-unknown 1053 basic_machine=j90-cray
780 os=-vsta 1054 os=${os:-unicos}
781 ;; 1055 ;;
782 iris | iris4d) 1056 iris | iris4d)
783 basic_machine=mips-sgi 1057 basic_machine=mips-sgi
784 case $os in 1058 case $os in
785 -irix*) 1059 irix*)
786 ;; 1060 ;;
787 *) 1061 *)
788 os=-irix4 1062 os=irix4
789 ;; 1063 ;;
790 esac 1064 esac
791 ;; 1065 ;;
792 isi68 | isi)
793 basic_machine=m68k-isi
794 os=-sysv
795 ;;
796 leon-*|leon[3-9]-*) 1066 leon-*|leon[3-9]-*)
797 basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'` 1067 basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'`
798 ;; 1068 ;;
799 m68knommu)
800 basic_machine=m68k-unknown
801 os=-linux
802 ;;
803 m68knommu-*) 1069 m68knommu-*)
804 basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'` 1070 basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'`
805 os=-linux 1071 os=linux
806 ;;
807 magnum | m3230)
808 basic_machine=mips-mips
809 os=-sysv
810 ;;
811 merlin)
812 basic_machine=ns32k-utek
813 os=-sysv
814 ;; 1072 ;;
815 microblaze*) 1073 microblaze*)
816 basic_machine=microblaze-xilinx 1074 basic_machine=microblaze-xilinx
817 ;; 1075 ;;
818 mingw64)
819 basic_machine=x86_64-pc
820 os=-mingw64
821 ;;
822 mingw32)
823 basic_machine=i686-pc
824 os=-mingw32
825 ;;
826 mingw32ce)
827 basic_machine=arm-unknown
828 os=-mingw32ce
829 ;;
830 miniframe) 1076 miniframe)
831 basic_machine=m68000-convergent 1077 basic_machine=m68000-convergent
832 ;; 1078 ;;
833 *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) 1079 *mint | mint[0-9]* | *MiNT | *MiNT[0-9]*)
834 basic_machine=m68k-atari 1080 basic_machine=m68k-atari
835 os=-mint 1081 os=mint
836 ;; 1082 ;;
837 mips3*-*) 1083 mips3*-*)
838 basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'` 1084 basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`
@@ -840,98 +1086,26 @@ case $basic_machine in
840 mips3*) 1086 mips3*)
841 basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown 1087 basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown
842 ;; 1088 ;;
843 monitor)
844 basic_machine=m68k-rom68k
845 os=-coff
846 ;;
847 morphos)
848 basic_machine=powerpc-unknown
849 os=-morphos
850 ;;
851 moxiebox)
852 basic_machine=moxie-unknown
853 os=-moxiebox
854 ;;
855 msdos)
856 basic_machine=i386-pc
857 os=-msdos
858 ;;
859 ms1-*) 1089 ms1-*)
860 basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'` 1090 basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'`
861 ;; 1091 ;;
862 msys)
863 basic_machine=i686-pc
864 os=-msys
865 ;;
866 mvs)
867 basic_machine=i370-ibm
868 os=-mvs
869 ;;
870 nacl)
871 basic_machine=le32-unknown
872 os=-nacl
873 ;;
874 ncr3000)
875 basic_machine=i486-ncr
876 os=-sysv4
877 ;;
878 netbsd386)
879 basic_machine=i386-unknown
880 os=-netbsd
881 ;;
882 netwinder)
883 basic_machine=armv4l-rebel
884 os=-linux
885 ;;
886 news | news700 | news800 | news900)
887 basic_machine=m68k-sony
888 os=-newsos
889 ;;
890 news1000)
891 basic_machine=m68030-sony
892 os=-newsos
893 ;;
894 news-3600 | risc-news) 1092 news-3600 | risc-news)
895 basic_machine=mips-sony 1093 basic_machine=mips-sony
896 os=-newsos 1094 os=newsos
897 ;;
898 necv70)
899 basic_machine=v70-nec
900 os=-sysv
901 ;; 1095 ;;
902 next | m*-next) 1096 next | m*-next)
903 basic_machine=m68k-next 1097 basic_machine=m68k-next
904 case $os in 1098 case $os in
905 -nextstep* ) 1099 nextstep* )
906 ;; 1100 ;;
907 -ns2*) 1101 ns2*)
908 os=-nextstep2 1102 os=nextstep2
909 ;; 1103 ;;
910 *) 1104 *)
911 os=-nextstep3 1105 os=nextstep3
912 ;; 1106 ;;
913 esac 1107 esac
914 ;; 1108 ;;
915 nh3000)
916 basic_machine=m68k-harris
917 os=-cxux
918 ;;
919 nh[45]000)
920 basic_machine=m88k-harris
921 os=-cxux
922 ;;
923 nindy960)
924 basic_machine=i960-intel
925 os=-nindy
926 ;;
927 mon960)
928 basic_machine=i960-intel
929 os=-mon960
930 ;;
931 nonstopux)
932 basic_machine=mips-compaq
933 os=-nonstopux
934 ;;
935 np1) 1109 np1)
936 basic_machine=np1-gould 1110 basic_machine=np1-gould
937 ;; 1111 ;;
@@ -952,38 +1126,18 @@ case $basic_machine in
952 ;; 1126 ;;
953 op50n-* | op60c-*) 1127 op50n-* | op60c-*)
954 basic_machine=hppa1.1-oki 1128 basic_machine=hppa1.1-oki
955 os=-proelf 1129 os=proelf
956 ;; 1130 ;;
957 openrisc | openrisc-*) 1131 openrisc | openrisc-*)
958 basic_machine=or32-unknown 1132 basic_machine=or32-unknown
959 ;; 1133 ;;
960 os400)
961 basic_machine=powerpc-ibm
962 os=-os400
963 ;;
964 OSE68000 | ose68000)
965 basic_machine=m68000-ericsson
966 os=-ose
967 ;;
968 os68k)
969 basic_machine=m68k-none
970 os=-os68k
971 ;;
972 pa-hitachi) 1134 pa-hitachi)
973 basic_machine=hppa1.1-hitachi 1135 basic_machine=hppa1.1-hitachi
974 os=-hiuxwe2 1136 os=hiuxwe2
975 ;;
976 paragon)
977 basic_machine=i860-intel
978 os=-osf
979 ;;
980 parisc)
981 basic_machine=hppa-unknown
982 os=-linux
983 ;; 1137 ;;
984 parisc-*) 1138 parisc-*)
985 basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'` 1139 basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'`
986 os=-linux 1140 os=linux
987 ;; 1141 ;;
988 pbd) 1142 pbd)
989 basic_machine=sparc-tti 1143 basic_machine=sparc-tti
@@ -1053,22 +1207,6 @@ case $basic_machine in
1053 ps2) 1207 ps2)
1054 basic_machine=i386-ibm 1208 basic_machine=i386-ibm
1055 ;; 1209 ;;
1056 pw32)
1057 basic_machine=i586-unknown
1058 os=-pw32
1059 ;;
1060 rdos | rdos64)
1061 basic_machine=x86_64-pc
1062 os=-rdos
1063 ;;
1064 rdos32)
1065 basic_machine=i386-pc
1066 os=-rdos
1067 ;;
1068 rom68k)
1069 basic_machine=m68k-rom68k
1070 os=-coff
1071 ;;
1072 rm[46]00) 1210 rm[46]00)
1073 basic_machine=mips-siemens 1211 basic_machine=mips-siemens
1074 ;; 1212 ;;
@@ -1081,10 +1219,6 @@ case $basic_machine in
1081 s390x | s390x-*) 1219 s390x | s390x-*)
1082 basic_machine=s390x-ibm 1220 basic_machine=s390x-ibm
1083 ;; 1221 ;;
1084 sa29200)
1085 basic_machine=a29k-amd
1086 os=-udi
1087 ;;
1088 sb1) 1222 sb1)
1089 basic_machine=mipsisa64sb1-unknown 1223 basic_machine=mipsisa64sb1-unknown
1090 ;; 1224 ;;
@@ -1093,11 +1227,7 @@ case $basic_machine in
1093 ;; 1227 ;;
1094 sde) 1228 sde)
1095 basic_machine=mipsisa32-sde 1229 basic_machine=mipsisa32-sde
1096 os=-elf 1230 os=${os:-elf}
1097 ;;
1098 sei)
1099 basic_machine=mips-sei
1100 os=-seiux
1101 ;; 1231 ;;
1102 sequent) 1232 sequent)
1103 basic_machine=i386-sequent 1233 basic_machine=i386-sequent
@@ -1107,11 +1237,7 @@ case $basic_machine in
1107 ;; 1237 ;;
1108 simso-wrs) 1238 simso-wrs)
1109 basic_machine=sparclite-wrs 1239 basic_machine=sparclite-wrs
1110 os=-vxworks 1240 os=vxworks
1111 ;;
1112 sps7)
1113 basic_machine=m68k-bull
1114 os=-sysv2
1115 ;; 1241 ;;
1116 spur) 1242 spur)
1117 basic_machine=spur-unknown 1243 basic_machine=spur-unknown
@@ -1119,44 +1245,12 @@ case $basic_machine in
1119 st2000) 1245 st2000)
1120 basic_machine=m68k-tandem 1246 basic_machine=m68k-tandem
1121 ;; 1247 ;;
1122 stratus)
1123 basic_machine=i860-stratus
1124 os=-sysv4
1125 ;;
1126 strongarm-* | thumb-*) 1248 strongarm-* | thumb-*)
1127 basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'` 1249 basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'`
1128 ;; 1250 ;;
1129 sun2) 1251 sun2)
1130 basic_machine=m68000-sun 1252 basic_machine=m68000-sun
1131 ;; 1253 ;;
1132 sun2os3)
1133 basic_machine=m68000-sun
1134 os=-sunos3
1135 ;;
1136 sun2os4)
1137 basic_machine=m68000-sun
1138 os=-sunos4
1139 ;;
1140 sun3os3)
1141 basic_machine=m68k-sun
1142 os=-sunos3
1143 ;;
1144 sun3os4)
1145 basic_machine=m68k-sun
1146 os=-sunos4
1147 ;;
1148 sun4os3)
1149 basic_machine=sparc-sun
1150 os=-sunos3
1151 ;;
1152 sun4os4)
1153 basic_machine=sparc-sun
1154 os=-sunos4
1155 ;;
1156 sun4sol2)
1157 basic_machine=sparc-sun
1158 os=-solaris2
1159 ;;
1160 sun3 | sun3-*) 1254 sun3 | sun3-*)
1161 basic_machine=m68k-sun 1255 basic_machine=m68k-sun
1162 ;; 1256 ;;
@@ -1166,25 +1260,9 @@ case $basic_machine in
1166 sun386 | sun386i | roadrunner) 1260 sun386 | sun386i | roadrunner)
1167 basic_machine=i386-sun 1261 basic_machine=i386-sun
1168 ;; 1262 ;;
1169 sv1)
1170 basic_machine=sv1-cray
1171 os=-unicos
1172 ;;
1173 symmetry)
1174 basic_machine=i386-sequent
1175 os=-dynix
1176 ;;
1177 t3e)
1178 basic_machine=alphaev5-cray
1179 os=-unicos
1180 ;;
1181 t90)
1182 basic_machine=t90-cray
1183 os=-unicos
1184 ;;
1185 tile*) 1263 tile*)
1186 basic_machine=$basic_machine-unknown 1264 basic_machine=$basic_machine-unknown
1187 os=-linux-gnu 1265 os=linux-gnu
1188 ;; 1266 ;;
1189 tx39) 1267 tx39)
1190 basic_machine=mipstx39-unknown 1268 basic_machine=mipstx39-unknown
@@ -1192,80 +1270,32 @@ case $basic_machine in
1192 tx39el) 1270 tx39el)
1193 basic_machine=mipstx39el-unknown 1271 basic_machine=mipstx39el-unknown
1194 ;; 1272 ;;
1195 toad1)
1196 basic_machine=pdp10-xkl
1197 os=-tops20
1198 ;;
1199 tower | tower-32) 1273 tower | tower-32)
1200 basic_machine=m68k-ncr 1274 basic_machine=m68k-ncr
1201 ;; 1275 ;;
1202 tpf)
1203 basic_machine=s390x-ibm
1204 os=-tpf
1205 ;;
1206 udi29k)
1207 basic_machine=a29k-amd
1208 os=-udi
1209 ;;
1210 ultra3)
1211 basic_machine=a29k-nyu
1212 os=-sym1
1213 ;;
1214 v810 | necv810)
1215 basic_machine=v810-nec
1216 os=-none
1217 ;;
1218 vaxv)
1219 basic_machine=vax-dec
1220 os=-sysv
1221 ;;
1222 vms)
1223 basic_machine=vax-dec
1224 os=-vms
1225 ;;
1226 vpp*|vx|vx-*) 1276 vpp*|vx|vx-*)
1227 basic_machine=f301-fujitsu 1277 basic_machine=f301-fujitsu
1228 ;; 1278 ;;
1229 vxworks960)
1230 basic_machine=i960-wrs
1231 os=-vxworks
1232 ;;
1233 vxworks68)
1234 basic_machine=m68k-wrs
1235 os=-vxworks
1236 ;;
1237 vxworks29k)
1238 basic_machine=a29k-wrs
1239 os=-vxworks
1240 ;;
1241 w65*) 1279 w65*)
1242 basic_machine=w65-wdc 1280 basic_machine=w65-wdc
1243 os=-none 1281 os=none
1244 ;; 1282 ;;
1245 w89k-*) 1283 w89k-*)
1246 basic_machine=hppa1.1-winbond 1284 basic_machine=hppa1.1-winbond
1247 os=-proelf 1285 os=proelf
1248 ;; 1286 ;;
1249 x64) 1287 x64)
1250 basic_machine=x86_64-pc 1288 basic_machine=x86_64-pc
1251 ;; 1289 ;;
1252 xbox)
1253 basic_machine=i686-pc
1254 os=-mingw32
1255 ;;
1256 xps | xps100) 1290 xps | xps100)
1257 basic_machine=xps100-honeywell 1291 basic_machine=xps100-honeywell
1258 ;; 1292 ;;
1259 xscale-* | xscalee[bl]-*) 1293 xscale-* | xscalee[bl]-*)
1260 basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'` 1294 basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'`
1261 ;; 1295 ;;
1262 ymp)
1263 basic_machine=ymp-cray
1264 os=-unicos
1265 ;;
1266 none) 1296 none)
1267 basic_machine=none-none 1297 basic_machine=none-none
1268 os=-none 1298 os=${os:-none}
1269 ;; 1299 ;;
1270 1300
1271# Here we handle the default manufacturer of certain CPU types. It is in 1301# Here we handle the default manufacturer of certain CPU types. It is in
@@ -1338,199 +1368,199 @@ esac
1338 1368
1339# Decode manufacturer-specific aliases for certain operating systems. 1369# Decode manufacturer-specific aliases for certain operating systems.
1340 1370
1341if [ x"$os" != x"" ] 1371if [ x$os != x ]
1342then 1372then
1343case $os in 1373case $os in
1344 # First match some system type aliases that might get confused 1374 # First match some system type aliases that might get confused
1345 # with valid system types. 1375 # with valid system types.
1346 # -solaris* is a basic system type, with this one exception. 1376 # solaris* is a basic system type, with this one exception.
1347 -auroraux) 1377 auroraux)
1348 os=-auroraux 1378 os=auroraux
1349 ;; 1379 ;;
1350 -solaris1 | -solaris1.*) 1380 solaris1 | solaris1.*)
1351 os=`echo $os | sed -e 's|solaris1|sunos4|'` 1381 os=`echo $os | sed -e 's|solaris1|sunos4|'`
1352 ;; 1382 ;;
1353 -solaris) 1383 solaris)
1354 os=-solaris2 1384 os=solaris2
1355 ;; 1385 ;;
1356 -unixware*) 1386 unixware*)
1357 os=-sysv4.2uw 1387 os=sysv4.2uw
1358 ;; 1388 ;;
1359 -gnu/linux*) 1389 gnu/linux*)
1360 os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` 1390 os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
1361 ;; 1391 ;;
1362 # es1800 is here to avoid being matched by es* (a different OS) 1392 # es1800 is here to avoid being matched by es* (a different OS)
1363 -es1800*) 1393 es1800*)
1364 os=-ose 1394 os=ose
1365 ;; 1395 ;;
1366 # Now accept the basic system types. 1396 # Now accept the basic system types.
1367 # The portable systems comes first. 1397 # The portable systems comes first.
1368 # Each alternative MUST end in a * to match a version number. 1398 # Each alternative MUST end in a * to match a version number.
1369 # -sysv* is not here because it comes later, after sysvr4. 1399 # sysv* is not here because it comes later, after sysvr4.
1370 -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ 1400 gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
1371 | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ 1401 | *vms* | sco* | esix* | isc* | aix* | cnk* | sunos | sunos[34]*\
1372 | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ 1402 | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
1373 | -sym* | -kopensolaris* | -plan9* \ 1403 | sym* | kopensolaris* | plan9* \
1374 | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ 1404 | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
1375 | -aos* | -aros* | -cloudabi* | -sortix* \ 1405 | aos* | aros* | cloudabi* | sortix* \
1376 | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ 1406 | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
1377 | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ 1407 | clix* | riscos* | uniplus* | iris* | rtu* | xenix* \
1378 | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \ 1408 | hiux* | knetbsd* | mirbsd* | netbsd* \
1379 | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ 1409 | bitrig* | openbsd* | solidbsd* | libertybsd* \
1380 | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ 1410 | ekkobsd* | kfreebsd* | freebsd* | riscix* | lynxos* \
1381 | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ 1411 | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \
1382 | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ 1412 | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \
1383 | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* | -hcos* \ 1413 | udi* | eabi* | lites* | ieee* | go32* | aux* | hcos* \
1384 | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \ 1414 | chorusos* | chorusrdb* | cegcc* | glidix* \
1385 | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ 1415 | cygwin* | msys* | pe* | psos* | moss* | proelf* | rtems* \
1386 | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ 1416 | midipix* | mingw32* | mingw64* | linux-gnu* | linux-android* \
1387 | -linux-newlib* | -linux-musl* | -linux-uclibc* \ 1417 | linux-newlib* | linux-musl* | linux-uclibc* \
1388 | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ 1418 | uxpv* | beos* | mpeix* | udk* | moxiebox* \
1389 | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \ 1419 | interix* | uwin* | mks* | rhapsody* | darwin* \
1390 | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ 1420 | openstep* | oskit* | conix* | pw32* | nonstopux* \
1391 | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ 1421 | storm-chaos* | tops10* | tenex* | tops20* | its* \
1392 | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ 1422 | os2* | vos* | palmos* | uclinux* | nucleus* \
1393 | -morphos* | -superux* | -rtmk* | -windiss* \ 1423 | morphos* | superux* | rtmk* | windiss* \
1394 | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ 1424 | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
1395 | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ 1425 | skyos* | haiku* | rdos* | toppers* | drops* | es* \
1396 | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \ 1426 | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
1397 | -midnightbsd*) 1427 | midnightbsd*)
1398 # Remember, each alternative MUST END IN *, to match a version number. 1428 # Remember, each alternative MUST END IN *, to match a version number.
1399 ;; 1429 ;;
1400 -qnx*) 1430 qnx*)
1401 case $basic_machine in 1431 case $basic_machine in
1402 x86-* | i*86-*) 1432 x86-* | i*86-*)
1403 ;; 1433 ;;
1404 *) 1434 *)
1405 os=-nto$os 1435 os=nto-$os
1406 ;; 1436 ;;
1407 esac 1437 esac
1408 ;; 1438 ;;
1409 -nto-qnx*) 1439 nto-qnx*)
1410 ;; 1440 ;;
1411 -nto*) 1441 nto*)
1412 os=`echo $os | sed -e 's|nto|nto-qnx|'` 1442 os=`echo $os | sed -e 's|nto|nto-qnx|'`
1413 ;; 1443 ;;
1414 -sim | -xray | -os68k* | -v88r* \ 1444 sim | xray | os68k* | v88r* \
1415 | -windows* | -osx | -abug | -netware* | -os9* \ 1445 | windows* | osx | abug | netware* | os9* \
1416 | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) 1446 | macos* | mpw* | magic* | mmixware* | mon960* | lnews*)
1417 ;; 1447 ;;
1418 -mac*) 1448 mac*)
1419 os=`echo "$os" | sed -e 's|mac|macos|'` 1449 os=`echo "$os" | sed -e 's|mac|macos|'`
1420 ;; 1450 ;;
1421 -linux-dietlibc) 1451 linux-dietlibc)
1422 os=-linux-dietlibc 1452 os=linux-dietlibc
1423 ;; 1453 ;;
1424 -linux*) 1454 linux*)
1425 os=`echo $os | sed -e 's|linux|linux-gnu|'` 1455 os=`echo $os | sed -e 's|linux|linux-gnu|'`
1426 ;; 1456 ;;
1427 -sunos5*) 1457 sunos5*)
1428 os=`echo "$os" | sed -e 's|sunos5|solaris2|'` 1458 os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
1429 ;; 1459 ;;
1430 -sunos6*) 1460 sunos6*)
1431 os=`echo "$os" | sed -e 's|sunos6|solaris3|'` 1461 os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
1432 ;; 1462 ;;
1433 -opened*) 1463 opened*)
1434 os=-openedition 1464 os=openedition
1435 ;; 1465 ;;
1436 -os400*) 1466 os400*)
1437 os=-os400 1467 os=os400
1438 ;; 1468 ;;
1439 -wince*) 1469 wince*)
1440 os=-wince 1470 os=wince
1441 ;; 1471 ;;
1442 -utek*) 1472 utek*)
1443 os=-bsd 1473 os=bsd
1444 ;; 1474 ;;
1445 -dynix*) 1475 dynix*)
1446 os=-bsd 1476 os=bsd
1447 ;; 1477 ;;
1448 -acis*) 1478 acis*)
1449 os=-aos 1479 os=aos
1450 ;; 1480 ;;
1451 -atheos*) 1481 atheos*)
1452 os=-atheos 1482 os=atheos
1453 ;; 1483 ;;
1454 -syllable*) 1484 syllable*)
1455 os=-syllable 1485 os=syllable
1456 ;; 1486 ;;
1457 -386bsd) 1487 386bsd)
1458 os=-bsd 1488 os=bsd
1459 ;; 1489 ;;
1460 -ctix* | -uts*) 1490 ctix* | uts*)
1461 os=-sysv 1491 os=sysv
1462 ;; 1492 ;;
1463 -nova*) 1493 nova*)
1464 os=-rtmk-nova 1494 os=rtmk-nova
1465 ;; 1495 ;;
1466 -ns2) 1496 ns2)
1467 os=-nextstep2 1497 os=nextstep2
1468 ;; 1498 ;;
1469 -nsk*) 1499 nsk*)
1470 os=-nsk 1500 os=nsk
1471 ;; 1501 ;;
1472 # Preserve the version number of sinix5. 1502 # Preserve the version number of sinix5.
1473 -sinix5.*) 1503 sinix5.*)
1474 os=`echo $os | sed -e 's|sinix|sysv|'` 1504 os=`echo $os | sed -e 's|sinix|sysv|'`
1475 ;; 1505 ;;
1476 -sinix*) 1506 sinix*)
1477 os=-sysv4 1507 os=sysv4
1478 ;; 1508 ;;
1479 -tpf*) 1509 tpf*)
1480 os=-tpf 1510 os=tpf
1481 ;; 1511 ;;
1482 -triton*) 1512 triton*)
1483 os=-sysv3 1513 os=sysv3
1484 ;; 1514 ;;
1485 -oss*) 1515 oss*)
1486 os=-sysv3 1516 os=sysv3
1487 ;; 1517 ;;
1488 -svr4*) 1518 svr4*)
1489 os=-sysv4 1519 os=sysv4
1490 ;; 1520 ;;
1491 -svr3) 1521 svr3)
1492 os=-sysv3 1522 os=sysv3
1493 ;; 1523 ;;
1494 -sysvr4) 1524 sysvr4)
1495 os=-sysv4 1525 os=sysv4
1496 ;; 1526 ;;
1497 # This must come after -sysvr4. 1527 # This must come after sysvr4.
1498 -sysv*) 1528 sysv*)
1499 ;; 1529 ;;
1500 -ose*) 1530 ose*)
1501 os=-ose 1531 os=ose
1502 ;; 1532 ;;
1503 -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) 1533 *mint | mint[0-9]* | *MiNT | MiNT[0-9]*)
1504 os=-mint 1534 os=mint
1505 ;; 1535 ;;
1506 -zvmoe) 1536 zvmoe)
1507 os=-zvmoe 1537 os=zvmoe
1508 ;; 1538 ;;
1509 -dicos*) 1539 dicos*)
1510 os=-dicos 1540 os=dicos
1511 ;; 1541 ;;
1512 -pikeos*) 1542 pikeos*)
1513 # Until real need of OS specific support for 1543 # Until real need of OS specific support for
1514 # particular features comes up, bare metal 1544 # particular features comes up, bare metal
1515 # configurations are quite functional. 1545 # configurations are quite functional.
1516 case $basic_machine in 1546 case $basic_machine in
1517 arm*) 1547 arm*)
1518 os=-eabi 1548 os=eabi
1519 ;; 1549 ;;
1520 *) 1550 *)
1521 os=-elf 1551 os=elf
1522 ;; 1552 ;;
1523 esac 1553 esac
1524 ;; 1554 ;;
1525 -nacl*) 1555 nacl*)
1556 ;;
1557 ios)
1526 ;; 1558 ;;
1527 -ios) 1559 none)
1528 ;; 1560 ;;
1529 -none) 1561 *-eabi)
1530 ;; 1562 ;;
1531 *) 1563 *)
1532 # Get rid of the `-' at the beginning of $os.
1533 os=`echo $os | sed 's/[^-]*-//'`
1534 echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2 1564 echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2
1535 exit 1 1565 exit 1
1536 ;; 1566 ;;
@@ -1549,173 +1579,173 @@ else
1549 1579
1550case $basic_machine in 1580case $basic_machine in
1551 score-*) 1581 score-*)
1552 os=-elf 1582 os=elf
1553 ;; 1583 ;;
1554 spu-*) 1584 spu-*)
1555 os=-elf 1585 os=elf
1556 ;; 1586 ;;
1557 *-acorn) 1587 *-acorn)
1558 os=-riscix1.2 1588 os=riscix1.2
1559 ;; 1589 ;;
1560 arm*-rebel) 1590 arm*-rebel)
1561 os=-linux 1591 os=linux
1562 ;; 1592 ;;
1563 arm*-semi) 1593 arm*-semi)
1564 os=-aout 1594 os=aout
1565 ;; 1595 ;;
1566 c4x-* | tic4x-*) 1596 c4x-* | tic4x-*)
1567 os=-coff 1597 os=coff
1568 ;; 1598 ;;
1569 c8051-*) 1599 c8051-*)
1570 os=-elf 1600 os=elf
1571 ;; 1601 ;;
1572 hexagon-*) 1602 hexagon-*)
1573 os=-elf 1603 os=elf
1574 ;; 1604 ;;
1575 tic54x-*) 1605 tic54x-*)
1576 os=-coff 1606 os=coff
1577 ;; 1607 ;;
1578 tic55x-*) 1608 tic55x-*)
1579 os=-coff 1609 os=coff
1580 ;; 1610 ;;
1581 tic6x-*) 1611 tic6x-*)
1582 os=-coff 1612 os=coff
1583 ;; 1613 ;;
1584 # This must come before the *-dec entry. 1614 # This must come before the *-dec entry.
1585 pdp10-*) 1615 pdp10-*)
1586 os=-tops20 1616 os=tops20
1587 ;; 1617 ;;
1588 pdp11-*) 1618 pdp11-*)
1589 os=-none 1619 os=none
1590 ;; 1620 ;;
1591 *-dec | vax-*) 1621 *-dec | vax-*)
1592 os=-ultrix4.2 1622 os=ultrix4.2
1593 ;; 1623 ;;
1594 m68*-apollo) 1624 m68*-apollo)
1595 os=-domain 1625 os=domain
1596 ;; 1626 ;;
1597 i386-sun) 1627 i386-sun)
1598 os=-sunos4.0.2 1628 os=sunos4.0.2
1599 ;; 1629 ;;
1600 m68000-sun) 1630 m68000-sun)
1601 os=-sunos3 1631 os=sunos3
1602 ;; 1632 ;;
1603 m68*-cisco) 1633 m68*-cisco)
1604 os=-aout 1634 os=aout
1605 ;; 1635 ;;
1606 mep-*) 1636 mep-*)
1607 os=-elf 1637 os=elf
1608 ;; 1638 ;;
1609 mips*-cisco) 1639 mips*-cisco)
1610 os=-elf 1640 os=elf
1611 ;; 1641 ;;
1612 mips*-*) 1642 mips*-*)
1613 os=-elf 1643 os=elf
1614 ;; 1644 ;;
1615 or32-*) 1645 or32-*)
1616 os=-coff 1646 os=coff
1617 ;; 1647 ;;
1618 *-tti) # must be before sparc entry or we get the wrong os. 1648 *-tti) # must be before sparc entry or we get the wrong os.
1619 os=-sysv3 1649 os=sysv3
1620 ;; 1650 ;;
1621 sparc-* | *-sun) 1651 sparc-* | *-sun)
1622 os=-sunos4.1.1 1652 os=sunos4.1.1
1623 ;; 1653 ;;
1624 pru-*) 1654 pru-*)
1625 os=-elf 1655 os=elf
1626 ;; 1656 ;;
1627 *-be) 1657 *-be)
1628 os=-beos 1658 os=beos
1629 ;; 1659 ;;
1630 *-ibm) 1660 *-ibm)
1631 os=-aix 1661 os=aix
1632 ;; 1662 ;;
1633 *-knuth) 1663 *-knuth)
1634 os=-mmixware 1664 os=mmixware
1635 ;; 1665 ;;
1636 *-wec) 1666 *-wec)
1637 os=-proelf 1667 os=proelf
1638 ;; 1668 ;;
1639 *-winbond) 1669 *-winbond)
1640 os=-proelf 1670 os=proelf
1641 ;; 1671 ;;
1642 *-oki) 1672 *-oki)
1643 os=-proelf 1673 os=proelf
1644 ;; 1674 ;;
1645 *-hp) 1675 *-hp)
1646 os=-hpux 1676 os=hpux
1647 ;; 1677 ;;
1648 *-hitachi) 1678 *-hitachi)
1649 os=-hiux 1679 os=hiux
1650 ;; 1680 ;;
1651 i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) 1681 i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
1652 os=-sysv 1682 os=sysv
1653 ;; 1683 ;;
1654 *-cbm) 1684 *-cbm)
1655 os=-amigaos 1685 os=amigaos
1656 ;; 1686 ;;
1657 *-dg) 1687 *-dg)
1658 os=-dgux 1688 os=dgux
1659 ;; 1689 ;;
1660 *-dolphin) 1690 *-dolphin)
1661 os=-sysv3 1691 os=sysv3
1662 ;; 1692 ;;
1663 m68k-ccur) 1693 m68k-ccur)
1664 os=-rtu 1694 os=rtu
1665 ;; 1695 ;;
1666 m88k-omron*) 1696 m88k-omron*)
1667 os=-luna 1697 os=luna
1668 ;; 1698 ;;
1669 *-next) 1699 *-next)
1670 os=-nextstep 1700 os=nextstep
1671 ;; 1701 ;;
1672 *-sequent) 1702 *-sequent)
1673 os=-ptx 1703 os=ptx
1674 ;; 1704 ;;
1675 *-crds) 1705 *-crds)
1676 os=-unos 1706 os=unos
1677 ;; 1707 ;;
1678 *-ns) 1708 *-ns)
1679 os=-genix 1709 os=genix
1680 ;; 1710 ;;
1681 i370-*) 1711 i370-*)
1682 os=-mvs 1712 os=mvs
1683 ;; 1713 ;;
1684 *-gould) 1714 *-gould)
1685 os=-sysv 1715 os=sysv
1686 ;; 1716 ;;
1687 *-highlevel) 1717 *-highlevel)
1688 os=-bsd 1718 os=bsd
1689 ;; 1719 ;;
1690 *-encore) 1720 *-encore)
1691 os=-bsd 1721 os=bsd
1692 ;; 1722 ;;
1693 *-sgi) 1723 *-sgi)
1694 os=-irix 1724 os=irix
1695 ;; 1725 ;;
1696 *-siemens) 1726 *-siemens)
1697 os=-sysv4 1727 os=sysv4
1698 ;; 1728 ;;
1699 *-masscomp) 1729 *-masscomp)
1700 os=-rtu 1730 os=rtu
1701 ;; 1731 ;;
1702 f30[01]-fujitsu | f700-fujitsu) 1732 f30[01]-fujitsu | f700-fujitsu)
1703 os=-uxpv 1733 os=uxpv
1704 ;; 1734 ;;
1705 *-rom68k) 1735 *-rom68k)
1706 os=-coff 1736 os=coff
1707 ;; 1737 ;;
1708 *-*bug) 1738 *-*bug)
1709 os=-coff 1739 os=coff
1710 ;; 1740 ;;
1711 *-apple) 1741 *-apple)
1712 os=-macos 1742 os=macos
1713 ;; 1743 ;;
1714 *-atari*) 1744 *-atari*)
1715 os=-mint 1745 os=mint
1716 ;; 1746 ;;
1717 *) 1747 *)
1718 os=-none 1748 os=none
1719 ;; 1749 ;;
1720esac 1750esac
1721fi 1751fi
@@ -1726,67 +1756,67 @@ vendor=unknown
1726case $basic_machine in 1756case $basic_machine in
1727 *-unknown) 1757 *-unknown)
1728 case $os in 1758 case $os in
1729 -riscix*) 1759 riscix*)
1730 vendor=acorn 1760 vendor=acorn
1731 ;; 1761 ;;
1732 -sunos*) 1762 sunos*)
1733 vendor=sun 1763 vendor=sun
1734 ;; 1764 ;;
1735 -cnk*|-aix*) 1765 cnk*|-aix*)
1736 vendor=ibm 1766 vendor=ibm
1737 ;; 1767 ;;
1738 -beos*) 1768 beos*)
1739 vendor=be 1769 vendor=be
1740 ;; 1770 ;;
1741 -hpux*) 1771 hpux*)
1742 vendor=hp 1772 vendor=hp
1743 ;; 1773 ;;
1744 -mpeix*) 1774 mpeix*)
1745 vendor=hp 1775 vendor=hp
1746 ;; 1776 ;;
1747 -hiux*) 1777 hiux*)
1748 vendor=hitachi 1778 vendor=hitachi
1749 ;; 1779 ;;
1750 -unos*) 1780 unos*)
1751 vendor=crds 1781 vendor=crds
1752 ;; 1782 ;;
1753 -dgux*) 1783 dgux*)
1754 vendor=dg 1784 vendor=dg
1755 ;; 1785 ;;
1756 -luna*) 1786 luna*)
1757 vendor=omron 1787 vendor=omron
1758 ;; 1788 ;;
1759 -genix*) 1789 genix*)
1760 vendor=ns 1790 vendor=ns
1761 ;; 1791 ;;
1762 -mvs* | -opened*) 1792 mvs* | opened*)
1763 vendor=ibm 1793 vendor=ibm
1764 ;; 1794 ;;
1765 -os400*) 1795 os400*)
1766 vendor=ibm 1796 vendor=ibm
1767 ;; 1797 ;;
1768 -ptx*) 1798 ptx*)
1769 vendor=sequent 1799 vendor=sequent
1770 ;; 1800 ;;
1771 -tpf*) 1801 tpf*)
1772 vendor=ibm 1802 vendor=ibm
1773 ;; 1803 ;;
1774 -vxsim* | -vxworks* | -windiss*) 1804 vxsim* | vxworks* | windiss*)
1775 vendor=wrs 1805 vendor=wrs
1776 ;; 1806 ;;
1777 -aux*) 1807 aux*)
1778 vendor=apple 1808 vendor=apple
1779 ;; 1809 ;;
1780 -hms*) 1810 hms*)
1781 vendor=hitachi 1811 vendor=hitachi
1782 ;; 1812 ;;
1783 -mpw* | -macos*) 1813 mpw* | macos*)
1784 vendor=apple 1814 vendor=apple
1785 ;; 1815 ;;
1786 -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) 1816 *mint | mint[0-9]* | *MiNT | MiNT[0-9]*)
1787 vendor=atari 1817 vendor=atari
1788 ;; 1818 ;;
1789 -vos*) 1819 vos*)
1790 vendor=stratus 1820 vendor=stratus
1791 ;; 1821 ;;
1792 esac 1822 esac
@@ -1794,7 +1824,7 @@ case $basic_machine in
1794 ;; 1824 ;;
1795esac 1825esac
1796 1826
1797echo "$basic_machine$os" 1827echo "$basic_machine-$os"
1798exit 1828exit
1799 1829
1800# Local variables: 1830# Local variables:
generated by cgit v1.2.1 (git 2.18.0) at 2026-01-13 01:47:07 +0000