Re: [PATCH] * config.sub: Deduplicate `basic_machine` by always allowing the vendor

2018-08-12 Thread Ben Elliston
On Mon, Aug 13, 2018 at 12:12:56AM -0400, John Ericson wrote:

> Hmm bummer. Sorry about that. Here's them all again, with that and
> another hopefully "non controversial" one moved to the front.

0001 and 0002 have been applied.

0003 fails to recognise decstation-3100, whereas it did before.

Ben


signature.asc
Description: PGP signature
___
config-patches mailing list
config-patches@gnu.org
https://lists.gnu.org/mailman/listinfo/config-patches


Re: [PATCH] * config.sub: Deduplicate `basic_machine` by always allowing the vendor

2018-08-12 Thread John Ericson
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 
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  
+
+   * 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  
 
* 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: 

In-Reply-To: 
<22af8b94e9b892db3a82bfd1fd9004ee846dfc7a.1534130227.git.John.Ericson@Obsidian.Systems>
References: 
<22af8b94e9b892db3a82bfd1fd9004ee846dfc7a.1534130227.git.John.Ericson@Obsidian.Systems>
From: John Ericson 
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  
+
+   * config.sub: Combine match arms
+
+   These need no special handling.
+
 2018-08-08  John Ericson  
 
* 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)