diff options
Diffstat (limited to 'sysdeps/unix/sysv/linux/arm')
| -rw-r--r-- | sysdeps/unix/sysv/linux/arm/profil-counter.h | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/arm/sigcontextinfo.h | 27 |
2 files changed, 10 insertions, 21 deletions
diff --git a/sysdeps/unix/sysv/linux/arm/profil-counter.h b/sysdeps/unix/sysv/linux/arm/profil-counter.h index 494c2172b6..040c7aa59a 100644 --- a/sysdeps/unix/sysv/linux/arm/profil-counter.h +++ b/sysdeps/unix/sysv/linux/arm/profil-counter.h @@ -20,9 +20,9 @@ #include <sigcontextinfo.h> void -__profil_counter (int signo, const SIGCONTEXT scp) +__profil_counter (int signo, siginfo_t *_si, void *scp) { - profil_count ((void *) GET_PC (scp)); + profil_count (sigcontext_get_pc (scp)); /* This is a hack to prevent the compiler from implementing the above function call as a sibcall. The sibcall would overwrite diff --git a/sysdeps/unix/sysv/linux/arm/sigcontextinfo.h b/sysdeps/unix/sysv/linux/arm/sigcontextinfo.h index 0bf3beaa0f..d16ce06c3d 100644 --- a/sysdeps/unix/sysv/linux/arm/sigcontextinfo.h +++ b/sysdeps/unix/sysv/linux/arm/sigcontextinfo.h @@ -16,24 +16,13 @@ License along with the GNU C Library. If not, see <http://www.gnu.org/licenses/>. */ -#include <sys/ucontext.h> +#ifndef _SIGCONTEXTINFO_H +#define _SIGCONTEXTINFO_H -#define SIGCONTEXT siginfo_t *_si, ucontext_t * +static inline uintptr_t +sigcontext_get_pc (const ucontext_t *ctx) +{ + return ctx->uc_mcontext.arm_pc; +} -/* The sigcontext structure changed between 2.0 and 2.1 kernels. On any - modern system we should be able to assume that the "new" format will be - in use. */ - -#define GET_PC(ctx) ((void *) (ctx)->uc_mcontext.arm_pc) - -/* There is no reliable way to get the sigcontext unless we use a - three-argument signal handler. */ -#define __sigaction(sig, act, oact) ({ \ - (act)->sa_flags |= SA_SIGINFO; \ - (__sigaction) (sig, act, oact); \ -}) - -#define sigaction(sig, act, oact) ({ \ - (act)->sa_flags |= SA_SIGINFO; \ - (sigaction) (sig, act, oact); \ -}) +#endif |