diff options
| author | Guenter Roeck <linux@roeck-us.net> | 2014-07-20 00:39:08 +0300 |
|---|---|---|
| committer | Stafford Horne <shorne@gmail.com> | 2016-12-12 23:09:40 +0900 |
| commit | 1f43e235dfc44be335e484dae88928e997036026 (patch) | |
| tree | a2434d19302975d16631695da3e811359b760a6d | |
| parent | e60aa2fba4678d4e7e2d28ef4f2110084d0b150a (diff) | |
openrisc: Support both old (or32) and new (or1k) toolchain
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>
Tested-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Stafford Horne <shorne@gmail.com>
| -rw-r--r-- | arch/openrisc/kernel/vmlinux.lds.S | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/openrisc/kernel/vmlinux.lds.S b/arch/openrisc/kernel/vmlinux.lds.S index d68b9ede8423..ef31fc24344e 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 |