* [PATCH] openrisc: Support both old (or32) and new (or1k) toolchain
@ 2014-09-08 21:00 Guenter Roeck
2014-09-19 4:56 ` Guenter Roeck
0 siblings, 1 reply; 5+ messages in thread
From: Guenter Roeck @ 2014-09-08 21:00 UTC (permalink / raw)
To: Jonas Bonn; +Cc: linux, linux-kernel, Guenter Roeck, Stefan Kristiansson
The output file format for openrisc has changed from "elf32-or32"
to "elf32-or1k" when using the or1k instead of the older or32 toochain.
Select the correct output format automatically to be able to compile
the kernel with both toolchain variants.
Cc: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
Candidate for -stable ?
arch/openrisc/kernel/vmlinux.lds.S | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/arch/openrisc/kernel/vmlinux.lds.S b/arch/openrisc/kernel/vmlinux.lds.S
index 2d69a85..1c5d21a 100644
--- a/arch/openrisc/kernel/vmlinux.lds.S
+++ b/arch/openrisc/kernel/vmlinux.lds.S
@@ -30,7 +30,13 @@
#include <asm/cache.h>
#include <asm-generic/vmlinux.lds.h>
-OUTPUT_FORMAT("elf32-or32", "elf32-or32", "elf32-or32")
+#ifdef __OR1K__
+#define __OUTPUT_FORMAT "elf32-or1k"
+#else
+#define __OUTPUT_FORMAT "elf32-or32"
+#endif
+
+OUTPUT_FORMAT(__OUTPUT_FORMAT, __OUTPUT_FORMAT, __OUTPUT_FORMAT)
jiffies = jiffies_64 + 4;
SECTIONS
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] openrisc: Support both old (or32) and new (or1k) toolchain
2014-09-08 21:00 [PATCH] openrisc: Support both old (or32) and new (or1k) toolchain Guenter Roeck
@ 2014-09-19 4:56 ` Guenter Roeck
2014-09-22 2:53 ` Stefan Kristiansson
0 siblings, 1 reply; 5+ messages in thread
From: Guenter Roeck @ 2014-09-19 4:56 UTC (permalink / raw)
To: Jonas Bonn; +Cc: linux, linux-kernel, Stefan Kristiansson
ping ... comments / feedback anyone ?
Guenter
On 09/08/2014 02:00 PM, Guenter Roeck wrote:
> The output file format for openrisc has changed from "elf32-or32"
> to "elf32-or1k" when using the or1k instead of the older or32 toochain.
> Select the correct output format automatically to be able to compile
> the kernel with both toolchain variants.
>
> Cc: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>
> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
> ---
> Candidate for -stable ?
>
> arch/openrisc/kernel/vmlinux.lds.S | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/arch/openrisc/kernel/vmlinux.lds.S b/arch/openrisc/kernel/vmlinux.lds.S
> index 2d69a85..1c5d21a 100644
> --- a/arch/openrisc/kernel/vmlinux.lds.S
> +++ b/arch/openrisc/kernel/vmlinux.lds.S
> @@ -30,7 +30,13 @@
> #include <asm/cache.h>
> #include <asm-generic/vmlinux.lds.h>
>
> -OUTPUT_FORMAT("elf32-or32", "elf32-or32", "elf32-or32")
> +#ifdef __OR1K__
> +#define __OUTPUT_FORMAT "elf32-or1k"
> +#else
> +#define __OUTPUT_FORMAT "elf32-or32"
> +#endif
> +
> +OUTPUT_FORMAT(__OUTPUT_FORMAT, __OUTPUT_FORMAT, __OUTPUT_FORMAT)
> jiffies = jiffies_64 + 4;
>
> SECTIONS
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] openrisc: Support both old (or32) and new (or1k) toolchain
2014-09-19 4:56 ` Guenter Roeck
@ 2014-09-22 2:53 ` Stefan Kristiansson
2014-09-22 3:54 ` Guenter Roeck
0 siblings, 1 reply; 5+ messages in thread
From: Stefan Kristiansson @ 2014-09-22 2:53 UTC (permalink / raw)
To: Guenter Roeck; +Cc: Jonas Bonn, linux, linux-kernel
On Thu, Sep 18, 2014 at 09:56:38PM -0700, Guenter Roeck wrote:
> ping ... comments / feedback anyone ?
>
> Guenter
>
FWIW, I've tested this and it works fine.
Stefan
> On 09/08/2014 02:00 PM, Guenter Roeck wrote:
> >The output file format for openrisc has changed from "elf32-or32"
> >to "elf32-or1k" when using the or1k instead of the older or32 toochain.
> >Select the correct output format automatically to be able to compile
> >the kernel with both toolchain variants.
> >
> >Cc: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>
> >Signed-off-by: Guenter Roeck <linux@roeck-us.net>
> >---
> >Candidate for -stable ?
> >
> > arch/openrisc/kernel/vmlinux.lds.S | 8 +++++++-
> > 1 file changed, 7 insertions(+), 1 deletion(-)
> >
> >diff --git a/arch/openrisc/kernel/vmlinux.lds.S b/arch/openrisc/kernel/vmlinux.lds.S
> >index 2d69a85..1c5d21a 100644
> >--- a/arch/openrisc/kernel/vmlinux.lds.S
> >+++ b/arch/openrisc/kernel/vmlinux.lds.S
> >@@ -30,7 +30,13 @@
> > #include <asm/cache.h>
> > #include <asm-generic/vmlinux.lds.h>
> >
> >-OUTPUT_FORMAT("elf32-or32", "elf32-or32", "elf32-or32")
> >+#ifdef __OR1K__
> >+#define __OUTPUT_FORMAT "elf32-or1k"
> >+#else
> >+#define __OUTPUT_FORMAT "elf32-or32"
> >+#endif
> >+
> >+OUTPUT_FORMAT(__OUTPUT_FORMAT, __OUTPUT_FORMAT, __OUTPUT_FORMAT)
> > jiffies = jiffies_64 + 4;
> >
> > SECTIONS
> >
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] openrisc: Support both old (or32) and new (or1k) toolchain
2014-09-22 2:53 ` Stefan Kristiansson
@ 2014-09-22 3:54 ` Guenter Roeck
2014-09-22 6:23 ` Jonas Bonn
0 siblings, 1 reply; 5+ messages in thread
From: Guenter Roeck @ 2014-09-22 3:54 UTC (permalink / raw)
To: Stefan Kristiansson; +Cc: Jonas Bonn, linux, linux-kernel
On 09/21/2014 07:53 PM, Stefan Kristiansson wrote:
> On Thu, Sep 18, 2014 at 09:56:38PM -0700, Guenter Roeck wrote:
>> ping ... comments / feedback anyone ?
>>
>> Guenter
>>
>
> FWIW, I've tested this and it works fine.
>
Hi Stefan,
Great, thanks a lot for testing. Any idea if Jonas is available to send it upstream,
or should I try to send it to Linus directly ?
Thanks,
Guenter
> Stefan
>
>> On 09/08/2014 02:00 PM, Guenter Roeck wrote:
>>> The output file format for openrisc has changed from "elf32-or32"
>>> to "elf32-or1k" when using the or1k instead of the older or32 toochain.
>>> Select the correct output format automatically to be able to compile
>>> the kernel with both toolchain variants.
>>>
>>> Cc: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>
>>> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
>>> ---
>>> Candidate for -stable ?
>>>
>>> arch/openrisc/kernel/vmlinux.lds.S | 8 +++++++-
>>> 1 file changed, 7 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/arch/openrisc/kernel/vmlinux.lds.S b/arch/openrisc/kernel/vmlinux.lds.S
>>> index 2d69a85..1c5d21a 100644
>>> --- a/arch/openrisc/kernel/vmlinux.lds.S
>>> +++ b/arch/openrisc/kernel/vmlinux.lds.S
>>> @@ -30,7 +30,13 @@
>>> #include <asm/cache.h>
>>> #include <asm-generic/vmlinux.lds.h>
>>>
>>> -OUTPUT_FORMAT("elf32-or32", "elf32-or32", "elf32-or32")
>>> +#ifdef __OR1K__
>>> +#define __OUTPUT_FORMAT "elf32-or1k"
>>> +#else
>>> +#define __OUTPUT_FORMAT "elf32-or32"
>>> +#endif
>>> +
>>> +OUTPUT_FORMAT(__OUTPUT_FORMAT, __OUTPUT_FORMAT, __OUTPUT_FORMAT)
>>> jiffies = jiffies_64 + 4;
>>>
>>> SECTIONS
>>>
>>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] openrisc: Support both old (or32) and new (or1k) toolchain
2014-09-22 3:54 ` Guenter Roeck
@ 2014-09-22 6:23 ` Jonas Bonn
0 siblings, 0 replies; 5+ messages in thread
From: Jonas Bonn @ 2014-09-22 6:23 UTC (permalink / raw)
To: Guenter Roeck, Stefan Kristiansson; +Cc: linux, linux-kernel
Hi Guenter,
On 09/22/2014 05:54 AM, Guenter Roeck wrote:
> On 09/21/2014 07:53 PM, Stefan Kristiansson wrote:
>> On Thu, Sep 18, 2014 at 09:56:38PM -0700, Guenter Roeck wrote:
>>> ping ... comments / feedback anyone ?
>>>
>>> Guenter
>>>
>>
>> FWIW, I've tested this and it works fine.
>>
Thanks, the patch is fine... will apply. It's a nice solution to an
icky problem...
/Jonas
> Hi Stefan,
>
> Great, thanks a lot for testing. Any idea if Jonas is available to
> send it upstream,
> or should I try to send it to Linus directly ?
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-09-22 6:42 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-08 21:00 [PATCH] openrisc: Support both old (or32) and new (or1k) toolchain Guenter Roeck
2014-09-19 4:56 ` Guenter Roeck
2014-09-22 2:53 ` Stefan Kristiansson
2014-09-22 3:54 ` Guenter Roeck
2014-09-22 6:23 ` Jonas Bonn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).