aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arm64/include/elf.h4
-rw-r--r--usr.bin/gcore/Makefile2
-rw-r--r--usr.bin/gcore/elf32core.c12
3 files changed, 16 insertions, 2 deletions
diff --git a/sys/arm64/include/elf.h b/sys/arm64/include/elf.h
index 3361d30614ba..608d3f95e21d 100644
--- a/sys/arm64/include/elf.h
+++ b/sys/arm64/include/elf.h
@@ -64,7 +64,11 @@ typedef struct { /* Auxiliary vector entry on initial stack */
__ElfType(Auxinfo);
+#ifdef _MACHINE_ELF_WANT_32BIT
+#define ELF_ARCH EM_ARM
+#else
#define ELF_ARCH EM_AARCH64
+#endif
#define ELF_MACHINE_OK(x) ((x) == (ELF_ARCH))
diff --git a/usr.bin/gcore/Makefile b/usr.bin/gcore/Makefile
index ad4b540f819b..205b3f1ea46c 100644
--- a/usr.bin/gcore/Makefile
+++ b/usr.bin/gcore/Makefile
@@ -5,7 +5,7 @@ PROG= gcore
SRCS= elfcore.c gcore.c
LIBADD= sbuf util
-.if ${MACHINE_ARCH} == "amd64"
+.if ${MACHINE_ARCH} == "aarch64" || ${MACHINE_ARCH} == "amd64"
SRCS+= elf32core.c
.endif
diff --git a/usr.bin/gcore/elf32core.c b/usr.bin/gcore/elf32core.c
index 595b7de95fbb..ba35631f4fb3 100644
--- a/usr.bin/gcore/elf32core.c
+++ b/usr.bin/gcore/elf32core.c
@@ -32,7 +32,15 @@ elf_convert_gregset(elfcore_gregset_t *rd, struct reg *rs)
rd->r_eflags = rs->r_rflags;
rd->r_esp = rs->r_rsp;
rd->r_ss = rs->r_ss;
-#else
+#elif defined(__aarch64__)
+ int i;
+
+ for (i = 0; i < 13; i++)
+ rd->r[i] = rs->x[i];
+ rd->r_sp = rs->x[13];
+ rd->r_lr = rs->x[14];
+ rd->r_pc = rs->elr;
+ rd->r_cpsr = rs->spsr;
#error Unsupported architecture
#endif
}
@@ -43,6 +51,8 @@ elf_convert_fpregset(elfcore_fpregset_t *rd, struct fpreg *rs)
#ifdef __amd64__
/* XXX this is wrong... */
memcpy(rd, rs, sizeof(*rd));
+#elif defined(__aarch64__)
+ /* ARM64TODO */
#else
#error Unsupported architecture
#endif