From: Stafford Horne <shorne@gmail.com>
To: Jonas Bonn <jonas@southpole.se>,
Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>,
Andrew Morton <akpm@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org, Guenter Roeck <linux@roeck-us.net>,
Stafford Horne <shorne@gmail.com>
Subject: [PATCH 5/7] openrisc: Support both old (or32) and new (or1k) toolchain
Date: Fri, 16 Sep 2016 23:43:03 +0900 [thread overview]
Message-ID: <1474036985-20981-6-git-send-email-shorne@gmail.com> (raw)
In-Reply-To: <1474036985-20981-1-git-send-email-shorne@gmail.com>
From: Guenter Roeck <linux@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 <linux@roeck-us.net>
Signed-off-by: Stafford Horne <shorne@gmail.com>
---
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 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"
+#else
+#define __OUTPUT_FORMAT "elf32-or32"
+#endif
+
+OUTPUT_FORMAT(__OUTPUT_FORMAT, __OUTPUT_FORMAT, __OUTPUT_FORMAT)
jiffies = jiffies_64 + 4;
SECTIONS
--
2.7.4
next prev parent reply other threads:[~2016-09-16 14:48 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-16 14:42 [PATCH 0/7] openrisc: Misc fixes from backlog Stafford Horne
2016-09-16 14:42 ` [PATCH 1/7] Apply transparent_union attribute to union semun Stafford Horne
2016-09-16 15:57 ` kbuild test robot
2016-09-16 23:37 ` kbuild test robot
2016-09-17 0:06 ` Stafford Horne
2016-09-19 14:26 ` Jonas Bonn
2016-09-19 14:47 ` Stafford Horne
2016-09-16 14:43 ` [PATCH 2/7] openrisc: fix PTRS_PER_PGD define Stafford Horne
2016-09-19 14:27 ` Jonas Bonn
2016-09-16 14:43 ` [PATCH 3/7] openrisc: restore call-saved regs on sigreturn Stafford Horne
2016-09-19 14:28 ` Jonas Bonn
2016-09-19 14:50 ` Stafford Horne
2016-09-27 13:54 ` Stafford Horne
2016-09-16 14:43 ` [PATCH 4/7] openrisc: Add thread-local storage (TLS) support Stafford Horne
2016-09-19 14:25 ` Jonas Bonn
2016-09-19 14:43 ` Stafford Horne
2016-09-16 14:43 ` Stafford Horne [this message]
2016-09-18 15:26 ` [PATCH 5/7] openrisc: Support both old (or32) and new (or1k) toolchain Guenter Roeck
2016-09-19 6:02 ` Stafford Horne
2016-09-19 7:18 ` Guenter Roeck
2016-09-19 9:11 ` Stafford Horne
2016-09-19 13:17 ` Guenter Roeck
2016-09-19 14:04 ` Stafford Horne
2016-09-19 14:35 ` Jonas Bonn
2016-09-19 14:55 ` Guenter Roeck
2016-09-19 15:16 ` Stafford Horne
2016-09-19 14:39 ` Guenter Roeck
2016-09-20 10:01 ` Stafford Horne
2016-09-16 14:43 ` [PATCH 6/7] openrisc: add SMP and NR_CPUS Kconfig options Stafford Horne
2016-09-19 14:31 ` Jonas Bonn
2016-09-19 14:54 ` Stafford Horne
2016-09-16 14:43 ` [PATCH 7/7] openrisc: remove the redundant of_platform_populate Stafford Horne
2016-09-19 14:32 ` Jonas Bonn
2016-09-19 14:58 ` Stafford Horne
2016-09-19 16:14 ` Rob Herring
2016-09-16 14:51 ` [PATCH 0/7] openrisc: Misc fixes from backlog Stafford Horne
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1474036985-20981-6-git-send-email-shorne@gmail.com \
--to=shorne@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=jonas@southpole.se \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=stefan.kristiansson@saunalahti.fi \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).