[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 152b4d220216d431d593809fae1db72944d646d4..e150f9bbd875595f74320f8889690351fe0a23cb 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 e801286a9b3394952056f86d8e58612354cd3601..4cf6e9205464a01a65ded93e216f6cffb467b0f3 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 1850af098e979b68ac9eaf838bfee3c16793275f..bbce40976db657c961429d2e5ffd00d48de9e671 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 97a06d00169f0a001ae6584c1ccd6b9ed418bb40..c7c9a60456eacf675c7430dc26f39ae8bf158885 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 d0e476b61e2fe03216748c984ff01b36fb82fd10..880b17ef313b3d297c09db21ffc0a4b5135fc014 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);
 }