summaryrefslogtreecommitdiff
path: root/sysdeps
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/generic/strtok_r.c5
-rw-r--r--sysdeps/i386/i686/Implies1
-rw-r--r--sysdeps/i386/strtok_r.S3
-rw-r--r--sysdeps/libm-i387/i686/s_fdim.S7
-rw-r--r--sysdeps/libm-i387/i686/s_fdimf.S7
-rw-r--r--sysdeps/libm-i387/i686/s_fdiml.S7
-rw-r--r--sysdeps/libm-i387/i686/s_fmin.S4
-rw-r--r--sysdeps/libm-i387/i686/s_fminf.S4
-rw-r--r--sysdeps/libm-i387/i686/s_fminl.S4
9 files changed, 24 insertions, 18 deletions
diff --git a/sysdeps/generic/strtok_r.c b/sysdeps/generic/strtok_r.c
index 44430dae40..26d7da5176 100644
--- a/sysdeps/generic/strtok_r.c
+++ b/sysdeps/generic/strtok_r.c
@@ -1,5 +1,5 @@
/* Reentrant string tokenizer. Generic version.
- Copyright (C) 1991, 1996, 1997 Free Software Foundation, Inc.
+ Copyright (C) 1991, 1996, 1997, 1998 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
@@ -32,7 +32,7 @@
// s = "abc\0-def\0"
*/
char *
-strtok_r (s, delim, save_ptr)
+__strtok_r (s, delim, save_ptr)
char *s;
const char *delim;
char **save_ptr;
@@ -61,3 +61,4 @@ strtok_r (s, delim, save_ptr)
}
return token;
}
+weak_alias (__strtok_r, strtok_r)
diff --git a/sysdeps/i386/i686/Implies b/sysdeps/i386/i686/Implies
index b5c05ec7f2..5e3b4cb5e7 100644
--- a/sysdeps/i386/i686/Implies
+++ b/sysdeps/i386/i686/Implies
@@ -2,3 +2,4 @@
# not really good to use heavily i586 optimized code on a i686. It's
# better to use i486/i386 code.
i386/i486
+libm-i387/i686
diff --git a/sysdeps/i386/strtok_r.S b/sysdeps/i386/strtok_r.S
index 297ba282ac..c048e41cb6 100644
--- a/sysdeps/i386/strtok_r.S
+++ b/sysdeps/i386/strtok_r.S
@@ -1,3 +1,4 @@
-#define FUNCTION strtok_r
+#define FUNCTION __strtok_r
#define USE_AS_STRTOK_R 1
#include <sysdeps/i386/strtok.S>
+weak_alias (__strtok_r, strtok_r)
diff --git a/sysdeps/libm-i387/i686/s_fdim.S b/sysdeps/libm-i387/i686/s_fdim.S
index 1ecae61aa9..3f9f61b57d 100644
--- a/sysdeps/libm-i387/i686/s_fdim.S
+++ b/sysdeps/libm-i387/i686/s_fdim.S
@@ -1,5 +1,5 @@
/* Compute positive difference.
- Copyright (C) 1997 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1998 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@@ -30,11 +30,12 @@ ENTRY(__fdim)
fsubp %st(1), %st
fldz
- fcmovnb %st(1), %st
+ fcomi %st(1), %st
+ fcmovb %st(1), %st
jmp 2f
1: fucomi %st(0), %st
- fcmovu %st, %st(1)
+ fcmovnu %st(1), %st
2: fstp %st(1)
ret
END(__fdim)
diff --git a/sysdeps/libm-i387/i686/s_fdimf.S b/sysdeps/libm-i387/i686/s_fdimf.S
index 0d2ef3cc1a..8b5cec6a3b 100644
--- a/sysdeps/libm-i387/i686/s_fdimf.S
+++ b/sysdeps/libm-i387/i686/s_fdimf.S
@@ -1,5 +1,5 @@
/* Compute positive difference.
- Copyright (C) 1997 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1998 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@@ -30,11 +30,12 @@ ENTRY(__fdimf)
fsubp %st(1), %st
fldz
- fcmovnb %st(1), %st
+ fcomi %st(1), %st
+ fcmovb %st(1), %st
jmp 2f
1: fucomi %st(0), %st
- fcmovu %st, %st(1)
+ fcmovnu %st(1), %st
2: fstp %st(1)
ret
END(__fdimf)
diff --git a/sysdeps/libm-i387/i686/s_fdiml.S b/sysdeps/libm-i387/i686/s_fdiml.S
index 94510df756..e9f0535a3a 100644
--- a/sysdeps/libm-i387/i686/s_fdiml.S
+++ b/sysdeps/libm-i387/i686/s_fdiml.S
@@ -1,5 +1,5 @@
/* Compute positive difference.
- Copyright (C) 1997 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1998 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@@ -30,11 +30,12 @@ ENTRY(__fdiml)
fsubp %st(1), %st
fldz
- fcmovnb %st(1), %st
+ fcomi %st(1), %st
+ fcmovb %st(1), %st
jmp 2f
1: fucomi %st(0), %st
- fcmovu %st, %st(1)
+ fcmovnu %st(1), %st
2: fstp %st(1)
ret
END(__fdiml)
diff --git a/sysdeps/libm-i387/i686/s_fmin.S b/sysdeps/libm-i387/i686/s_fmin.S
index 9df029996d..383e9579f6 100644
--- a/sysdeps/libm-i387/i686/s_fmin.S
+++ b/sysdeps/libm-i387/i686/s_fmin.S
@@ -1,5 +1,5 @@
/* Compute minimum of two numbers, regarding NaN as missing argument.
- Copyright (C) 1997 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1998 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@@ -29,7 +29,7 @@ ENTRY(__fmin)
fcmovu %st(1), %st // now %st contains y if not NaN, x otherwise
fucomi %st(1), %st
- fcmovb %st(1), %st
+ fcmovnb %st(1), %st
fstp %st(1)
diff --git a/sysdeps/libm-i387/i686/s_fminf.S b/sysdeps/libm-i387/i686/s_fminf.S
index a1d1497c15..f3dae00377 100644
--- a/sysdeps/libm-i387/i686/s_fminf.S
+++ b/sysdeps/libm-i387/i686/s_fminf.S
@@ -1,5 +1,5 @@
/* Compute minimum of two numbers, regarding NaN as missing argument.
- Copyright (C) 1997 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1998 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@@ -29,7 +29,7 @@ ENTRY(__fminf)
fcmovu %st(1), %st // now %st contains y if not NaN, x otherwise
fucomi %st(1), %st
- fcmovb %st(1), %st
+ fcmovnb %st(1), %st
fstp %st(1)
diff --git a/sysdeps/libm-i387/i686/s_fminl.S b/sysdeps/libm-i387/i686/s_fminl.S
index 089be40bd4..f125531112 100644
--- a/sysdeps/libm-i387/i686/s_fminl.S
+++ b/sysdeps/libm-i387/i686/s_fminl.S
@@ -1,5 +1,5 @@
/* Compute minimum of two numbers, regarding NaN as missing argument.
- Copyright (C) 1997 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1998 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@@ -29,7 +29,7 @@ ENTRY(__fminl)
fcmovu %st(1), %st // now %st contains y if not NaN, x otherwise
fucomi %st(1), %st
- fcmovb %st(1), %st
+ fcmovnb %st(1), %st
fstp %st(1)
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-08 14:49:33 +0000