microblaze: Update elf machine nums.

189 was allocated in upstream binutils.

0xbaab was the old temporary value. Still used by some tools and the
linux kernel.

I've seen 115 in older gdb versions, but lets ignore that one.

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

diff --git a/elf.h b/elf.h
index c84c8aba81306e76d8977a1427dd7c6cf2d6cc84..eb9e3bece7093cb382dc2ea4c5602b7346d023b0 100644 (file)
--- a/elf.h
+++ b/elf.h
@@ -119,7 +119,8 @@ typedef int64_t  Elf64_Sxword;
  */
 #define EM_S390_OLD     0xA390
 
-#define EM_XILINX_MICROBLAZE    0xBAAB
+#define EM_MICROBLAZE      189
+#define EM_MICROBLAZE_OLD  0xBAAB
 
 /* This is the info that is needed to parse the dynamic section of the file */
 #define DT_NULL                0

diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index 6bc51da9572bf9b48b0689138138ee4e128ec63e..1f27918beb6674c5e0fd573342517123580c04da 100644 (file)
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -629,11 +629,11 @@ static void elf_core_copy_regs(target_elf_gregset_t *regs, const CPUState *env)
 
 #define ELF_START_MMAP 0x80000000
 
-#define elf_check_arch(x) ( (x) == EM_XILINX_MICROBLAZE )
+#define elf_check_arch(x) ( (x) == EM_MICROBLAZE || (x) == EM_MICROBLAZE_OLD)
 
 #define ELF_CLASS   ELFCLASS32
 #define ELF_DATA       ELFDATA2MSB
-#define ELF_ARCH    EM_XILINX_MICROBLAZE
+#define ELF_ARCH    EM_MICROBLAZE
 
 static inline void init_thread(struct target_pt_regs *regs, struct image_info *infop)
 {

diff --git a/target-microblaze/cpu.h b/target-microblaze/cpu.h
index ec2ca183d76285a0bcbc1c35f4f0e63a82778113..33167977f2d07a0aae51f66bdd3a983b817fa263 100644 (file)
--- a/target-microblaze/cpu.h
+++ b/target-microblaze/cpu.h
@@ -31,7 +31,7 @@ struct CPUMBState;
 
 #define TARGET_HAS_ICE 1
 
-#define ELF_MACHINE    EM_XILINX_MICROBLAZE
+#define ELF_MACHINE    EM_MICROBLAZE
 
 #define EXCP_NMI        1
 #define EXCP_MMU        2