config.sub had a rule that os=sunos* implies vendor=sun unless the
vendor has already been set for some other reason, but no such rule
for os=solaris*, and that meant `./config.sub sparc-solaris2` was
inconsistent with what you’d get from config.guess on that system.
Add the missing rule.
Unlike the previous patch, this changes config.sub output for some
systems still actually in use today, but hardly anything looks at
the vendor field unless the OS field is something super generic like
“bsd” or “sysv”, so I think we can get away with it.
This patch also adds tests for the mapping of ‘sunos5’ to ‘solaris2’
and ‘solaris1’ to ‘sunos4’, which is logically unrelated *except*
that some of those test cases will fail in the absence of the above
change.
---
config.sub | 2 +-
testsuite/config-sub.data | 10 ++++++++--
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/config.sub b/config.sub
index 2ebbed7..e1bb431 100755
--- a/config.sub
+++ b/config.sub
@@ -2237,7 +2237,7 @@ case $vendor in
*-riscix*)
vendor=acorn
;;
- *-sunos*)
+ *-sunos* | *-solaris*)
vendor=sun
;;
*-cnk* | *-aix*)
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index aab6419..9357454 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -770,6 +770,12 @@ shle-elf shle-unknown-elf
simso-wrs sparclite-wrs-vxworks
sparc sparc-sun-sunos4.1.1
sparc-haiku sparc-unknown-haiku
+sparc-solaris sparc-sun-solaris2
+sparc-solaris1 sparc-sun-sunos4
+sparc-sunos sparc-sun-sunos
+sparc-sunos4 sparc-sun-sunos4
+sparc-sunos5 sparc-sun-solaris2
+sparc-sunos6 sparc-sun-solaris3
sparc-zephyr sparc-unknown-zephyr
sparc64 sparc64-unknown-none
sparc64-linux sparc64-unknown-linux-gnu
@@ -777,7 +783,7 @@ sparc64b
sparc64b-unknown-none
sparc64b-linux sparc64b-unknown-linux-gnu
sparc64v sparc64v-unknown-none
sparc64v-elf sparc64v-unknown-elf
-sparc64v-solaris2.9 sparc64v-unknown-solaris2.9
+sparc64v-solaris2.9 sparc64v-sun-solaris2.9
sparc86x sparc86x-unknown-none
sparclet sparclet-unknown-none
sparclite sparclite-unknown-none
@@ -787,7 +793,7 @@ sparcv9
sparcv9-unknown-none
sparcv9b sparcv9b-unknown-none
sparcv9v sparcv9v-unknown-none
sparcv9v-elf sparcv9v-unknown-elf
-sparcv9v-solaris2.9 sparcv9v-unknown-solaris2.9
+sparcv9v-solaris2.9 sparcv9v-sun-solaris2.9
sps7 m68k-bull-sysv2
spu spu-unknown-elf
spu-elf spu-unknown-elf
--
2.43.2
