gnu/config
1
0
Fork 0
mirror of git://git.savannah.gnu.org/config.git synced 2025-05-28 01:56:38 +12:00
Code Issues Packages Projects Releases Wiki Activity

* config.sub: Cordon off two-component aliases.

Browse Source 
Instead of just catching manufacturers as OSes across the board, catch
them just as the second of two components. This prevents nonsense
like:

  $ ./config.sub amd64-unknown-ibm
  x86_64-unknown-ibm-aix

Signed-off-by: Ben Elliston <bje@gnu.org>
This commit is contained in:
John Ericson 2018-05-23 11:30:06 +10:00 committed by Ben Elliston
parent cc35b3ce10
commit ca138e34d0
2 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2018-05-23 John Ericson <john.ericson@obsidian.systems>
* config.sub: Cordon off two-component aliases.
2018-05-21 John Ericson <john.ericson@obsidian.systems> 2018-05-21 John Ericson <john.ericson@obsidian.systems>
* testsuite/config-sub.data: Add clipper-clix and m68k-mint tests. * testsuite/config-sub.data: Add clipper-clix and m68k-mint tests.

45
config.sub vendored
View File

@ -2,7 +2,7 @@
# Configuration validation subroutine script. # Configuration validation subroutine script.
# Copyright 1992-2018 Free Software Foundation, Inc. # Copyright 1992-2018 Free Software Foundation, Inc.
timestamp='2018-05-19' timestamp='2018-05-23'
# This file is free software; you can redistribute it and/or modify it # This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by # under the terms of the GNU General Public License as published by
@ -149,8 +149,30 @@ case $1 in
esac esac
;; ;;
*-*) *-*)
basic_machine=$field1 # Second component is usually, but not always the OS
os=$field2 case $field2 in
# Prevent following clause from handling this valid os
sun*os*)
basic_machine=$field1
os=$field2
;;
# Manufacturers
dec* | mips* | sequent* | encore* | pc532* | sgi* | sony* \
| att* | 7300* | 3300* | delta* | motorola* | sun[234]* \
| unicom* | ibm* | next | hp | isi* | apollo | altos* \
| convergent* | ncr* | news | 32* | 3600* | 3100* | hitachi* \
| c[123]* | convex* | sun | crds | omron* | dg | ultra | tti* \
| harris | dolphin | highlevel | gould | cbm | ns | masscomp \
| apple | axis | knuth | cray | microblaze* \
| sim | cisco | oki | wec | winbond)
basic_machine=$field1-$field2
os=
;;
*)
basic_machine=$field1
os=$field2
;;
esac
;; ;;
*) *)
# Convert single-component short-hands not valid as part of # Convert single-component short-hands not valid as part of
@ -545,26 +567,9 @@ esac
### recognize some manufacturers as not being operating systems, so we ### recognize some manufacturers as not being operating systems, so we
### can provide default operating systems below. ### can provide default operating systems below.
case $os in case $os in
sun*os*)
# Prevent following clause from handling this invalid input.
;;
dec* | mips* | sequent* | encore* | pc532* | sgi* | sony* | \
att* | 7300* | 3300* | delta* | motorola* | sun[234]* | \
unicom* | ibm* | next | hp | isi* | apollo | altos* | \
convergent* | ncr* | news | 32* | 3600* | 3100* | hitachi* |\
c[123]* | convex* | sun | crds | omron* | dg | ultra | tti* | \
harris | dolphin | highlevel | gould | cbm | ns | masscomp | \
apple | axis | knuth | cray | microblaze*)
os=
basic_machine=$1
;;
bluegene*) bluegene*)
os=cnk os=cnk
;; ;;
sim | cisco | oki | wec | winbond)
os=
basic_machine=$1
;;
scout) scout)
;; ;;
wrs) wrs)