File glibc-2.5-makecontext.diff of Package glibc

Overview Repositories Revisions Requests Users Attributes Meta

File glibc-2.5-makecontext.diff of Package glibc

2006-12-19  Jakub Jelinek  <jakub@redhat.com>

* stdlib/Makefile (tests): Add tst-makecontext.
	* stdlib/tst-makecontext.c: New test.

* sysdeps/unix/sysv/linux/powerpc/powerpc32/makecontext.S
	(__makecontext): Don't realign uc_mcontext.uc_regs.

2006-12-13  Jakub Jelinek  <jakub@redhat.com>

* sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext.S: Include
	kernel-features.h.

diff -urN glibc-2.4-sles10GA/stdlib/Makefile glibc-2.4-sles10GA-patched/stdlib/Makefile
--- stdlib/Makefile	2006-02-28 03:55:21.000000000 -0600
+++ stdlib/Makefile	2007-03-14 11:17:31.566057264 -0500
@@ -66,7 +66,8 @@
 		   test-canon test-canon2 tst-strtoll tst-environ	    \
 		   tst-xpg-basename tst-random tst-random2 tst-bsearch	    \
 		   tst-limits tst-rand48 bug-strtod tst-setcontext	    \
-		   test-a64l tst-qsort tst-system testmb2 bug-strtod2
+		   test-a64l tst-qsort tst-system testmb2 bug-strtod2       \
+		   tst-makecontext
 
 include ../Makeconfig
 
diff -urN glibc-2.4-sles10GA/stdlib/tst-makecontext.c glibc-2.4-sles10GA-patched/stdlib/tst-makecontext.c
--- stdlib/tst-makecontext.c	Wed Dec 31 18:00:00 1969
+++ stdlib/tst-makecontext.c	Wed Mar 14 11:15:53 2007
@@ -0,0 +1,67 @@
+/* Copyright (C) 2006, 2007 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
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <errno.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <ucontext.h>
+
+ucontext_t ucp;
+char st1[8192];
+__thread int thr;
+
+void
+cf (int i)
+{
+  if (i != 78 || thr != 94)
+    {
+      printf ("i %d thr %d\n", i, thr);
+      exit (1);
+    }
+  exit (0);
+}
+
+int
+do_test (void)
+{
+  if (getcontext (&ucp) != 0)
+    {
+      if (errno == ENOSYS)
+	{
+	  puts ("context handling not supported");
+	  return 0;
+	}
+
+      puts ("getcontext failed");
+      return 1;
+    }
+  thr = 94;
+  ucp.uc_link = NULL;
+  ucp.uc_stack.ss_sp = st1;
+  ucp.uc_stack.ss_size = sizeof st1;
+  makecontext (&ucp, (void (*) (void)) cf, 1, 78);
+  if (setcontext (&ucp) != 0)
+    {
+      puts ("setcontext failed");
+      return 1;
+    }
+  return 2;
+}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
diff -urN glibc-2.4-sles10GA/sysdeps/unix/sysv/linux/powerpc/powerpc32/makecontext.S glibc-2.4-sles10GA-patched/sysdeps/unix/sysv/linux/powerpc/powerpc32/makecontext.S
--- sysdeps/unix/sysv/linux/powerpc/powerpc32/makecontext.S	2006-01-07 01:11:17.000000000 -0600
+++ sysdeps/unix/sysv/linux/powerpc/powerpc32/makecontext.S	2007-03-14 11:15:53.553047320 -0500
@@ -26,9 +26,7 @@
 
 ENTRY(__makecontext)
 	/* Set up the first 7 args to the function in its registers */
-	addi	r11,r3,_UC_REG_SPACE+12
-	clrrwi  r11,r11,4
-	stw	r11,_UC_REGS_PTR(r3)
+	lwz	r11,_UC_REGS_PTR(r3)
 	stw	r6,_UC_GREGS+(PT_R3*4)(r11)
 	stw	r7,_UC_GREGS+(PT_R4*4)(r11)
 	stw	r8,_UC_GREGS+(PT_R5*4)(r11)
diff -urN glibc-2.4-sles10GA/sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext.S glibc-2.4-sles10GA-patched/sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext.S
--- sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext.S	2006-01-05 02:11:09.000000000 -0600
+++ sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext.S	2007-03-14 11:15:53.554047168 -0500
@@ -1,5 +1,5 @@
 /* Jump to a new context.
-   Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2005, 2006 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
@@ -20,6 +20,7 @@
 #include <sysdep.h>
 #include <rtld-global-offsets.h>
 #include <shlib-compat.h>
+#include <kernel-features.h>
 
 #define __ASSEMBLY__
 #include <asm/ptrace.h>

Places

File glibc-2.5-makecontext.diff of Package glibc

Places