Skip to contentSkip to conversation

openrisc: Support both old (or32) and new (or1k) toolchain

PATCH RESEND New Guenter Roeck 1 participant 1 message May 13, 2015 Openrisc architecture

lore
Share & tools
lore
#0 lore raw

PATCH RESEND 1/1 openrisc: Support both old (or32) and new (or1k) toolchain

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.

---
Andrew, please apply this patch directly. Per Jonas: "Unfortunately, I'm not currently in a position to do anything meaningful with it, so please send it upstream directly via Andrew Morton's collection of assorted patches"

 arch/openrisc/kernel/vmlinux.lds.S | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
arch/openrisc/kernel/vmlinux.lds.S +7 -1
index 2d69a853b742..1c5d21a10305 100644
@@ -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
Signature · 1 line
2.1.0