* 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.

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

diff --git a/stdlib/Makefile b/stdlib/Makefile
index 4b802e2ed5c069b0399884d8d5183296bdb9d8dd..e9917c1af4ecc6fe568edab8e24c84a54abc32b9 100644 (file)
--- a/stdlib/Makefile
+++ b/stdlib/Makefile
@@ -67,7 +67,7 @@ tests         := tst-strtol tst-strtod testmb testrand testsort testdiv   \
                   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       \
-                  tst-rand48-2
+                  tst-rand48-2 tst-makecontext
 
 include ../Makeconfig
 

diff --git a/stdlib/tst-makecontext.c b/stdlib/tst-makecontext.c
index 1451efa56e2056e0833207746119cc3d7fc7eea0..cbce71fb929b597ea1172fff3e85657167eb7efb 100644 (file)
--- a/stdlib/tst-makecontext.c
+++ b/stdlib/tst-makecontext.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 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
@@ -16,7 +16,6 @@
    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>
@@ -37,16 +36,10 @@ cf (int i)
 }
 
 int
-do_test (void)
+main (void)
 {
   if (getcontext (&ucp) != 0)
     {
-      if (errno == ENOSYS)
-       {
-         puts ("context handling not supported");
-         return 0;
-       }
-
       puts ("getcontext failed");
       return 1;
     }
@@ -54,7 +47,7 @@ do_test (void)
   ucp.uc_link = NULL;
   ucp.uc_stack.ss_sp = st1;
   ucp.uc_stack.ss_size = sizeof st1;
-  makecontext (&ucp, (void (*) (void)) cf, 1, 78);
+  makecontext (&ucp, (void (*) ()) cf, 1, 78);
   if (setcontext (&ucp) != 0)
     {
       puts ("setcontext failed");
@@ -62,6 +55,3 @@ do_test (void)
     }
   return 2;
 }
-
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"

diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/makecontext.S b/sysdeps/unix/sysv/linux/powerpc/powerpc32/makecontext.S
index 208a375ef3d1e54da347689f97c96b1606359fe2..9451f9eb36feb80ed6cfad8f3e8f29ad5e81dba2 100644 (file)
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/makecontext.S
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/makecontext.S
@@ -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 --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext.S b/sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext.S
index 7e9213c2d6046358abf2a4d95f1931fb649d155b..1f2e250057fc5d5eb1ba20b19b41a6c5645fccc4 100644 (file)
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext.S
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext.S
@@ -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>