Enable runtime byte-order selection for microblaze-linux-user
and retain qemu-microblazeel as a compatibility alias, removing
the separate microblazeel-linux-user build target.

BFLT stays big-endian: the format has no endian marker.

Signed-off-by: Philippe Mathieu-Daudé <[email protected]>
---
Based-on: <[email protected]>
---
 configure                                   | 3 +++
 configs/targets/microblaze-linux-user.mak   | 2 ++
 configs/targets/microblazeel-linux-user.mak | 6 ------
 linux-user/microblaze/elfload.c             | 4 ++--
 4 files changed, 7 insertions(+), 8 deletions(-)
 delete mode 100644 configs/targets/microblazeel-linux-user.mak

diff --git a/configure b/configure
index 14b484908919..051301a62f77 100755
--- a/configure
+++ b/configure
@@ -1114,6 +1114,9 @@ else
                     armeb-linux-user)
                         error_exit "Target '$target' is no longer supported; 
use 'arm-linux-user' instead"
                         ;;
+                    microblazeel-linux-user)
+                        error_exit "Target '$target' is no longer supported; 
use 'microblaze-linux-user' instead"
+                        ;;
                     *)
                         error_exit "Unknown target name '$target'"
                         ;;
diff --git a/configs/targets/microblaze-linux-user.mak 
b/configs/targets/microblaze-linux-user.mak
index 31150f980c8f..f6f2703661b6 100644
--- a/configs/targets/microblaze-linux-user.mak
+++ b/configs/targets/microblaze-linux-user.mak
@@ -2,6 +2,8 @@ TARGET_ARCH=microblaze
 TARGET_SYSTBL_ABI=common
 TARGET_SYSTBL=syscall.tbl
 TARGET_BIG_ENDIAN=y
+TARGET_RUNTIME_ENDIAN=y
+TARGET_USER_ALIASES=microblazeel
 TARGET_HAS_BFLT=y
 TARGET_XML_FILES=microblaze-core.xml microblaze-stack-protect.xml
 TARGET_LONG_BITS=32
diff --git a/configs/targets/microblazeel-linux-user.mak 
b/configs/targets/microblazeel-linux-user.mak
deleted file mode 100644
index 5dcd4b5b183e..000000000000
--- a/configs/targets/microblazeel-linux-user.mak
+++ /dev/null
@@ -1,6 +0,0 @@
-TARGET_ARCH=microblaze
-TARGET_SYSTBL_ABI=common
-TARGET_SYSTBL=syscall.tbl
-TARGET_HAS_BFLT=y
-TARGET_XML_FILES=microblaze-core.xml microblaze-stack-protect.xml
-TARGET_LONG_BITS=32
diff --git a/linux-user/microblaze/elfload.c b/linux-user/microblaze/elfload.c
index bdc0a953d593..a0ef859e1728 100644
--- a/linux-user/microblaze/elfload.c
+++ b/linux-user/microblaze/elfload.c
@@ -8,8 +8,8 @@
 
 const char *get_elf_cpu_model(uint32_t eflags)
 {
-    return TARGET_BIG_ENDIAN ? "any,little-endian=off"
-                             : "any,little-endian=on";
+    return target_big_endian() ? "any,little-endian=off"
+                               : "any,little-endian=on";
 }
 
 void elf_core_copy_regs(target_elf_gregset_t *r, const CPUMBState *env)
-- 
2.55.0


Reply via email to