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

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 linux-user/m68k/target_elf.h |  3 +++
 linux-user/elfload.c         | 27 ---------------------------
 linux-user/m68k/elfload.c    | 24 ++++++++++++++++++++++++
 3 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/linux-user/m68k/target_elf.h b/linux-user/m68k/target_elf.h
index 62ff9d38d4..b721687d3e 100644
--- a/linux-user/m68k/target_elf.h
+++ b/linux-user/m68k/target_elf.h
@@ -8,4 +8,7 @@
 #ifndef M68K_TARGET_ELF_H
 #define M68K_TARGET_ELF_H
 
+/* See linux kernel: arch/m68k/include/asm/elf.h.  */
+#define ELF_NREG                20
+
 #endif
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index 985c3e4e80..bc1a06a651 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -434,33 +434,6 @@ static const VdsoImageInfo *vdso_image_info(uint32_t elf_flags)
 #define ELF_CLASS       ELFCLASS32
 #define ELF_ARCH        EM_68K
 
-/* See linux kernel: arch/m68k/include/asm/elf.h.  */
-#define ELF_NREG 20
-
-void elf_core_copy_regs(target_ulong *regs, const CPUM68KState *env)
-{
-    regs[0] = tswapl(env->dregs[1]);
-    regs[1] = tswapl(env->dregs[2]);
-    regs[2] = tswapl(env->dregs[3]);
-    regs[3] = tswapl(env->dregs[4]);
-    regs[4] = tswapl(env->dregs[5]);
-    regs[5] = tswapl(env->dregs[6]);
-    regs[6] = tswapl(env->dregs[7]);
-    regs[7] = tswapl(env->aregs[0]);
-    regs[8] = tswapl(env->aregs[1]);
-    regs[9] = tswapl(env->aregs[2]);
-    regs[10] = tswapl(env->aregs[3]);
-    regs[11] = tswapl(env->aregs[4]);
-    regs[12] = tswapl(env->aregs[5]);
-    regs[13] = tswapl(env->aregs[6]);
-    regs[14] = tswapl(env->dregs[0]);
-    regs[15] = tswapl(env->aregs[7]);
-    regs[16] = tswapl(env->dregs[0]); /* FIXME: orig_d0 */
-    regs[17] = tswapl(env->sr);
-    regs[18] = tswapl(env->pc);
-    regs[19] = 0;  /* FIXME: regs->format | regs->vector */
-}
-
 #define ELF_EXEC_PAGESIZE       8192
 
 #endif
diff --git a/linux-user/m68k/elfload.c b/linux-user/m68k/elfload.c
index 561ac5b3b3..d30bee477d 100644
--- a/linux-user/m68k/elfload.c
+++ b/linux-user/m68k/elfload.c
@@ -16,3 +16,27 @@ const char *get_elf_cpu_model(uint32_t eflags)
     /* Coldfire */
     return "any";
 }
+
+void elf_core_copy_regs(target_ulong *regs, const CPUM68KState *env)
+{
+    regs[0] = tswapl(env->dregs[1]);
+    regs[1] = tswapl(env->dregs[2]);
+    regs[2] = tswapl(env->dregs[3]);
+    regs[3] = tswapl(env->dregs[4]);
+    regs[4] = tswapl(env->dregs[5]);
+    regs[5] = tswapl(env->dregs[6]);
+    regs[6] = tswapl(env->dregs[7]);
+    regs[7] = tswapl(env->aregs[0]);
+    regs[8] = tswapl(env->aregs[1]);
+    regs[9] = tswapl(env->aregs[2]);
+    regs[10] = tswapl(env->aregs[3]);
+    regs[11] = tswapl(env->aregs[4]);
+    regs[12] = tswapl(env->aregs[5]);
+    regs[13] = tswapl(env->aregs[6]);
+    regs[14] = tswapl(env->dregs[0]);
+    regs[15] = tswapl(env->aregs[7]);
+    regs[16] = tswapl(env->dregs[0]); /* FIXME: orig_d0 */
+    regs[17] = tswapl(env->sr);
+    regs[18] = tswapl(env->pc);
+    regs[19] = 0;  /* FIXME: regs->format | regs->vector */
+}
-- 
2.43.0