[OpenRISC] Fwd [autoconf]: [PATCH] Better OpenRISC guesses, support or1knd

[Christian Svensson]

Hi,

FYI: this patch was sent to config.git today. It's a slightly modified
version of the one we discussed here on the mailing list earlier.

This patch adds more broad support to extensions of or1k (like or1knd) and
also changes so that openrisc:Linux defaults to or1k-unknown-linux-${LIBC}

Regards,
Christian

* config.guess (openrisc:Linux:*:*): New.
* config.guess (or1k*:Linux:*:*): Modified for or1knd.
* config.sub (or1knd): New.
* testsuite/config-guess.data: Test for or1knd:Linux,
* openrisc:Linux.
* testsuite/config-sub.data: Tests for or1knd-linux, or1knd-elf,
or1knd and or1k.
---
ChangeLog | 9 +++++++++
config.guess | 6 +++---
config.sub | 6 ++----
testsuite/config-guess.data | 2 ++
testsuite/config-sub.data | 13 +++++++++++++
5 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bac2206..31baa8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
[phone] Christian Svensson <***@cmd.nu>
+
+ * config.guess (openrisc:Linux:*:*): New.
+ * config.guess (or1k*:Linux:*:*): Modified for or1knd.
+ * config.sub (or1knd): New.
+ * testsuite/config-guess.data: Test for or1knd:Linux,
openrisc:Linux.
+ * testsuite/config-sub.data: Tests for or1knd-linux, or1knd-elf,
+ or1knd and or1k.
+
2014-02-12 Urs Janssen <***@akk.org>

* config.guess (Linux|GNU|GNU/*): Strip extraneous whitespace
diff --git a/config.guess b/config.guess
index 72625d4..d680959 100755
--- a/config.guess
+++ b/config.guess
@@ -969,10 +969,10 @@ EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit;
}
;;
- or1k:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ openrisc*:Linux:*:*)
+ echo or1k-unknown-linux-${LIBC}
exit ;;
- or32:Linux:*:*)
+ or32:Linux:*:* | or1k*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
padre:Linux:*:*)
diff --git a/config.sub b/config.sub
index 092cff0..f2a3a14 100755
--- a/config.sub
+++ b/config.sub
@@ -297,7 +297,7 @@ case $basic_machine in
| nios | nios2 | nios2eb | nios2el \
| ns16k | ns32k \
| open8 \
- | or1k | or32 \
+ | or1k | or1knd | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
| pyramid \
@@ -415,6 +415,7 @@ case $basic_machine in
| nios-* | nios2-* | nios2eb-* | nios2el-* \
| none-* | np1-* | ns16k-* | ns32k-* \
| open8-* \
+ | or1k*-* \
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
@@ -1594,9 +1595,6 @@ case $basic_machine in
mips*-*)
os=-elf
;;
- or1k-*)
- os=-elf
- ;;
or32-*)
os=-coff
;;
diff --git a/testsuite/config-guess.data b/testsuite/config-guess.data
index a789be4..25ecd34 100644
--- a/testsuite/config-guess.data
+++ b/testsuite/config-guess.data
@@ -38,7 +38,9 @@ NEO-1 1.0 NONSTOP_KERNEL ignored
neo-tandem-nsk1.0
NSE-1 1.0 NONSTOP_KERNEL ignored nse-tandem-nsk1.0
NSE-N 1.0 NONSTOP_KERNEL ignored nse-tandem-nsk1.0
NSE-NN 1.0 NONSTOP_KERNEL ignored nse-tandem-nsk1.0
+openrisc ignored Linux ignored
or1k-unknown-linux-gnu
or1k ignored Linux ignored
or1k-unknown-linux-gnu
+or1knd ignored Linux ignored
or1knd-unknown-linux-gnu
or32 ignored Linux ignored
or32-unknown-linux-gnu
padre 2.6.15 Linux ignored
sparc-unknown-linux-gnu
pc 1.0 ignored ignored i586-pc-msdosdjgpp
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index 20dba9b..b05a6f3 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -159,8 +159,21 @@ nvptx nvptx-unknown-none
open8-elf open8-unknown-elf
open8 open8-unknown-none
openrisc-linux or32-unknown-linux-gnu
+or1k or1k-unknown-none
+or1k-company-elf or1k-company-elf
+or1k-company-linux or1k-company-linux-gnu
or1k-elf or1k-unknown-elf
or1k-linux or1k-unknown-linux-gnu
+or1k-linux-gnu or1k-unknown-linux-gnu
+or1k-linux-uclibc or1k-unknown-linux-uclibc
+or1knd or1knd-unknown-none
+or1knd-company-elf or1knd-company-elf
+or1knd-company-linux or1knd-company-linux-gnu
+or1knd-elf or1knd-unknown-elf
+or1knd-linux or1knd-unknown-linux-gnu
+or1knd-linux-gnu or1knd-unknown-linux-gnu
+or1knd-linux-uclibc or1knd-unknown-linux-uclibc
+or1k64-unknown-linux or1k64-unknown-linux-gnu
or32-linux or32-unknown-linux-gnu
os400 powerpc-ibm-os400
parisc hppa-unknown-linux-gnu
--
1.7.10.4