diff options
| author | Eric Andersen <andersen@codepoet.org> | 2003-09-07 04:13:12 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2003-09-07 04:13:12 +0000 |
| commit | f223d1cb8220990a50896be92443839ded0fcfe4 (patch) | |
| tree | 916fa3b41e940d6f0bea991502249570cf41349a /libc/sysdeps/linux/arm/bits | |
| parent | f05ef15283af3b01d508b10319acd04a301190cb (diff) | |
Some updates from glibc. mjn3 reports this fixes profiling
on i386, at least, so seems like a good thing.
Diffstat (limited to 'libc/sysdeps/linux/arm/bits')
| -rw-r--r-- | libc/sysdeps/linux/arm/bits/profil-counter.h | 7 | ||||
| -rw-r--r-- | libc/sysdeps/linux/arm/bits/sigcontextinfo.h | 18 |
2 files changed, 23 insertions, 2 deletions
diff --git a/libc/sysdeps/linux/arm/bits/profil-counter.h b/libc/sysdeps/linux/arm/bits/profil-counter.h index 5d8be9dba..7639883f1 100644 --- a/libc/sysdeps/linux/arm/bits/profil-counter.h +++ b/libc/sysdeps/linux/arm/bits/profil-counter.h @@ -1,5 +1,5 @@ /* Low-level statistical profiling support function. Linux/ARM version. - Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -29,4 +29,9 @@ profil_counter (int signo, int _a2, int _a3, int _a4, union k_sigcontext sc) else pc = (void *) sc.v21.arm_pc; profil_count (pc); + + /* This is a hack to prevent the compiler from implementing the + above function call as a sibcall. The sibcall would overwrite + the signal context. */ + asm volatile (""); } diff --git a/libc/sysdeps/linux/arm/bits/sigcontextinfo.h b/libc/sysdeps/linux/arm/bits/sigcontextinfo.h index aebc3cfd5..30c2e3a6c 100644 --- a/libc/sysdeps/linux/arm/bits/sigcontextinfo.h +++ b/libc/sysdeps/linux/arm/bits/sigcontextinfo.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1999 Free Software Foundation, Inc. +/* Copyright (C) 1999, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Philip Blundell <philb@gnu.org>, 1999. @@ -18,10 +18,22 @@ 02111-1307 USA. */ #include <bits/armsigctx.h> +#include "kernel-features.h" #define SIGCONTEXT int _a2, int _a3, int _a4, union k_sigcontext #define SIGCONTEXT_EXTRA_ARGS _a2, _a3, _a4, +/* 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. */ +#if __LINUX_KERNEL_VERSION > 131328 + +#define GET_PC(ctx) ((void *) ctx.v21.arm_pc) +#define GET_FRAME(ctx) ADVANCE_STACK_FRAME ((void *) ctx.v21.arm_fp) +#define GET_STACK(ctx) ((void *) ctx.v21.arm_sp) + +#else + #define GET_PC(ctx) ((void *)((ctx.v20.magic == SIGCONTEXT_2_0_MAGIC) ? \ ctx.v20.reg.ARM_pc : ctx.v21.arm_pc)) #define GET_FRAME(ctx) \ @@ -29,7 +41,11 @@ ctx.v20.reg.ARM_fp : ctx.v21.arm_fp)) #define GET_STACK(ctx) ((void *)((ctx.v20.magic == SIGCONTEXT_2_0_MAGIC) ? \ ctx.v20.reg.ARM_sp : ctx.v21.arm_sp)) + +#endif + #define ADVANCE_STACK_FRAME(frm) \ ((struct layout *)frm - 1) + #define CALL_SIGHANDLER(handler, signo, ctx) \ (handler)((signo), SIGCONTEXT_EXTRA_ARGS (ctx)) |