On 09/16/2016 07:43 AM, Stafford Horne wrote:
From: Guenter Roeck <li...@roeck-us.net>

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 <li...@roeck-us.net>
Signed-off-by: Stafford Horne <sho...@gmail.com>

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

Tested-by: Guenter Roeck <li...@roeck-us.net>

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 
for a long time.


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

diff --git a/arch/openrisc/kernel/vmlinux.lds.S 
index d936de4..4a72d5d 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"
+#define __OUTPUT_FORMAT        "elf32-or32"
 jiffies = jiffies_64 + 4;


Reply via email to