From: Richard Henderson <richard.henderson@linaro.org>
Date: Tue, 29 Jul 2025 21:13:03 +0000 (-1000)
Subject: linux-user: Move elf parameters to xtensa/target_elf.h
X-Git-Tag: v10.2.0-rc1~119^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60502ab782496c160223a7892197abaad1670187;p=thirdparty%2Fqemu.git

linux-user: Move elf parameters to xtensa/target_elf.h

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---

diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index 67320113327..804a8194713 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -130,13 +130,6 @@ typedef abi_uint        target_gid_t;
 #endif
 typedef abi_int         target_pid_t;
 
-#ifdef TARGET_XTENSA
-
-#define ELF_CLASS       ELFCLASS32
-#define ELF_ARCH        EM_XTENSA
-
-#endif /* TARGET_XTENSA */
-
 #ifdef TARGET_HEXAGON
 
 #define ELF_CLASS       ELFCLASS32
diff --git a/linux-user/xtensa/target_elf.h b/linux-user/xtensa/target_elf.h
index 850a7206a50..0689e79be52 100644
--- a/linux-user/xtensa/target_elf.h
+++ b/linux-user/xtensa/target_elf.h
@@ -10,6 +10,9 @@
 
 #include "target_ptrace.h"
 
+#define ELF_CLASS               ELFCLASS32
+#define ELF_ARCH                EM_XTENSA
+
 #define HAVE_ELF_CORE_DUMP      1
 
 /*