mirror of
git://git.savannah.gnu.org/config.git
synced 2025-07-06 13:18:21 +12:00
config.sub: handle cNN-convex and convex-cNN shorthands correctly.
convex-cNN and cNN-convex (where NN in 1, 2, 32, 34, 38) are supposed to be shorthands for cNN-convex-bsd, but the code to handle them was in the wrong switch statement, making it unreachable. Fix. https://en.wikipedia.org/wiki/Convex_Computer says there was also a C4 machine in this product line, at least on paper, but it’s not clear to me whether they ever shipped one. Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
This commit is contained in:

committed by
Dmitry V. Levin

parent
bfda180944
commit
30dd89683d
35
config.sub
vendored
35
config.sub
vendored
@ -170,8 +170,12 @@ case $1 in
|
||||
esac
|
||||
;;
|
||||
*-*)
|
||||
# A lone config we happen to match not fitting any pattern
|
||||
case $field1-$field2 in
|
||||
# Shorthands that happen to contain a single dash
|
||||
convex-c[12] | convex-c3[248])
|
||||
basic_machine=$field2-convex
|
||||
basic_os=
|
||||
;;
|
||||
decstation-3100)
|
||||
basic_machine=mips-dec
|
||||
basic_os=
|
||||
@ -196,7 +200,6 @@ case $1 in
|
||||
| att* \
|
||||
| axis \
|
||||
| bull \
|
||||
| c[123]* \
|
||||
| cbm \
|
||||
| cisco \
|
||||
| convergent* \
|
||||
@ -326,26 +329,6 @@ case $1 in
|
||||
basic_machine=arm-unknown
|
||||
basic_os=cegcc
|
||||
;;
|
||||
convex-c1)
|
||||
basic_machine=c1-convex
|
||||
basic_os=bsd
|
||||
;;
|
||||
convex-c2)
|
||||
basic_machine=c2-convex
|
||||
basic_os=bsd
|
||||
;;
|
||||
convex-c32)
|
||||
basic_machine=c32-convex
|
||||
basic_os=bsd
|
||||
;;
|
||||
convex-c34)
|
||||
basic_machine=c34-convex
|
||||
basic_os=bsd
|
||||
;;
|
||||
convex-c38)
|
||||
basic_machine=c38-convex
|
||||
basic_os=bsd
|
||||
;;
|
||||
cray)
|
||||
basic_machine=j90-cray
|
||||
basic_os=unicos
|
||||
@ -1036,8 +1019,12 @@ unset -v basic_machine
|
||||
|
||||
# Decode basic machines in the full and proper CPU-Company form.
|
||||
case $cpu-$vendor in
|
||||
# Here we handle the default manufacturer of certain CPU types in canonical form. It is in
|
||||
# some cases the only manufacturer, in others, it is the most popular.
|
||||
# Here we handle the default manufacturer of certain CPU types in canonical form.
|
||||
# It is in some cases the only manufacturer, in others, it is the most popular.
|
||||
c[12]-convex | c[12]-unknown | c3[248]-convex | c3[248]-unknown)
|
||||
vendor=convex
|
||||
basic_os=${basic_os:-bsd}
|
||||
;;
|
||||
craynv-unknown)
|
||||
vendor=cray
|
||||
basic_os=${basic_os:-unicosmp}
|
||||
|
Reference in New Issue
Block a user