[BZ #3325]

	* sysdeps/i386/fpu/e_fmodf.S: Revert last changes, keep using fprem.
	* sysdeps/i386/fpu/e_fmodl.c: Likewise.
	* sysdeps/i386/fpu/e_fmod.S: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 152b4d2..e150f9b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2007-02-21  Ulrich Drepper  <drepper@redhat.com>
 
+       [BZ #3325]
+       * sysdeps/i386/fpu/e_fmodf.S: Revert last changes, keep using fprem.
+       * sysdeps/i386/fpu/e_fmodl.c: Likewise.
+       * sysdeps/i386/fpu/e_fmod.S: Likewise.
+
        [BZ #3458]
        * sysdeps/unix/sysv/linux/posix_madvise.c: New file.
        * sysdeps/unix/sysv/linux/syscalls.list: Remove posix_madvise entry.

diff --git a/sysdeps/i386/fpu/e_fmod.S b/sysdeps/i386/fpu/e_fmod.S
index e801286..4cf6e92 100644 (file)
--- 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:     fprem1
+1:     fprem
        fstsw   %ax
        sahf
        jp      1b

diff --git a/sysdeps/i386/fpu/e_fmodf.S b/sysdeps/i386/fpu/e_fmodf.S
index 1850af0..bbce409 100644 (file)
--- 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:     fprem1
+1:     fprem
        fstsw   %ax
        sahf
        jp      1b

diff --git a/sysdeps/i386/fpu/e_fmodl.c b/sysdeps/i386/fpu/e_fmodl.c
index 97a06d0..c7c9a60 100644 (file)
--- 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:\tfprem1\n"
+  asm ("1:\tfprem\n"
        "fstsw   %%ax\n"
        "sahf\n"
        "jp      1b\n"

diff --git a/sysdeps/unix/sysv/linux/posix_madvise.c b/sysdeps/unix/sysv/linux/posix_madvise.c
index d0e476b..880b17e 100644 (file)
--- a/sysdeps/unix/sysv/linux/posix_madvise.c
+++ b/sysdeps/unix/sysv/linux/posix_madvise.c
@@ -21,18 +21,18 @@
 
 
 int
-posix_madvise (void *addr, size_t len, int advise)
+posix_madvise (void *addr, size_t len, int advice)
 {
   /* We have one problem: the kernel's MADV_DONTNEED does not
      correspond to POSIX's POSIX_MADV_DONTNEED.  The former simply
      discards changes made to the memory without writing it back to
      disk, if this would be necessary.  The POSIX behavior does not
      allow this.  There is no functionality mapping the POSIX behavior
-     so far so we ignore that advise for now.  */
-  if (advise == POSIX_MADV_DONTNEED)
+     so far so we ignore that advice for now.  */
+  if (advice == POSIX_MADV_DONTNEED)
     return 0;
 
   INTERNAL_SYSCALL_DECL (err);
-  int result = INTERNAL_SYSCALL (madvise, err, 3, addr, len, advise);
+  int result = INTERNAL_SYSCALL (madvise, err, 3, addr, len, advice);
   return INTERNAL_SYSCALL_ERRNO (result, err);
 }