[uClibc-cvs] uClibc/libc/sysdeps/linux/arm/bits sigcontextinfo.h, 1.1, 1.2 profil-counter.h, 1.1, 1.2

Erik Andersen andersen at uclibc.org
Sun Sep 7 04:08:29 UTC 2003


Update of /var/cvs/uClibc/libc/sysdeps/linux/arm/bits
In directory winder:/tmp/cvs-serv3162/libc/sysdeps/linux/arm/bits

Modified Files:
	sigcontextinfo.h profil-counter.h 
Log Message:
Some updates from glibc.  mjn3 reports this fixes profiling
on i386, at least, so seems like a good thing.


Index: sigcontextinfo.h
===================================================================
RCS file: /var/cvs/uClibc/libc/sysdeps/linux/arm/bits/sigcontextinfo.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sigcontextinfo.h	3 Mar 2003 20:57:59 -0000	1.1
+++ sigcontextinfo.h	7 Sep 2003 04:08:26 -0000	1.2
@@ -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 at 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))

Index: profil-counter.h
===================================================================
RCS file: /var/cvs/uClibc/libc/sysdeps/linux/arm/bits/profil-counter.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- profil-counter.h	3 Mar 2003 20:57:59 -0000	1.1
+++ profil-counter.h	7 Sep 2003 04:08:26 -0000	1.2
@@ -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 @@
   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 ("");
 }




More information about the uClibc-cvs mailing list