linux-kernel - [PATCH resend] openrisc: Support both old (or32) and new (or1k) toolchain

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:	Wed, 13 May 2015 09:56:54 -0700
From:	Guenter Roeck <linux@...ck-us.net>
To:	linux-kernel@...r.kernel.org
Cc:	openrisc@...ts.opencores.org, Jonas Bonn <jonas@...thpole.se>,
	Paul Bolle <pebolle@...cali.nl>, anees <rean12is@...il.com>,
	Andrew Morton <akpm@...ux-foundation.org>,
	Guenter Roeck <linux@...ck-us.net>,
	Stefan Kristiansson <stefan.kristiansson@...nalahti.fi>
Subject: [PATCH resend] 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.

Cc: Stefan Kristiansson <stefan.kristiansson@...nalahti.fi>
Acked-by: Jonas Bonn <jonas@...thpole.se>
Signed-off-by: Guenter Roeck <linux@...ck-us.net>
---
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(-)

diff --git a/arch/openrisc/kernel/vmlinux.lds.S b/arch/openrisc/kernel/vmlinux.lds.S
index 2d69a853b742..1c5d21a10305 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
-- 
2.1.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/