Hmm bummer. Sorry about that. Here's them all again, with that and
another hopefully "non controversial" one moved to the front.
Cheers,
John
On 08/12/18 21:34, Ben Elliston wrote:
On Sun, Aug 12, 2018 at 09:01:37PM -0400, John Ericson wrote:
I'm rebasing and retesting them all now, but you could just skip
that and apply the next one (on craynv), which is simple and makes
config.sub strictly more accepting, in the meantime.
No, that doesn't apply cleanly either.
Ben
From 22af8b94e9b892db3a82bfd1fd9004ee846dfc7a Mon Sep 17 00:00:00 2001
Message-Id:
<22af8b94e9b892db3a82bfd1fd9004ee846dfc7a.1534130227.git.John.Ericson@Obsidian.Systems>
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 30 Jul 2018 13:00:25 -0400
Subject: [PATCH 1/5] * config.sub: Move back craynv as a `basic_machine`
pattern * testsuite/config-sub.data: Add test for craynv
To: config-patches@gnu.org
---
ChangeLog | 10 ++++++++++
config.sub | 8 ++++----
testsuite/config-sub.data | 1 +
3 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index bce9d4b..770d4b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2018-08-08 John Ericson <john.ericson@obsidian.systems>
+
+ * config.sub: Move back craynv as a `basic_machine` pattern
+ * testsuite/config-sub.data: Add test for craynv
+
+ This is in fact a valid archecture, even though it also contains
+ "cray" the company name, and thus may look like some shorthand.
+ Adding a test to make sure we accept it (tested via the
+ ideompotency check).
+
2018-08-13 Ben Elliston <b...@gnu.org>
* testsuite/config-sub.data: Add some legacy test cases.
diff --git a/config.sub b/config.sub
index c1b397a..e4226de 100755
--- a/config.sub
+++ b/config.sub
@@ -238,10 +238,6 @@ case $1 in
basic_machine=j90-cray
os=unicos
;;
- craynv)
- basic_machine=craynv-cray
- os=unicosmp
- ;;
delta88)
basic_machine=m88k-motorola
os=sysv3
@@ -566,6 +562,10 @@ esac
case $basic_machine in
# Here we handle the default manufacturer of certain CPU types. It is
in
# some cases the only manufacturer, in others, it is the most popular.
+ craynv)
+ basic_machine=craynv-cray
+ os=${os:-unicosmp}
+ ;;
w89k)
basic_machine=hppa1.1-winbond
;;
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index aca8634..81472be 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -130,6 +130,7 @@ cr16-random-elf
cr16-unknown-elf
crds m68k-crds-unos
cris-linux cris-axis-linux-gnu
crisv32-linux crisv32-axis-linux-gnu
+craynv craynv-cray-unicosmp
csky-linux csky-unknown-linux-gnu
d10v d10v-unknown-none
d30v d30v-unknown-none
--
2.17.1
From cc5dbc1a535d69c87ba70822a1442d3ebb99d6fc Mon Sep 17 00:00:00 2001
Message-Id:
<cc5dbc1a535d69c87ba70822a1442d3ebb99d6fc.1534130227.git.John.Ericson@Obsidian.Systems>
In-Reply-To:
<22af8b94e9b892db3a82bfd1fd9004ee846dfc7a.1534130227.git.John.Ericson@Obsidian.Systems>
References:
<22af8b94e9b892db3a82bfd1fd9004ee846dfc7a.1534130227.git.John.Ericson@Obsidian.Systems>
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 9 Aug 2018 02:31:04 -0400
Subject: [PATCH 2/5] * config.sub: Combine match arms
To: config-patches@gnu.org
---
ChangeLog | 6 ++++++
config.sub | 16 ++++------------
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 770d4b1..71fd90a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-08-08 John Ericson <john.ericson@obsidian.systems>
+
+ * config.sub: Combine match arms
+
+ These need no special handling.
+
2018-08-08 John Ericson <john.ericson@obsidian.systems>
* config.sub: Move back craynv as a `basic_machine` pattern
diff --git a/config.sub b/config.sub
index e4226de..5795377 100755
--- a/config.sub
+++ b/config.sub
@@ -643,6 +643,7 @@ case $basic_machine in
| le32 | le64 \
| lm32 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
+ | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip \
| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
@@ -691,7 +692,7 @@ case $basic_machine in
| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
| visium \
| wasm32 \
- | x86 | xc16x | xstormy16 | xtensa \
+ | x86 | xc16x | xstormy16 | xgate | xtensa \
| z8k | z80)
basic_machine=$basic_machine-unknown
;;
@@ -707,11 +708,6 @@ case $basic_machine in
leon|leon[3-9])
basic_machine=sparc-$basic_machine
;;
- m6811-* | m68hc11-* | m6812-* | m68hc12-* | m68hcs12x-* | nvptx-* |
picochip-*)
- ;;
- m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
- basic_machine=$basic_machine-unknown
- ;;
m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
;;
m9s12z | m68hcs12z | hcs12z | s12z)
@@ -726,11 +722,6 @@ case $basic_machine in
strongarm | thumb | xscale)
basic_machine=arm-unknown
;;
- xgate)
- basic_machine=$basic_machine-unknown
- ;;
- xgate-*)
- ;;
xscaleeb)
basic_machine=armeb-unknown
;;
@@ -776,6 +767,7 @@ case $basic_machine in
| lm32-* \
| m32c-* | m32r-* | m32rle-* \
| m5200-* | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* |
v70-* | w65-* \
+ | m6811-* | m68hc11-* | m6812-* | m68hc12-* | m68hcs12x-* | nvptx-* |
picochip-* \
| m88110-* | m88k-* | maxq-* | mb-* | mcore-* | mep-* | metag-* \
| microblaze-* | microblazeel-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
@@ -834,7 +826,7 @@ case $basic_machine in
| visium-* \
| wasm32-* \
| we32k-* \
- | x86-* | x86_64-* | xc16x-* | xps100-* \
+ | x86-* | x86_64-* | xc16x-* | xgate-* | xps100-* \
| xstormy16-* | xtensa*-* \
| ymp-* \
| z8k-* | z80-*)
--
2.17.1
From a3e25265361051bb69fd6d2425106972a2e6e5ce Mon Sep 17 00:00:00 2001
Message-Id:
<a3e25265361051bb69fd6d2425106972a2e6e5ce.1534130227.git.John.Ericson@Obsidian.Systems>
In-Reply-To:
<cc5dbc1a535d69c87ba70822a1442d3ebb99d6fc.1534130227.git.John.Ericson@Obsidian.Systems>
References:
<22af8b94e9b892db3a82bfd1fd9004ee846dfc7a.1534130227.git.John.Ericson@Obsidian.Systems>
<cc5dbc1a535d69c87ba70822a1442d3ebb99d6fc.1534130227.git.John.Ericson@Obsidian.Systems>
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 22 Jun 2018 17:40:14 -0400
Subject: [PATCH 3/5] * config.sub: Make a few `basic_machine's short-hands
only.
To: config-patches@gnu.org
---
ChangeLog | 9 +++++
config.sub | 99 ++++++++++++++++++++++++++++++------------------------
2 files changed, 64 insertions(+), 44 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 71fd90a..0ce00a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2018-08-08 John Ericson <john.ericson@obsidian.systems>
+
+ * config.sub: Make a few `basic_machine's short-hands only.
+
+ These are all compant names or somilar. That makes them unsuitable
+ to be `basic_machine`a in their own right as the arch part is
+ blatantly missing. We keep them as single-component aliases only
+ for historical compatability.
+
2018-08-08 John Ericson <john.ericson@obsidian.systems>
* config.sub: Combine match arms
diff --git a/config.sub b/config.sub
index 5795377..9ec4b2b 100755
--- a/config.sub
+++ b/config.sub
@@ -190,6 +190,14 @@ case $1 in
basic_machine=m68010-adobe
os=scout
;;
+ alliant)
+ basic_machine=fx80-alliant
+ os=
+ ;;
+ altos | altos3068)
+ basic_machine=m68k-altos
+ os=
+ ;;
am29k)
basic_machine=a29k-none
os=bsd
@@ -234,10 +242,34 @@ case $1 in
basic_machine=arm-unknown
os=cegcc
;;
+ convex-c1)
+ basic_machine=c1-convex
+ os=bsd
+ ;;
+ convex-c2)
+ basic_machine=c2-convex
+ os=bsd
+ ;;
+ convex-c32)
+ basic_machine=c32-convex
+ os=bsd
+ ;;
+ convex-c34)
+ basic_machine=c34-convex
+ os=bsd
+ ;;
+ convex-c38)
+ basic_machine=c38-convex
+ os=bsd
+ ;;
cray)
basic_machine=j90-cray
os=unicos
;;
+ crds | unos)
+ basic_machine=m68k-crds
+ os=
+ ;;
delta88)
basic_machine=m88k-motorola
os=sysv3
@@ -454,10 +486,18 @@ case $1 in
basic_machine=m68k-bull
os=sysv2
;;
+ st2000)
+ basic_machine=m68k-tandem
+ os=
+ ;;
stratus)
basic_machine=i860-stratus
os=sysv4
;;
+ sun2)
+ basic_machine=m68000-sun
+ os=
+ ;;
sun2os3)
basic_machine=m68000-sun
os=sunos3
@@ -466,6 +506,10 @@ case $1 in
basic_machine=m68000-sun
os=sunos4
;;
+ sun3)
+ basic_machine=m68k-sun
+ os=
+ ;;
sun3os3)
basic_machine=m68k-sun
os=sunos3
@@ -474,6 +518,10 @@ case $1 in
basic_machine=m68k-sun
os=sunos4
;;
+ sun4)
+ basic_machine=sparc-sun
+ os=
+ ;;
sun4os3)
basic_machine=sparc-sun
os=sunos3
@@ -486,6 +534,10 @@ case $1 in
basic_machine=sparc-sun
os=solaris2
;;
+ sun386 | sun386i | roadrunner)
+ basic_machine=i386-sun
+ os=
+ ;;
sv1)
basic_machine=sv1-cray
os=unicos
@@ -566,6 +618,9 @@ case $basic_machine in
basic_machine=craynv-cray
os=${os:-unicosmp}
;;
+ fx80)
+ basic_machine=fx80-alliant
+ ;;
w89k)
basic_machine=hppa1.1-winbond
;;
@@ -843,12 +898,6 @@ case $basic_machine in
3b*)
basic_machine=we32k-att
;;
- alliant | fx80)
- basic_machine=fx80-alliant
- ;;
- altos | altos3068)
- basic_machine=m68k-altos
- ;;
amd64)
basic_machine=x86_64-pc
;;
@@ -879,33 +928,10 @@ case $basic_machine in
basic_machine=c90-cray
os=${os:-unicos}
;;
- convex-c1)
- basic_machine=c1-convex
- os=bsd
- ;;
- convex-c2)
- basic_machine=c2-convex
- os=bsd
- ;;
- convex-c32)
- basic_machine=c32-convex
- os=bsd
- ;;
- convex-c34)
- basic_machine=c34-convex
- os=bsd
- ;;
- convex-c38)
- basic_machine=c38-convex
- os=bsd
- ;;
cr16 | cr16-*)
basic_machine=cr16-unknown
os=${os:-elf}
;;
- crds | unos)
- basic_machine=m68k-crds
- ;;
crisv32 | crisv32-* | etraxfs*)
basic_machine=crisv32-axis
;;
@@ -1211,24 +1237,9 @@ case $basic_machine in
spur)
basic_machine=spur-unknown
;;
- st2000)
- basic_machine=m68k-tandem
- ;;
strongarm-* | thumb-*)
basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
- sun2)
- basic_machine=m68000-sun
- ;;
- sun3 | sun3-*)
- basic_machine=m68k-sun
- ;;
- sun4)
- basic_machine=sparc-sun
- ;;
- sun386 | sun386i | roadrunner)
- basic_machine=i386-sun
- ;;
tile*-*)
;;
tile*)
--
2.17.1
From 6cd9cfba408add206c64921dbc9a10532f23275d Mon Sep 17 00:00:00 2001
Message-Id:
<6cd9cfba408add206c64921dbc9a10532f23275d.1534130227.git.John.Ericson@Obsidian.Systems>
In-Reply-To:
<a3e25265361051bb69fd6d2425106972a2e6e5ce.1534130227.git.John.Ericson@Obsidian.Systems>
References:
<22af8b94e9b892db3a82bfd1fd9004ee846dfc7a.1534130227.git.John.Ericson@Obsidian.Systems>
<cc5dbc1a535d69c87ba70822a1442d3ebb99d6fc.1534130227.git.John.Ericson@Obsidian.Systems>
<a3e25265361051bb69fd6d2425106972a2e6e5ce.1534130227.git.John.Ericson@Obsidian.Systems>
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 30 Jul 2018 13:08:12 -0400
Subject: [PATCH 4/5] * config.sub: Move some erroneous `foo-*` to be
1-comp aliases
To: config-patches@gnu.org
---
ChangeLog | 30 ++++++++++++++++++++++++++++++
config.sub | 25 +++++++++++++------------
2 files changed, 43 insertions(+), 12 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0ce00a2..fc3ddb6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,33 @@
+2018-08-08 John Ericson <john.ericson@obsidian.systems>
+
+ * config.sub: Move some erroneous `foo-*` to be 1-comp aliases
+
+ The `foo-*` versions were introduced in
+ 5347fada50a3a3e689c2654515145457af92965e
+ 1bf0fb0812846ace88f93937e90162e2835c6b11
+ ab3a1065d559246c2c0422513e04369f49639c62, and then right after
+ augmented with the `foo` versions in
+ 1d62957bb23205508ea3eb7c790e431646fad6ae right after.
+
+ I think that commit didn't go far enough, in in that the original
+ `foo-*` verions should have also been removed:
+
+ - "foo" is closer to a company name than arch name, so they are
+ in no way a proper 2-component basic name. That would mean
+ there's one companny name in the original `basic_machine`
+ that's ignored, and the other that is defaulted with some arch.
+ That seems arbitrary.
+
+ - "foo-*" being radically normalized, but "foo" not being, is
+ just inconsistent.
+
+ In addition, I also move the rest to be single component aliases
+ as they are company names or product lines.
+
+ This is a breaking change, but not one I'd expect to matter since
+ all these machines are ancient and the tests still pass without
+ modification.
+
2018-08-08 John Ericson <john.ericson@obsidian.systems>
* config.sub: Make a few `basic_machine's short-hands only.
diff --git a/config.sub b/config.sub
index 9ec4b2b..3792143 100755
--- a/config.sub
+++ b/config.sub
@@ -206,6 +206,10 @@ case $1 in
basic_machine=580-amdahl
os=sysv
;;
+ amiga)
+ basic_machine=m68k-unknown
+ os=
+ ;;
amigaos | amigados)
basic_machine=m68k-unknown
os=amigaos
@@ -270,6 +274,12 @@ case $1 in
basic_machine=m68k-crds
os=
;;
+ da3)
+ basic_machine=m68k-da30
+ ;;
+ decstation | decstation-3100 | pmax | pmin | dec3100 |
decstatn)
+ basic_machine=mips-dec
+ ;;
delta88)
basic_machine=m88k-motorola
os=sysv3
@@ -314,6 +324,9 @@ case $1 in
basic_machine=m88k-harris
os=sysv3
;;
+ hp300)
+ basic_machine=m68k-hp
+ ;;
hp300bsd)
basic_machine=m68k-hp
os=bsd
@@ -904,9 +917,6 @@ case $basic_machine in
amd64-*)
basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
- amiga | amiga-*)
- basic_machine=m68k-unknown
- ;;
blackfin-*)
basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'`
os=linux
@@ -942,12 +952,6 @@ case $basic_machine in
basic_machine=crx-unknown
os=${os:-elf}
;;
- da30 | da30-*)
- basic_machine=m68k-da30
- ;;
- decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 |
decstatn)
- basic_machine=mips-dec
- ;;
decsystem10* | dec10*)
basic_machine=pdp10-dec
os=tops10
@@ -993,9 +997,6 @@ case $basic_machine in
basic_machine=hppa1.1-hitachi
os=hiuxwe2
;;
- hp300-*)
- basic_machine=m68k-hp
- ;;
hp3k9[0-9][0-9] | hp9[0-9][0-9])
basic_machine=hppa1.0-hp
;;
--
2.17.1
From f64980a061ffc4bf895b64a1511c6141f611c023 Mon Sep 17 00:00:00 2001
Message-Id:
<f64980a061ffc4bf895b64a1511c6141f611c023.1534130227.git.John.Ericson@Obsidian.Systems>
In-Reply-To:
<6cd9cfba408add206c64921dbc9a10532f23275d.1534130227.git.John.Ericson@Obsidian.Systems>
References:
<22af8b94e9b892db3a82bfd1fd9004ee846dfc7a.1534130227.git.John.Ericson@Obsidian.Systems>
<cc5dbc1a535d69c87ba70822a1442d3ebb99d6fc.1534130227.git.John.Ericson@Obsidian.Systems>
<a3e25265361051bb69fd6d2425106972a2e6e5ce.1534130227.git.John.Ericson@Obsidian.Systems>
<6cd9cfba408add206c64921dbc9a10532f23275d.1534130227.git.John.Ericson@Obsidian.Systems>
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 22 Jun 2018 17:40:14 -0400
Subject: [PATCH 5/5] * config.sub: Deduplicate `basic_machine` by filling
in a stub vendor.
To: config-patches@gnu.org
---
ChangeLog | 24 +++++++
config.sub | 203 +++++++++++++----------------------------------------
2 files changed, 74 insertions(+), 153 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index fc3ddb6..c52d412 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+2018-07-23 John Ericson <john.ericson@obsidian.systems>
+
+ * config.sub: Deduplicate `basic_machine` by filling in a stub vendor.
+
+ Instead of having both `foo` and `foo-*` as redundant patterns, we
+ always make sure basic_machine is initialized in the form `*-*` by
+ adding a trailing `-unknown` where needed.
+
+ There was one complication to doing this that should be noted. For
+ x86, the default is `-pc` instead of `-unknown`. That means we
+ can't just always append 1-component `basic_machine`s with
+ `-unknown` and assume 2-component everywhere. Furthermore, an
+ explicitly passed `*-unknown` for x86 is not normalized by that
+ rule but instead left as-is. That means we cannot just append and
+ also conditionally replace `-unknown` with `-pc` as a final step,
+ either.
+
+ The solution is to continue duplicating the rules which would
+ output a `(i386|x86_64)-pc` so we can ensure the special case is
+ maintained, while defaulting to `-unknown` otherwise so the `*-*`
+ rules are sufficient. This isn't ideal, but at least most of the
+ `basic_machine` rules aren't implicated and can still be
+ deduplicated.
+
2018-08-08 John Ericson <john.ericson@obsidian.systems>
* config.sub: Move some erroneous `foo-*` to be 1-comp aliases
diff --git a/config.sub b/config.sub
index 3792143..35cdcaa 100755
--- a/config.sub
+++ b/config.sub
@@ -623,15 +623,36 @@ case $1 in
;;
esac
+case $basic_machine in
+ *-*)
+ ;;
+ # We use `pc' rather than `unknown'
+ # because (1) that's what they normally are, and
+ # (2) the word "unknown" tends to confuse beginning users.
+ i*86 | x86_64)
+ basic_machine=$basic_machine-pc
+ ;;
+ # These rules are duplicated from below for sake of the special case
above;
+ # i.e. things that normalized to x86 arches should also default to "pc"
+ pc98)
+ basic_machine=i386-pc
+ ;;
+ x64 | amd64)
+ basic_machine=x86_64-pc
+ ;;
+ *)
+ basic_machine=$basic_machine-unknown
+esac
+
# Decode aliases for certain CPU-COMPANY combinations.
case $basic_machine in
# Here we handle the default manufacturer of certain CPU types. It is
in
# some cases the only manufacturer, in others, it is the most popular.
- craynv)
+ craynv-unknown)
basic_machine=craynv-cray
os=${os:-unicosmp}
;;
- fx80)
+ fx80-unknown)
basic_machine=fx80-alliant
;;
w89k)
@@ -643,31 +664,31 @@ case $basic_machine in
op60c)
basic_machine=hppa1.1-oki
;;
- romp)
+ romp-unknown)
basic_machine=romp-ibm
;;
- mmix)
+ mmix-unknown)
basic_machine=mmix-knuth
;;
- rs6000)
+ rs6000-unknown)
basic_machine=rs6000-ibm
;;
- vax)
+ vax-unknown)
basic_machine=vax-dec
;;
- pdp11)
+ pdp11-unknown)
basic_machine=pdp11-dec
;;
- we32k)
+ we32k-unknown)
basic_machine=we32k-att
;;
- cydra)
+ cydra-unknown)
basic_machine=cydra-cydrome
;;
i370-ibm* | ibm*)
basic_machine=i370-ibm
;;
- orion)
+ orion-unknown)
basic_machine=orion-highlevel
;;
orion105)
@@ -679,131 +700,10 @@ case $basic_machine in
pmac | pmac-mpw)
basic_machine=powerpc-apple
;;
- xps | xps100)
+ xps-unknown | xps100-unknown)
basic_machine=xps100-honeywell
;;
- # Recognize the basic CPU types without company name.
- # Some are omitted here because they have special meanings below.
- 1750a | 580 \
- | a29k \
- | aarch64 | aarch64_be \
- | abacus \
- | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
- | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] |
alpha64pca5[67] \
- | am33_2.0 \
- | arc | arceb \
- | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv6m |
armv[78][arm] \
- | avr | avr32 \
- | asmjs \
- | ba \
- | be32 | be64 \
- | bfin \
- | c4x | c8051 | clipper | csky \
- | d10v | d30v | dlx | dsp16xx \
- | e2k | epiphany \
- | fido | fr30 | frv | ft32 \
- | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
- | hexagon \
- | i370 | i860 | i960 | ia16 | ia64 \
- | ip2k | iq2000 \
- | k1om \
- | le32 | le64 \
- | lm32 \
- | m32c | m32r | m32rle | m68000 | m68k | m88k \
- | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip \
- | maxq | mb | microblaze | microblazeel | mcore | mep | metag \
- | mips | mipsbe | mipseb | mipsel | mipsle \
- | mips16 \
- | mips64 | mips64el \
- | mips64octeon | mips64octeonel \
- | mips64orion | mips64orionel \
- | mips64r5900 | mips64r5900el \
- | mips64vr | mips64vrel \
- | mips64vr4100 | mips64vr4100el \
- | mips64vr4300 | mips64vr4300el \
- | mips64vr5000 | mips64vr5000el \
- | mips64vr5900 | mips64vr5900el \
- | mipsisa32 | mipsisa32el \
- | mipsisa32r2 | mipsisa32r2el \
- | mipsisa32r6 | mipsisa32r6el \
- | mipsisa64 | mipsisa64el \
- | mipsisa64r2 | mipsisa64r2el \
- | mipsisa64r6 | mipsisa64r6el \
- | mipsisa64sb1 | mipsisa64sb1el \
- | mipsisa64sr71k | mipsisa64sr71kel \
- | mipsr5900 | mipsr5900el \
- | mipstx39 | mipstx39el \
- | mn10200 | mn10300 \
- | moxie \
- | mt \
- | msp430 \
- | nds32 | nds32le | nds32be \
- | nfp \
- | nios | nios2 | nios2eb | nios2el \
- | ns16k | ns32k \
- | open8 | or1k | or1knd | or32 \
- | pdp10 | pj | pjl \
- | powerpc | powerpc64 | powerpc64le | powerpcle \
- | pru \
- | pyramid \
- | riscv | riscv32 | riscv64 \
- | rl78 | rx \
- | score \
- | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb |
shbe | shle | sh[1234]le | sh[23]ele \
- | sh64 | sh64le \
- | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet |
sparclite \
- | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
- | spu \
- | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
- | ubicom32 \
- | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
- | visium \
- | wasm32 \
- | x86 | xc16x | xstormy16 | xgate | xtensa \
- | z8k | z80)
- basic_machine=$basic_machine-unknown
- ;;
- c54x)
- basic_machine=tic54x-unknown
- ;;
- c55x)
- basic_machine=tic55x-unknown
- ;;
- c6x)
- basic_machine=tic6x-unknown
- ;;
- leon|leon[3-9])
- basic_machine=sparc-$basic_machine
- ;;
- m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65)
- ;;
- m9s12z | m68hcs12z | hcs12z | s12z)
- basic_machine=s12z-unknown
- ;;
- m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*)
- basic_machine=s12z-`echo "$basic_machine" | sed 's/^[^-]*-//'`
- ;;
- ms1)
- basic_machine=mt-unknown
- ;;
- strongarm | thumb | xscale)
- basic_machine=arm-unknown
- ;;
- xscaleeb)
- basic_machine=armeb-unknown
- ;;
-
- xscaleel)
- basic_machine=armel-unknown
- ;;
-
- # We use `pc' rather than `unknown'
- # because (1) that's what they normally are, and
- # (2) the word "unknown" tends to confuse beginning users.
- i*86 | x86_64)
- basic_machine=$basic_machine-pc
- ;;
# Recognize the basic CPU types with company name.
1750a-* | 580-* \
| a29k-* \
@@ -899,10 +799,6 @@ case $basic_machine in
| ymp-* \
| z8k-* | z80-*)
;;
- # Recognize the basic CPU types without company name, with glob match.
- xtensa*)
- basic_machine=$basic_machine-unknown
- ;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
@@ -938,14 +834,17 @@ case $basic_machine in
basic_machine=c90-cray
os=${os:-unicos}
;;
- cr16 | cr16-*)
+ cr16-*)
basic_machine=cr16-unknown
os=${os:-elf}
;;
- crisv32 | crisv32-* | etraxfs*)
+ crds | unos)
+ basic_machine=m68k-crds
+ ;;
+ crisv32-* | etraxfs*)
basic_machine=crisv32-axis
;;
- cris | cris-* | etrax*)
+ cris-* | etrax*)
basic_machine=cris-axis
;;
crx)
@@ -964,7 +863,7 @@ case $basic_machine in
| 3300-motorola | delta-motorola)
basic_machine=m68k-motorola
;;
- dpx20 | dpx20-*)
+ dpx20-*)
basic_machine=rs6000-bull
os=${os:-bosx}
;;
@@ -1063,6 +962,10 @@ case $basic_machine in
basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'`
os=linux
;;
+ m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*)
+ basic_machine=s12z-`echo "$basic_machine" | sed 's/^[^-]*-//'`
+ os=${os:-none}
+ ;;
microblaze*)
basic_machine=microblaze-xilinx
;;
@@ -1138,12 +1041,9 @@ case $basic_machine in
pbb)
basic_machine=m68k-tti
;;
- pc532 | pc532-*)
+ pc532-*)
basic_machine=ns32k-pc532
;;
- pc98)
- basic_machine=i386-pc
- ;;
pc98-*)
basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
@@ -1218,15 +1118,15 @@ case $basic_machine in
sb1el)
basic_machine=mipsisa64sb1el-unknown
;;
- sde)
+ sde-unknown)
basic_machine=mipsisa32-sde
os=${os:-elf}
;;
- sequent)
+ sequent-unknown)
basic_machine=i386-sequent
;;
- sh5el)
- basic_machine=sh5le-unknown
+ sh5e[lb]-*)
+ basic_machine=`echo "$basic_machine" | sed
's/^\(sh.\)e\(.\)-/\1\2e-/'`
;;
sh5el-*)
basic_machine=sh5le-`echo "$basic_machine" | sed 's/^[^-]*-//'`
@@ -1242,9 +1142,6 @@ case $basic_machine in
basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
tile*-*)
- ;;
- tile*)
- basic_machine=$basic_machine-unknown
os=${os:-linux-gnu}
;;
tx39)
@@ -1267,8 +1164,8 @@ case $basic_machine in
basic_machine=hppa1.1-winbond
os=proelf
;;
- x64)
- basic_machine=x86_64-pc
+ x64-*)
+ basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'`
;;
xscale-* | xscalee[bl]-*)
basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'`
--
2.17.1
_______________________________________________
config-patches mailing list
config-patches@gnu.org
https://lists.gnu.org/mailman/listinfo/config-patches
