lkml.org 
[lkml]   [2016]   [Sep]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5/7] openrisc: Support both old (or32) and new (or1k) toolchain
    Date
    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
    \
     
     \ /
      Last update: 2016-09-17 09:59    [W:3.203 / U:0.192 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site