diff options
| author | Kyle McMartin <[email protected]> | 2014-06-09 21:06:26 +0200 |
|---|---|---|
| committer | Mark Wielaard <[email protected]> | 2014-08-01 12:24:21 +0200 |
| commit | c1e0fcb9311c1d136e20e658449367ad8b7f487d (patch) | |
| tree | a470ee7fb1750a7400d1c7f76d195751845f3ced /backends | |
| parent | 475849fdb25265706772905b856cd7028c566a71 (diff) | |
aarch64: use <sys/user.h> defined register structures
glibc now supplies these (compatible) structs instead of including the
kernel's <asm/ptrace.h> header, so let's use them. Annoyingly this will
cause new elfutils to FTBFS on old glibc, and vice versa. So include a
new configure check for the new struct names and use the old ones if
they are not avilable.
Signed-off-by: Kyle McMartin <[email protected]>
Signed-off-by: Mark Wielaard <[email protected]>
Diffstat (limited to 'backends')
| -rw-r--r-- | backends/ChangeLog | 9 | ||||
| -rw-r--r-- | backends/aarch64_initreg.c | 11 | ||||
| -rw-r--r-- | backends/arm_initreg.c | 6 |
3 files changed, 22 insertions, 4 deletions
diff --git a/backends/ChangeLog b/backends/ChangeLog index d29a80f6..a335b207 100644 --- a/backends/ChangeLog +++ b/backends/ChangeLog @@ -1,3 +1,12 @@ +2014-07-18 Kyle McMartin <[email protected]> + Mark Wielaard <[email protected]> + + * 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 <[email protected]> Mark Wielaard <[email protected]> diff --git a/backends/aarch64_initreg.c b/backends/aarch64_initreg.c index 2492d561..9706205e 100644 --- a/backends/aarch64_initreg.c +++ b/backends/aarch64_initreg.c @@ -1,5 +1,5 @@ /* 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 @@ -36,6 +36,11 @@ # 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_ @@ -51,7 +56,7 @@ aarch64_set_initial_registers_tid (pid_t tid __attribute__ ((unused)), #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); @@ -69,7 +74,7 @@ aarch64_set_initial_registers_tid (pid_t tid __attribute__ ((unused)), /* 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) diff --git a/backends/arm_initreg.c b/backends/arm_initreg.c index 5837383a..a0a9be94 100644 --- a/backends/arm_initreg.c +++ b/backends/arm_initreg.c @@ -40,6 +40,10 @@ # 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_ @@ -67,7 +71,7 @@ arm_set_initial_registers_tid (pid_t tid __attribute__ ((unused)), #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); |