+2014-07-18 Mark Wielaard <mjw@redhat.com>
+
+ * configure.ac (AC_CHECK_TYPE): Test for struct user_regs_struct.
+
2014-05-26 Mark Wielaard <mjw@redhat.com>
* NEWS: New section 0.160. Add unstrip --force.
+2014-07-18 Kyle McMartin <kyle@redhat.com>
+ Mark Wielaard <mjw@redhat.com>
+
+ * aarch64_initreg.c: Check HAVE_SYS_USER_REGS.
+ (aarch64_set_initial_registers_tid): Use user_regs_struct and
+ user_fpsimd_struct.
+ * arm_initreg.c: Check HAVE_SYS_USER_REGS.
+ (arm_set_initial_registers_tid): Use user_regs_struct in compat mode.
+
2014-07-04 Menanteau Guy <menantea@linux.vnet.ibm.com>
Mark Wielaard <mjw@redhat.com>
/* Fetch live process registers from TID.
- Copyright (C) 2013 Red Hat, Inc.
+ Copyright (C) 2013, 2014 Red Hat, Inc.
This file is part of elfutils.
This file is free software; you can redistribute it and/or modify
# include <linux/uio.h>
# include <sys/user.h>
# include <sys/ptrace.h>
+/* Deal with old glibc defining user_pt_regs instead of user_regs_struct. */
+# ifndef HAVE_SYS_USER_REGS
+# define user_regs_struct user_pt_regs
+# define user_fpsimd_struct user_fpsimd_state
+# endif
#endif
#define BACKEND aarch64_
#else /* __aarch64__ */
/* General registers. */
- struct user_pt_regs gregs;
+ struct user_regs_struct gregs;
struct iovec iovec;
iovec.iov_base = &gregs;
iovec.iov_len = sizeof (gregs);
/* ELR cannot be found. */
/* FP registers (only 64bits are used). */
- struct user_fpsimd_state fregs;
+ struct user_fpsimd_struct fregs;
iovec.iov_base = &fregs;
iovec.iov_len = sizeof (fregs);
if (ptrace (PTRACE_GETREGSET, tid, NT_FPREGSET, &iovec) != 0)
# include <linux/uio.h>
# include <sys/user.h>
# include <sys/ptrace.h>
+/* Deal with old glibc defining user_pt_regs instead of user_regs_struct. */
+# ifndef HAVE_SYS_USER_REGS
+# define user_regs_struct user_pt_regs
+# endif
#endif
#define BACKEND arm_
#elif defined __aarch64__
/* Compat mode: arm compatible code running on aarch64 */
int i;
- struct user_pt_regs gregs;
+ struct user_regs_struct gregs;
struct iovec iovec;
iovec.iov_base = &gregs;
iovec.iov_len = sizeof (gregs);
AC_CHECK_SIZEOF(long)
+# On aarch64 before glibc 2.20 we would get the kernel user_pt_regs instead
+# of the user_regs_struct from sys/user.h. They are structurally the same
+# but we get either one or the other.
+AC_CHECK_TYPE([struct user_regs_struct],
+ [sys_user_has_user_regs=yes], [sys_user_has_user_regs=no],
+ [[#include <sys/ptrace.h>]
+ [#include <sys/time.h>]
+ [#include <sys/user.h>]])
+if test "$sys_user_has_user_regs" = "yes"; then
+ AC_DEFINE(HAVE_SYS_USER_REGS, 1,
+ [Define to 1 if <sys/user.h> defines struct user_regs_struct])
+fi
+
# On a 64-bit host where can can use $CC -m32, we'll run two sets of tests.
# Likewise in a 32-bit build on a host where $CC -m64 works.
utrace_BIARCH