After some thinking and discussion on the IRC channel the following
changes are made:
1) Allow for company tagging (or1k-company-linux). I see no reason why
we should disallow this
2) Make the default for 'or1k' and 'or1knd' be 'or1k-unknown-none' and
'or1knd-unknown-none'. Using just or1k and or1knd is ambiguous and you
should use 'or1k-elf' or 'or1k-linux' at the least.
3) Allow for custom or1k extensions. You can do 'or1k64-unknown-linux'
as a target even though or1k64 isn't defined. You have to specify
'-unknown' or add the extension to config.sub.
3 is really a side effect since I don't want to hardcode or1knd in too
many places.
diff --git a/config.guess b/config.guess
index 72625d4..26d0452 100755
--- a/config.guess
+++ b/config.guess
@@ -969,7 +969,7 @@ 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:*:*)
+ or1k*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
or32: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..82adfd3 100644
--- a/testsuite/config-guess.data
+++ b/testsuite/config-guess.data
@@ -39,6 +39,7 @@ 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
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
On Sat, Mar 8, 2014 at 1:56 PM, Christian Svensson <[email protected]> wrote:
> Since binutils contains code that targets or1knd, I'm going to submit
> the following to upstream for config.guess/config.sub.
> I'll hold until tomorrow before sending this to allow people to comment.
>
> From d9e94867afff1c5db93876ecbc58d73a0711e753 Mon Sep 17 00:00:00 2001
> From: Christian Svensson <[email protected]>
> Date: Sat, 8 Mar 2014 13:50:32 +0000
> Subject: [PATCH] Add or1knd as a supported architecture.
>
> * config.guess (or1knd:Linux:*:*): New.
> * config.sub (or1knd): Likewise.
> * testsuite/config-guess.data: Test for or1knd:Linux.
> * testsuite/config-sub.data: Tests for or1knd-linux, or1knd-elf,
> or1knd and or1k.
>
> Signed-off-by: Christian Svensson <[email protected]>
> ---
> ChangeLog | 8 ++++++++
> config.guess | 2 +-
> config.sub | 4 ++--
> testsuite/config-guess.data | 1 +
> testsuite/config-sub.data | 4 ++++
> 5 files changed, 16 insertions(+), 3 deletions(-)
>
> diff --git a/ChangeLog b/ChangeLog
> index bac2206..d035b54 100644
> --- a/ChangeLog
> +++ b/ChangeLog
> @@ -1,3 +1,11 @@
> +2014-03-08 Christian Svensson <[email protected]>
> +
> + * config.guess (or1knd:Linux:*:*): New.
> + * config.sub (or1knd): Likewise.
> + * testsuite/config-guess.data: Test for or1knd:Linux.
> + * testsuite/config-sub.data: Tests for or1knd-linux, or1knd-elf,
> + or1knd and or1k.
> +
> 2014-02-12 Urs Janssen <[email protected]>
>
> * config.guess (Linux|GNU|GNU/*): Strip extraneous whitespace
> diff --git a/config.guess b/config.guess
> index 72625d4..0a4df75 100755
> --- a/config.guess
> +++ b/config.guess
> @@ -969,7 +969,7 @@ 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:*:*)
> + or1k:Linux:*:* | or1knd:Linux:*:*)
> echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
> exit ;;
> or32:Linux:*:*)
> diff --git a/config.sub b/config.sub
> index 092cff0..dfe8582 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 \
> @@ -1594,7 +1594,7 @@ case $basic_machine in
> mips*-*)
> os=-elf
> ;;
> - or1k-*)
> + or1k-* | or1knd-*)
> os=-elf
> ;;
> or32-*)
> diff --git a/testsuite/config-guess.data b/testsuite/config-guess.data
> index a789be4..82adfd3 100644
> --- a/testsuite/config-guess.data
> +++ b/testsuite/config-guess.data
> @@ -39,6 +39,7 @@ 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
> 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..d257f5f 100644
> --- a/testsuite/config-sub.data
> +++ b/testsuite/config-sub.data
> @@ -159,8 +159,12 @@ nvptx nvptx-unknown-none
> open8-elf open8-unknown-elf
> open8 open8-unknown-none
> openrisc-linux or32-unknown-linux-gnu
> +or1k or1k-unknown-elf
> or1k-elf or1k-unknown-elf
> or1k-linux or1k-unknown-linux-gnu
> +or1knd or1knd-unknown-elf
> +or1knd-elf or1knd-unknown-elf
> +or1knd-linux or1knd-unknown-linux-gnu
> or32-linux or32-unknown-linux-gnu
> os400 powerpc-ibm-os400
> parisc hppa-unknown-linux-gnu
> --
> 1.7.10.4
>
> On Tue, Feb 12, 2013 at 1:15 PM, Jeremy Bennett
> <[email protected]> wrote:
>> On Tue, 2013-02-12 at 11:07 +0100, Christian Svensson wrote:
>>> On Mon, Feb 11, 2013 at 11:38 AM, Jonas Bonn <[email protected]> wrote:
>>> > On 02/11/2013 11:30 AM, Christian Svensson wrote:
>>> >>
>>> >> Hello,
>>> >>
>>> >> Arm64 are in the process of updating packages for their Debian port.
>>> >> It would probably be a good idea to add or1k at this point to ride the
>>> >> wave of autoconf updates that will follow.
>>> >> We discussed this patch a bit on IRC with the following inputs:
>>> >>
>>> >> 1) openrisc-* is an alias for or32
>>> >> Leave it since openrisc might be used somewhere, rip it out when or1k
>>> >> is really released and merged upstream.
>>> >>
>>> >> 2) or32-*
>>> >> Same as 1 although more probable that it's used.
>>> >>
>>> >> 3) or32-* defaults to -coff
>>> >> Again, people might use this behavior somewhere and it's not important
>>> >> to change right now.
>>> >>
>>> >> My plan is to send this patch upstream tomorrow, if you have any
>>> >> feedback or concerns please voice them! :-)
>>> >
>>> >
>>> > Looks good to me.
>>> > /Jonas
>>>
>>> Submitted to upstream.
>>
>> Hi Christian,
>>
>> Thanks for doing this.
>>
>> Best wishes,
>>
>>
>> Jeremy
>>
>> --
>> Tel: +44 (1590) 610184
>> Cell: +44 (7970) 676050
>> SkypeID: jeremybennett
>> Email: [email protected]
>> Web: www.embecosm.com
>>
>> _______________________________________________
>> OpenRISC mailing list
>> [email protected]
>> http://lists.openrisc.net/listinfo/openrisc
_______________________________________________
OpenRISC mailing list
[email protected]
http://lists.openrisc.net/listinfo/openrisc
