[RFC PATCH 09/15] config.sub: don’t override OS for blackfin, m68knommu, parisc.

[Zack Weinberg]

A similar issue to the previous patch: make the OS default for the CPU
aliases “blackfin,” “m68knommu,” and “parisc” actually be a default
and not an override.  There have been many OSes for PA/RISC.  Both
blackfin and m68knommu are definitely used in bare-metal configuration
as well as with an OS.  And in general, CPU aliases should behave as
much like the canonical CPU name as possible.
---
 config.sub                | 6 +++---
 testsuite/config-sub.data | 7 +++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/config.sub b/config.sub
index 5e21338..41f5d79 100755
--- a/config.sub
+++ b/config.sub
@@ -1093,7 +1093,7 @@ case $cpu-$vendor in
                ;;
        blackfin-*)
                cpu=bfin
-               basic_os=linux
+               basic_os=${basic_os:-linux}
                ;;
        c54x-*)
                cpu=tic54x
@@ -1116,7 +1116,7 @@ case $cpu-$vendor in
                ;;
        m68knommu-*)
                cpu=m68k
-               basic_os=linux
+               basic_os=${basic_os:-linux}
                ;;
        m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*)
                cpu=s12z
@@ -1126,7 +1126,7 @@ case $cpu-$vendor in
                ;;
        parisc-*)
                cpu=hppa
-               basic_os=linux
+               basic_os=${basic_os:-linux}
                ;;
        pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
                cpu=i586
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index 454c5a3..c4c092c 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -167,6 +167,8 @@ be64-none                                   
be64-unknown-none
 bfin                                           bfin-unknown-none
 bfin-elf                                       bfin-unknown-elf
 blackfin                                       bfin-unknown-linux-gnu
+blackfin-elf                                   bfin-unknown-elf
+blackfin-linux                                 bfin-unknown-linux-gnu
 bpf                                            bpf-unknown-none
 bpf-elf                                                bpf-unknown-elf
 c1                                             c1-convex-bsd
@@ -426,6 +428,8 @@ m68k-mint                                   m68k-atari-mint
 m68k-next-openstep3                            m68k-next-openstep3
 m68k-next-openstep4                            m68k-next-openstep4
 m68knommu                                      m68k-unknown-linux-gnu
+m68knommu-elf                                  m68k-unknown-elf
+m68knommu-linux                                        m68k-unknown-linux-gnu
 m88k                                           m88k-unknown-none
 m88k-omron                                     m88k-omron-luna
 m9s12z                                         s12z-unknown-none
@@ -617,6 +621,9 @@ ose68k                                              
m68k-ericsson-ose
 pa-hitachi                                     hppa1.1-hitachi-hiuxwe2
 paragon                                                i860-intel-osf
 parisc                                         hppa-unknown-linux-gnu
+parisc-hiux                                    hppa-hitachi-hiuxwe2
+parisc-hpux                                    hppa-hp-hpux
+parisc-linux                                   hppa-unknown-linux-gnu
 pbb                                            m68k-tti-sysv3
 pbd                                            sparc-tti-sysv3
 pc532                                          ns32k-pc532-none
-- 
2.43.2