From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935574AbcIPOsK (ORCPT ); Fri, 16 Sep 2016 10:48:10 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:35787 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935319AbcIPOrF (ORCPT ); Fri, 16 Sep 2016 10:47:05 -0400 From: Stafford Horne To: Jonas Bonn , Stefan Kristiansson , Andrew Morton Cc: linux-kernel@vger.kernel.org, Guenter Roeck , Stafford Horne Subject: [PATCH 5/7] openrisc: Support both old (or32) and new (or1k) toolchain Date: Fri, 16 Sep 2016 23:43:03 +0900 Message-Id: <1474036985-20981-6-git-send-email-shorne@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1474036985-20981-1-git-send-email-shorne@gmail.com> References: <1474036985-20981-1-git-send-email-shorne@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Guenter Roeck 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 Signed-off-by: Stafford Horne --- 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 #include -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