3 files changed, 3 insertions, 88 deletions
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/clone.S b/sysdeps/unix/sysv/linux/powerpc/powerpc32/clone.S
index 57640aa49f..fb16519efa 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/clone.S
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/clone.S
@@ -1,5 +1,5 @@
 /* Wrapper around clone system call.
-   Copyright (C) 1997,98,99,2000,02,04,2006 Free Software Foundation, Inc.
+   Copyright (C) 1997-2012 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
@@ -52,11 +52,7 @@ ENTRY (BP_SYM (__clone))
 #ifdef RESET_PID
 	stmw	r28,16(r1)
 #else
-# ifndef __ASSUME_FIXED_CLONE_SYSCALL
-	stmw	r29,16(r1)
-# else
 	stmw	r30,16(r1)
-# endif
 #endif
 
 	/* Set up stack frame for child.  */
@@ -66,9 +62,6 @@ ENTRY (BP_SYM (__clone))
 
 	/* Save fn, args, stack across syscall.  */
 	mr	r30,r3			/* Function in r30.  */
-#ifndef __ASSUME_FIXED_CLONE_SYSCALL
-	mr	r29,r4			/* Stack pointer in r29.  */
-#endif
 #ifdef RESET_PID
 	mr	r28,r5
 #endif
@@ -95,14 +88,6 @@ ENTRY (BP_SYM (__clone))
 	crandc	cr1*4+eq,cr1*4+eq,cr0*4+so
 	bne-	cr1,L(parent)		/* The '-' is to minimise the race.  */
 
-#ifndef __ASSUME_FIXED_CLONE_SYSCALL
-	/* On at least mklinux DR3a5, clone() doesn't actually change
-	   the stack pointer.  I'm pretty sure this is a bug, because
-	   it adds a race condition if a signal is sent to a thread
-	   just after it is created (in the previous three instructions).  */
-	mr	r1,r29
-#endif
-
 #ifdef RESET_PID
 	andis.	r0,r28,CLONE_THREAD>>16
 	bne+	r0,L(oldpid)
@@ -128,11 +113,7 @@ L(parent):
 #ifdef RESET_PID
 	lmw	r28,16(r1)
 #else
-# ifndef __ASSUME_FIXED_CLONE_SYSCALL
-	lmw	r29,16(r1)
-# else
 	lmw	r30,16(r1)
-# endif
 #endif
 	addi	r1,r1,32
 	bnslr+
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/fe_mask.c b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/fe_mask.c
index 0642e0b407..366c5fe935 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/fe_mask.c
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/fe_mask.c
@@ -1,5 +1,5 @@
 /* Procedure definition for FE_MASK_ENV for Linux/ppc.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007-2012 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
@@ -24,44 +24,11 @@
 #include <sys/prctl.h>
 #include <kernel-features.h>
 
-#if __ASSUME_NEW_PRCTL_SYSCALL == 0
-/* This is rather fiddly under Linux.  We don't have direct access,
-   and there is no system call, but we can change the bits
-   in a signal handler's context...  */
-
-static struct sigaction oact;
-
-static void
-fe_mask_handler (int signum, struct sigcontext *sc)
-{
-  sc->regs->msr &= ~0x900ul;  /* FE0 | FE1 */
-  sigaction (SIGUSR1, &oact, NULL);
-}
-#endif
-
 const fenv_t *
 __fe_mask_env (void)
 {
-#if __ASSUME_NEW_PRCTL_SYSCALL == 0
-# if defined PR_SET_FPEXC && defined PR_FP_EXC_DISABLED
-  int result = INLINE_SYSCALL (prctl, 2, PR_SET_FPEXC, PR_FP_EXC_DISABLED);
-
-  if (result == -1 && errno == EINVAL)
-# endif
-    {
-      struct sigaction act;
-
-      act.sa_handler = (sighandler_t) fe_mask_handler;
-      sigemptyset (&act.sa_mask);
-      act.sa_flags = 0;
-
-      sigaction (SIGUSR1, &act, &oact);
-      raise (SIGUSR1);
-    }
-#else
   INTERNAL_SYSCALL_DECL (err);
   INTERNAL_SYSCALL (prctl, err, 2, PR_SET_FPEXC, PR_FP_EXC_DISABLED);
-#endif
 
   return FE_DFL_ENV;
 }
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/fe_nomask.c b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/fe_nomask.c
index 2097af6548..86738fdd5a 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/fe_nomask.c
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/fe_nomask.c
@@ -1,5 +1,5 @@
 /* Procedure definition for FE_NOMASK_ENV for Linux/ppc.
-   Copyright (C) 2000, 2006, 2008 Free Software Foundation, Inc.
+   Copyright (C) 2000-2012 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
@@ -24,44 +24,11 @@
 #include <sys/prctl.h>
 #include <kernel-features.h>
 
-#if __ASSUME_NEW_PRCTL_SYSCALL == 0
-/* This is rather fiddly under Linux.  We don't have direct access,
-   and there is no system call, but we can change the bits
-   in a signal handler's context...  */
-
-static struct sigaction oact;
-
-static void
-fe_nomask_handler (int signum, struct sigcontext *sc)
-{
-  sc->regs->msr |= 0x900ul;  /* FE0 | FE1 */
-  sigaction (SIGUSR1, &oact, NULL);
-}
-#endif
-
 const fenv_t *
 __fe_nomask_env (void)
 {
-#if __ASSUME_NEW_PRCTL_SYSCALL == 0
-# if defined PR_SET_FPEXC && defined PR_FP_EXC_PRECISE
-  int result = INLINE_SYSCALL (prctl, 2, PR_SET_FPEXC, PR_FP_EXC_PRECISE);
-
-  if (result == -1 && errno == EINVAL)
-# endif
-    {
-      struct sigaction act;
-
-      act.sa_handler = (sighandler_t) fe_nomask_handler;
-      sigemptyset (&act.sa_mask);
-      act.sa_flags = 0;
-
-      sigaction (SIGUSR1, &act, &oact);
-      raise (SIGUSR1);
-    }
-#else
   INTERNAL_SYSCALL_DECL (err);
   INTERNAL_SYSCALL (prctl, err, 2, PR_SET_FPEXC, PR_FP_EXC_PRECISE);
-#endif
 
   return FE_ENABLED_ENV;
 }