Re: [PATCH 5/7] openrisc: Support both old (or32) and new (or1k) toolchain

From: Guenter Roeck
Date: Sun Sep 18 2016 - 11:26:43 EST

On 09/16/2016 07:43 AM, Stafford Horne wrote:
From: Guenter Roeck <linux@xxxxxxxxxxxx>

The output file format for or1k has changed from "elf32-or32"
to "elf32-or1k". Select the correct output format automatically
to be able to compile the kernel with both toolchain variants.

Signed-off-by: Guenter Roeck <linux@xxxxxxxxxxxx>
Signed-off-by: Stafford Horne <shorne@xxxxxxxxx>

I tested your entire series with my qemu setup. Works for me, so for the series:

Tested-by: Guenter Roeck <linux@xxxxxxxxxxxx>

If you plan to handle openrisc going forward, it would be great if you could
consider updating MAINTAINERS. The web site and git repository have been unreachable
for a long time.


arch/openrisc/kernel/ | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/arch/openrisc/kernel/ b/arch/openrisc/kernel/
index d936de4..4a72d5d 100644
--- a/arch/openrisc/kernel/
+++ b/arch/openrisc/kernel/
@@ -30,7 +30,13 @@
#include <asm/cache.h>
#include <asm-generic/>

-OUTPUT_FORMAT("elf32-or32", "elf32-or32", "elf32-or32")
+#ifdef __OR1K__
+#define __OUTPUT_FORMAT "elf32-or1k"
+#define __OUTPUT_FORMAT "elf32-or32"
jiffies = jiffies_64 + 4;