diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-09-03 08:35:52 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-09-03 08:35:52 +1000 |
| commit | 1be943dfdf58d7bac44749226336eabcf937d0ba (patch) | |
| tree | 1aa4bbbddd91fd0cbb0221fbad7c94c9ec8a49ce | |
| parent | f3e557431d09c32fd506e166a636ef982dc9c93f (diff) | |
| parent | bb88ba0946dd9450e3e59762d8162380a8f30eae (diff) | |
Merge remote-tracking branch 'microblaze/next'
| -rw-r--r-- | arch/microblaze/include/uapi/asm/elf.h | 3 | ||||
| -rw-r--r-- | include/uapi/linux/elf-em.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/microblaze/include/uapi/asm/elf.h b/arch/microblaze/include/uapi/asm/elf.h index be1731d5e2fa..e9bcdb6e0086 100644 --- a/arch/microblaze/include/uapi/asm/elf.h +++ b/arch/microblaze/include/uapi/asm/elf.h @@ -11,12 +11,13 @@ #ifndef _UAPI_ASM_MICROBLAZE_ELF_H #define _UAPI_ASM_MICROBLAZE_ELF_H +#include <linux/elf-em.h> + /* * Note there is no "official" ELF designation for Microblaze. * I've snaffled the value from the microblaze binutils source code * /binutils/microblaze/include/elf/microblaze.h */ -#define EM_MICROBLAZE 189 #define EM_MICROBLAZE_OLD 0xbaab #define ELF_ARCH EM_MICROBLAZE diff --git a/include/uapi/linux/elf-em.h b/include/uapi/linux/elf-em.h index b08829667ed7..8c90a7972a2f 100644 --- a/include/uapi/linux/elf-em.h +++ b/include/uapi/linux/elf-em.h @@ -38,6 +38,7 @@ #define EM_ALTERA_NIOS2 113 /* Altera Nios II soft-core processor */ #define EM_TI_C6000 140 /* TI C6X DSPs */ #define EM_AARCH64 183 /* ARM 64 bit */ +#define EM_MICROBLAZE 189 /* Xilinx MicroBlaze */ #define EM_FRV 0x5441 /* Fujitsu FR-V */ #define EM_AVR32 0x18ad /* Atmel AVR32 */ |