From 2484468be16b376527ff66eadf97b4a5150961d9 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Mon, 19 Feb 2007 05:48:54 +0000
Subject: [PATCH] [BZ #3325]

	* sysdeps/i386/fpu/e_fmodf.S: Use fprem1 instead of fprem.
	* sysdeps/i386/fpu/e_fmodl.c: Likewise.
	* sysdeps/i386/fpu/e_fmod.S: Likewise.
	Patch by Jared Casper <jaredcasper@gmail.com>.
---
 ChangeLog                  | 6 ++++++
 nptl/ChangeLog             | 5 +++++
 sysdeps/i386/fpu/e_fmod.S  | 2 +-
 sysdeps/i386/fpu/e_fmodf.S | 2 +-
 sysdeps/i386/fpu/e_fmodl.c | 2 +-
 5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5ef26ee8a9..d5745afec2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2007-02-18  Ulrich Drepper  <drepper@redhat.com>
 
+	[BZ #3325]
+	* sysdeps/i386/fpu/e_fmodf.S: Use fprem1 instead of fprem.
+	* sysdeps/i386/fpu/e_fmodl.c: Likewise.
+	* sysdeps/i386/fpu/e_fmod.S: Likewise.
+	Patch by Jared Casper <jaredcasper@gmail.com>.
+
 	* sysdeps/unix/closedir.c: Outside libc don't use locking.
 	* sysdeps/unix/opendir.c: Likewise.
 	* sysdeps/unix/readdir.c: Likewise.
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 1a47040a76..5cee640e3e 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-18  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/pthread/pthread-functions.h: If PTR_DEMANGLE is not
+	available, don't use it.
+
 2007-02-09  Jakub Jelinek  <jakub@redhat.com>
 
 	* sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
diff --git a/sysdeps/i386/fpu/e_fmod.S b/sysdeps/i386/fpu/e_fmod.S
index 4cf6e92054..e801286a9b 100644
--- a/sysdeps/i386/fpu/e_fmod.S
+++ b/sysdeps/i386/fpu/e_fmod.S
@@ -10,7 +10,7 @@ RCSID("$NetBSD: e_fmod.S,v 1.4 1995/05/08 23:47:56 jtc Exp $")
 ENTRY(__ieee754_fmod)
 	fldl	12(%esp)
 	fldl	4(%esp)
-1:	fprem
+1:	fprem1
 	fstsw	%ax
 	sahf
 	jp	1b
diff --git a/sysdeps/i386/fpu/e_fmodf.S b/sysdeps/i386/fpu/e_fmodf.S
index bbce40976d..1850af098e 100644
--- a/sysdeps/i386/fpu/e_fmodf.S
+++ b/sysdeps/i386/fpu/e_fmodf.S
@@ -11,7 +11,7 @@ RCSID("$NetBSD: $")
 ENTRY(__ieee754_fmodf)
 	flds	8(%esp)
 	flds	4(%esp)
-1:	fprem
+1:	fprem1
 	fstsw	%ax
 	sahf
 	jp	1b
diff --git a/sysdeps/i386/fpu/e_fmodl.c b/sysdeps/i386/fpu/e_fmodl.c
index c7c9a60456..97a06d0016 100644
--- a/sysdeps/i386/fpu/e_fmodl.c
+++ b/sysdeps/i386/fpu/e_fmodl.c
@@ -12,7 +12,7 @@ __ieee754_fmodl (long double x, long double y)
 {
   long double res;
 
-  asm ("1:\tfprem\n"
+  asm ("1:\tfprem1\n"
        "fstsw   %%ax\n"
        "sahf\n"
        "jp      1b\n"