Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

microblaze: Switch ELF_ARCH code to 189

Switch arch code to 189, the registered code in the upstream
version of binutils. Continue to accept the experimental 0xbaab.

Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Signed-off-by: Michal Simek <monstr@monstr.eu>

authored by

Edgar E. Iglesias and committed by
Michal Simek
69515f8b 0fb2a6f2

+6 -4
+5 -3
arch/microblaze/include/asm/elf.h
··· 16 16 * I've snaffled the value from the microblaze binutils source code 17 17 * /binutils/microblaze/include/elf/microblaze.h 18 18 */ 19 - #define EM_XILINX_MICROBLAZE 0xbaab 20 - #define ELF_ARCH EM_XILINX_MICROBLAZE 19 + #define EM_MICROBLAZE 189 20 + #define EM_MICROBLAZE_OLD 0xbaab 21 + #define ELF_ARCH EM_MICROBLAZE 21 22 22 23 /* 23 24 * This is used to ensure we don't load something for the wrong architecture. 24 25 */ 25 - #define elf_check_arch(x) ((x)->e_machine == EM_XILINX_MICROBLAZE) 26 + #define elf_check_arch(x) ((x)->e_machine == EM_MICROBLAZE \ 27 + || (x)->e_machine == EM_MICROBLAZE_OLD) 26 28 27 29 /* 28 30 * These are used to set parameters in the core dumps.
+1 -1
arch/microblaze/kernel/ptrace.c
··· 148 148 ret = -1L; 149 149 150 150 if (unlikely(current->audit_context)) 151 - audit_syscall_entry(EM_XILINX_MICROBLAZE, regs->r12, 151 + audit_syscall_entry(EM_MICROBLAZE, regs->r12, 152 152 regs->r5, regs->r6, 153 153 regs->r7, regs->r8); 154 154