[PATCH v2 52/95] linux-user: Move elf_core_copy_regs to aarch64/elfload.c

[Richard Henderson]

Move elf_core_copy_regs to elfload.c.
Move ELF_NREG to target_elf.h.

Signed-off-by: Richard Henderson <richard.hender...@linaro.org>
---
 linux-user/aarch64/target_elf.h |  2 ++
 linux-user/aarch64/elfload.c    | 11 +++++++++++
 linux-user/elfload.c            | 13 -------------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/linux-user/aarch64/target_elf.h b/linux-user/aarch64/target_elf.h
index dee79ce0c6..7628904365 100644
--- a/linux-user/aarch64/target_elf.h
+++ b/linux-user/aarch64/target_elf.h
@@ -12,4 +12,6 @@
 #define HAVE_ELF_HWCAP2         1
 #define HAVE_ELF_PLATFORM       1
 
+#define ELF_NREG                34
+
 #endif
diff --git a/linux-user/aarch64/elfload.c b/linux-user/aarch64/elfload.c
index 1030cb8094..3581b45d50 100644
--- a/linux-user/aarch64/elfload.c
+++ b/linux-user/aarch64/elfload.c
@@ -347,3 +347,14 @@ const char *get_elf_platform(CPUState *cs)
 {
     return TARGET_BIG_ENDIAN ? "aarch64_be" : "aarch64";
 }
+
+void elf_core_copy_regs(target_ulong *regs, const CPUARMState *env)
+{
+    int i;
+
+    for (i = 0; i < 32; i++) {
+        regs[i] = tswapl(env->xregs[i]);
+    }
+    regs[32] = tswapl(env->pc);
+    regs[33] = tswapl(pstate_read((CPUARMState *)env));
+}
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index 3fb8106858..9ac530800e 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -283,19 +283,6 @@ static const VdsoImageInfo *vdso_image_info(uint32_t 
elf_flags)
 #define ELF_ARCH        EM_AARCH64
 #define ELF_CLASS       ELFCLASS64
 
-#define ELF_NREG    34
-
-void elf_core_copy_regs(target_ulong *regs, const CPUARMState *env)
-{
-    int i;
-
-    for (i = 0; i < 32; i++) {
-        regs[i] = tswapl(env->xregs[i]);
-    }
-    regs[32] = tswapl(env->pc);
-    regs[33] = tswapl(pstate_read((CPUARMState *)env));
-}
-
 #define ELF_EXEC_PAGESIZE       4096
 
 #if TARGET_BIG_ENDIAN
-- 
2.43.0