24 files changed, 84 insertions, 80 deletions

diff --git a/lib/msun/Makefile b/lib/msun/Makefile
index f40fd199b47a..0e5cfa16b6c6 100644
--- a/lib/msun/Makefile
+++ b/lib/msun/Makefile
@@ -1,5 +1,5 @@
 #  @(#)Makefile 5.1beta 93/09/24
-#  $Id: Makefile,v 1.11.2.1 1997/02/15 05:33:05 bde Exp $
+#  $Id: Makefile,v 1.11.2.2 1997/02/15 14:07:05 jkh Exp $
 #
 #  ====================================================
 #  Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
@@ -41,9 +41,7 @@
 #					    default standard
 #
 
-# Enable if you have a i387 (or i486 or Pentium)
-.if defined(HAVE_FPU)
-.PATH:	${.CURDIR}/i387
+ARCH=	i387
 ARCH_SRCS = e_acos.S e_asin.S e_atan2.S e_exp.S e_fmod.S e_log.S e_log10.S \
 	    e_remainder.S e_scalb.S e_sqrt.S s_atan.S s_ceil.S s_copysign.S \
 	    s_cos.S s_finite.S s_floor.S s_ilogb.S s_logb.S \
@@ -51,7 +49,6 @@ ARCH_SRCS = e_acos.S e_asin.S e_atan2.S e_exp.S e_fmod.S e_log.S e_log10.S \
 
 # Broken
 # ARCH_SRCS+=	s_log1p.S
-.endif
 
 .PATH:	${.CURDIR}/man
 .PATH:	${.CURDIR}/src
@@ -67,6 +64,7 @@ COMMON_SRCS =	e_acos.c e_acosf.c e_acosh.c e_acoshf.c e_asin.c e_asinf.c \
 	e_log.c e_log10.c e_log10f.c e_logf.c e_pow.c e_powf.c e_rem_pio2.c \
 	e_rem_pio2f.c e_remainder.c e_remainderf.c e_scalb.c e_scalbf.c \
 	e_sinh.c e_sinhf.c e_sqrt.c e_sqrtf.c \
+	get_hw_float.c \
 	k_cos.c k_cosf.c k_rem_pio2.c k_rem_pio2f.c k_sin.c k_sinf.c \
 	k_standard.c k_tan.c k_tanf.c \
 	s_asinh.c s_asinhf.c s_atan.c s_atanf.c s_cbrt.c s_cbrtf.c s_ceil.c \
@@ -90,12 +88,18 @@ COMMON_SRCS =	e_acos.c e_acosf.c e_acosh.c e_acoshf.c e_asin.c e_asinf.c \
 # FreeBSD's C library supplies these functions:
 #COMMON_SRCS+=	s_fabs.c s_frexp.c s_isnan.c s_ldexp.c s_modf.c
 
+CLEANFILES+=	${RENAMED_ARCH_SRCS}
+RENAMED_ARCH_SRCS=	${ARCH_SRCS:S/^/${ARCH}_/g}
+SRCS=	${COMMON_SRCS} ${RENAMED_ARCH_SRCS}
 
-SRCS=${COMMON_SRCS}
-
-# Substitute common sources with any arch specific sources
+# Generate rules to rename arch-specific sources to avoid conflicts.
+# The path to the arch-specific sources is given explicitly instead of
+# with `.PATH:	${.CURDIR}/${ARCH}' since otherwise bsd.lib.mk would
+# use .S.o rules instead of .c.o rules for the conflicting prefixes
+# (except after `make depend' it uses the correct rules!).
 .for i in ${ARCH_SRCS}
-    SRCS:=${SRCS:S/${i:S/.S/.c/}/$i/}
+${ARCH}_${i}: ${.CURDIR}/i387/${i}
+	cp ${.ALLSRC} ${.TARGET}
 .endfor
 
 MANSRC= ${.CURDIR}/man
diff --git a/lib/msun/src/e_acos.c b/lib/msun/src/e_acos.c
index 5f09e63d1e62..804c2c2e0933 100644
--- a/lib/msun/src/e_acos.c
+++ b/lib/msun/src/e_acos.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: e_acos.c,v 1.1.1.1 1994/08/19 09:39:43 jkh Exp $";
+static char rcsid[] = "$Id: e_acos.c,v 1.2 1995/05/30 05:47:51 rgrimes Exp $";
 #endif
 
 /* __ieee754_acos(x)
@@ -62,9 +62,9 @@ qS3 = -6.88283971605453293030e-01, /* 0xBFE6066C, 0x1B8D0159 */
 qS4 =  7.70381505559019352791e-02; /* 0x3FB3B8C5, 0xB12E9282 */
 
 #ifdef __STDC__
-	double __ieee754_acos(double x)
+	double __generic___ieee754_acos(double x)
 #else
-	double __ieee754_acos(x)
+	double __generic___ieee754_acos(x)
 	double x;
 #endif
 {
diff --git a/lib/msun/src/e_asin.c b/lib/msun/src/e_asin.c
index 6863668a9c4f..9ca49b2d5961 100644
--- a/lib/msun/src/e_asin.c
+++ b/lib/msun/src/e_asin.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: e_asin.c,v 1.2 1995/05/30 05:47:55 rgrimes Exp $";
+static char rcsid[] = "$Id: e_asin.c,v 1.3 1996/07/12 18:57:45 jkh Exp $";
 #endif
 
 /* __ieee754_asin(x)
@@ -71,9 +71,9 @@ qS3 = -6.88283971605453293030e-01, /* 0xBFE6066C, 0x1B8D0159 */
 qS4 =  7.70381505559019352791e-02; /* 0x3FB3B8C5, 0xB12E9282 */
 
 #ifdef __STDC__
-	double __ieee754_asin(double x)
+	double __generic___ieee754_asin(double x)
 #else
-	double __ieee754_asin(x)
+	double __generic___ieee754_asin(x)
 	double x;
 #endif
 {
diff --git a/lib/msun/src/e_atan2.c b/lib/msun/src/e_atan2.c
index 4da135cdb5b3..f664a3044a52 100644
--- a/lib/msun/src/e_atan2.c
+++ b/lib/msun/src/e_atan2.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: e_atan2.c,v 1.2 1995/05/30 05:47:57 rgrimes Exp $";
+static char rcsid[] = "$Id: e_atan2.c,v 1.3 1996/07/12 18:57:51 jkh Exp $";
 #endif
 
 /* __ieee754_atan2(y,x)
@@ -57,9 +57,9 @@ pi      = 3.1415926535897931160E+00, /* 0x400921FB, 0x54442D18 */
 pi_lo   = 1.2246467991473531772E-16; /* 0x3CA1A626, 0x33145C07 */
 
 #ifdef __STDC__
-	double __ieee754_atan2(double y, double x)
+	double __generic___ieee754_atan2(double y, double x)
 #else
-	double __ieee754_atan2(y,x)
+	double __generic___ieee754_atan2(y,x)
 	double  y,x;
 #endif
 {
diff --git a/lib/msun/src/e_exp.c b/lib/msun/src/e_exp.c
index 3777a6f9317a..9a3735e1543b 100644
--- a/lib/msun/src/e_exp.c
+++ b/lib/msun/src/e_exp.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: e_exp.c,v 1.2 1995/05/30 05:48:08 rgrimes Exp $";
+static char rcsid[] = "$Id: e_exp.c,v 1.3 1996/07/12 18:57:55 jkh Exp $";
 #endif
 
 /* __ieee754_exp(x)
@@ -104,9 +104,9 @@ P5   =  4.13813679705723846039e-08; /* 0x3E663769, 0x72BEA4D0 */
 
 
 #ifdef __STDC__
-	double __ieee754_exp(double x)	/* default IEEE double exp */
+	double __generic___ieee754_exp(double x)	/* default IEEE double exp */
 #else
-	double __ieee754_exp(x)	/* default IEEE double exp */
+	double __generic___ieee754_exp(x)	/* default IEEE double exp */
 	double x;
 #endif
 {
diff --git a/lib/msun/src/e_fmod.c b/lib/msun/src/e_fmod.c
index d784c6848bac..dc9ef8ccfd8d 100644
--- a/lib/msun/src/e_fmod.c
+++ b/lib/msun/src/e_fmod.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: e_fmod.c,v 1.1.1.1 1994/08/19 09:39:43 jkh Exp $";
+static char rcsid[] = "$Id: e_fmod.c,v 1.2 1995/05/30 05:48:10 rgrimes Exp $";
 #endif
 
 /*
@@ -30,9 +30,9 @@ static double one = 1.0, Zero[] = {0.0, -0.0,};
 #endif
 
 #ifdef __STDC__
-	double __ieee754_fmod(double x, double y)
+	double __generic___ieee754_fmod(double x, double y)
 #else
-	double __ieee754_fmod(x,y)
+	double __generic___ieee754_fmod(x,y)
 	double x,y ;
 #endif
 {
diff --git a/lib/msun/src/e_log.c b/lib/msun/src/e_log.c
index 67e2d216b7fa..eca1a8e01561 100644
--- a/lib/msun/src/e_log.c
+++ b/lib/msun/src/e_log.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: e_log.c,v 1.1.1.1 1994/08/19 09:39:44 jkh Exp $";
+static char rcsid[] = "$Id: e_log.c,v 1.2 1995/05/30 05:48:30 rgrimes Exp $";
 #endif
 
 /* __ieee754_log(x)
@@ -91,9 +91,9 @@ static double zero   =  0.0;
 #endif
 
 #ifdef __STDC__
-	double __ieee754_log(double x)
+	double __generic___ieee754_log(double x)
 #else
-	double __ieee754_log(x)
+	double __generic___ieee754_log(x)
 	double x;
 #endif
 {
diff --git a/lib/msun/src/e_log10.c b/lib/msun/src/e_log10.c
index 4f4ed28933fd..eed3d8f4df53 100644
--- a/lib/msun/src/e_log10.c
+++ b/lib/msun/src/e_log10.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: e_log10.c,v 1.2 1995/04/07 23:23:23 bde Exp $";
+static char rcsid[] = "$Id: e_log10.c,v 1.3 1995/05/30 05:48:30 rgrimes Exp $";
 #endif
 
 /* __ieee754_log10(x)
@@ -67,9 +67,9 @@ static double zero   =  0.0;
 #endif
 
 #ifdef __STDC__
-	double __ieee754_log10(double x)
+	double __generic___ieee754_log10(double x)
 #else
-	double __ieee754_log10(x)
+	double __generic___ieee754_log10(x)
 	double x;
 #endif
 {
diff --git a/lib/msun/src/e_remainder.c b/lib/msun/src/e_remainder.c
index 430418d2ea2f..e08c0ac6b042 100644
--- a/lib/msun/src/e_remainder.c
+++ b/lib/msun/src/e_remainder.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: e_remainder.c,v 1.1.1.1 1994/08/19 09:39:44 jkh Exp $";
+static char rcsid[] = "$Id: e_remainder.c,v 1.2 1995/05/30 05:48:39 rgrimes Exp $";
 #endif
 
 /* __ieee754_remainder(x,p)
@@ -34,9 +34,9 @@ static double zero = 0.0;
 
 
 #ifdef __STDC__
-	double __ieee754_remainder(double x, double p)
+	double __generic___ieee754_remainder(double x, double p)
 #else
-	double __ieee754_remainder(x,p)
+	double __generic___ieee754_remainder(x,p)
 	double x,p;
 #endif
 {
diff --git a/lib/msun/src/e_scalb.c b/lib/msun/src/e_scalb.c
index 1000bc7e1de0..d85b0bdb3e80 100644
--- a/lib/msun/src/e_scalb.c
+++ b/lib/msun/src/e_scalb.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: e_scalb.c,v 1.1.1.1 1994/08/19 09:39:44 jkh Exp $";
+static char rcsid[] = "$Id: e_scalb.c,v 1.2 1995/05/30 05:48:43 rgrimes Exp $";
 #endif
 
 /*
@@ -25,16 +25,16 @@ static char rcsid[] = "$Id: e_scalb.c,v 1.1.1.1 1994/08/19 09:39:44 jkh Exp $";
 
 #ifdef _SCALB_INT
 #ifdef __STDC__
-	double __ieee754_scalb(double x, int fn)
+	double __generic___ieee754_scalb(double x, int fn)
 #else
-	double __ieee754_scalb(x,fn)
+	double __generic___ieee754_scalb(x,fn)
 	double x; int fn;
 #endif
 #else
 #ifdef __STDC__
-	double __ieee754_scalb(double x, double fn)
+	double __generic___ieee754_scalb(double x, double fn)
 #else
-	double __ieee754_scalb(x,fn)
+	double __generic___ieee754_scalb(x,fn)
 	double x, fn;
 #endif
 #endif
diff --git a/lib/msun/src/e_sqrt.c b/lib/msun/src/e_sqrt.c
index d805e33ab867..ddd33fd9e3e7 100644
--- a/lib/msun/src/e_sqrt.c
+++ b/lib/msun/src/e_sqrt.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: e_sqrt.c,v 1.1.1.1 1994/08/19 09:39:44 jkh Exp $";
+static char rcsid[] = "$Id: e_sqrt.c,v 1.2 1995/05/30 05:48:50 rgrimes Exp $";
 #endif
 
 /* __ieee754_sqrt(x)
@@ -94,9 +94,9 @@ static	double	one	= 1.0, tiny=1.0e-300;
 #endif
 
 #ifdef __STDC__
-	double __ieee754_sqrt(double x)
+	double __generic___ieee754_sqrt(double x)
 #else
-	double __ieee754_sqrt(x)
+	double __generic___ieee754_sqrt(x)
 	double x;
 #endif
 {
diff --git a/lib/msun/src/s_atan.c b/lib/msun/src/s_atan.c
index f53462bb3895..94c6210c2158 100644
--- a/lib/msun/src/s_atan.c
+++ b/lib/msun/src/s_atan.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: s_atan.c,v 1.1.1.1 1994/08/19 09:39:45 jkh Exp $";
+static char rcsid[] = "$Id: s_atan.c,v 1.2 1995/05/30 05:49:20 rgrimes Exp $";
 #endif
 
 /* atan(x)
@@ -86,9 +86,9 @@ one   = 1.0,
 huge   = 1.0e300;
 
 #ifdef __STDC__
-	double atan(double x)
+	double __generic_atan(double x)
 #else
-	double atan(x)
+	double __generic_atan(x)
 	double x;
 #endif
 {
diff --git a/lib/msun/src/s_ceil.c b/lib/msun/src/s_ceil.c
index 749bc606bb9a..6f49bb4d3b3f 100644
--- a/lib/msun/src/s_ceil.c
+++ b/lib/msun/src/s_ceil.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: s_ceil.c,v 1.1.1.1 1994/08/19 09:39:51 jkh Exp $";
+static char rcsid[] = "$Id: s_ceil.c,v 1.2 1995/05/30 05:49:25 rgrimes Exp $";
 #endif
 
 /*
@@ -33,9 +33,9 @@ static double huge = 1.0e300;
 #endif
 
 #ifdef __STDC__
-	double ceil(double x)
+	double __generic_ceil(double x)
 #else
-	double ceil(x)
+	double __generic_ceil(x)
 	double x;
 #endif
 {
diff --git a/lib/msun/src/s_copysign.c b/lib/msun/src/s_copysign.c
index 30fea0e6a314..7ece0ad5873a 100644
--- a/lib/msun/src/s_copysign.c
+++ b/lib/msun/src/s_copysign.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: s_copysign.c,v 1.1.1.1 1994/08/19 09:39:51 jkh Exp $";
+static char rcsid[] = "$Id: s_copysign.c,v 1.2 1995/05/30 05:49:27 rgrimes Exp $";
 #endif
 
 /*
@@ -24,9 +24,9 @@ static char rcsid[] = "$Id: s_copysign.c,v 1.1.1.1 1994/08/19 09:39:51 jkh Exp $
 #include "math_private.h"
 
 #ifdef __STDC__
-	double copysign(double x, double y)
+	double __generic_copysign(double x, double y)
 #else
-	double copysign(x,y)
+	double __generic_copysign(x,y)
 	double x,y;
 #endif
 {
diff --git a/lib/msun/src/s_cos.c b/lib/msun/src/s_cos.c
index b3666d33eb48..f1117f1be54d 100644
--- a/lib/msun/src/s_cos.c
+++ b/lib/msun/src/s_cos.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: s_cos.c,v 1.1.1.1 1994/08/19 09:39:51 jkh Exp $";
+static char rcsid[] = "$Id: s_cos.c,v 1.2 1995/05/30 05:49:29 rgrimes Exp $";
 #endif
 
 /* cos(x)
@@ -49,9 +49,9 @@ static char rcsid[] = "$Id: s_cos.c,v 1.1.1.1 1994/08/19 09:39:51 jkh Exp $";
 #include "math_private.h"
 
 #ifdef __STDC__
-	double cos(double x)
+	double __generic_cos(double x)
 #else
-	double cos(x)
+	double __generic_cos(x)
 	double x;
 #endif
 {
diff --git a/lib/msun/src/s_finite.c b/lib/msun/src/s_finite.c
index 5de602467f44..d484c056f3e3 100644
--- a/lib/msun/src/s_finite.c
+++ b/lib/msun/src/s_finite.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: s_finite.c,v 1.1.1.1 1994/08/19 09:39:51 jkh Exp $";
+static char rcsid[] = "$Id: s_finite.c,v 1.2 1995/05/30 05:49:37 rgrimes Exp $";
 #endif
 
 /*
@@ -23,9 +23,9 @@ static char rcsid[] = "$Id: s_finite.c,v 1.1.1.1 1994/08/19 09:39:51 jkh Exp $";
 #include "math_private.h"
 
 #ifdef __STDC__
-	int finite(double x)
+	int __generic_finite(double x)
 #else
-	int finite(x)
+	int __generic_finite(x)
 	double x;
 #endif
 {
diff --git a/lib/msun/src/s_floor.c b/lib/msun/src/s_floor.c
index 84b5c9db6504..65cef7adf9a8 100644
--- a/lib/msun/src/s_floor.c
+++ b/lib/msun/src/s_floor.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: s_floor.c,v 1.1.1.1 1994/08/19 09:39:51 jkh Exp $";
+static char rcsid[] = "$Id: s_floor.c,v 1.2 1995/05/30 05:49:39 rgrimes Exp $";
 #endif
 
 /*
@@ -33,9 +33,9 @@ static double huge = 1.0e300;
 #endif
 
 #ifdef __STDC__
-	double floor(double x)
+	double __generic_floor(double x)
 #else
-	double floor(x)
+	double __generic_floor(x)
 	double x;
 #endif
 {
diff --git a/lib/msun/src/s_ilogb.c b/lib/msun/src/s_ilogb.c
index c6263d80b87a..897d606989e4 100644
--- a/lib/msun/src/s_ilogb.c
+++ b/lib/msun/src/s_ilogb.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: s_ilogb.c,v 1.1.1.1 1994/08/19 09:39:52 jkh Exp $";
+static char rcsid[] = "$Id: s_ilogb.c,v 1.2 1995/05/30 05:49:45 rgrimes Exp $";
 #endif
 
 /* ilogb(double x)
@@ -24,9 +24,9 @@ static char rcsid[] = "$Id: s_ilogb.c,v 1.1.1.1 1994/08/19 09:39:52 jkh Exp $";
 #include "math_private.h"
 
 #ifdef __STDC__
-	int ilogb(double x)
+	int __generic_ilogb(double x)
 #else
-	int ilogb(x)
+	int __generic_ilogb(x)
 	double x;
 #endif
 {
diff --git a/lib/msun/src/s_logb.c b/lib/msun/src/s_logb.c
index 96e8fc46b61e..a34950e09bcd 100644
--- a/lib/msun/src/s_logb.c
+++ b/lib/msun/src/s_logb.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: s_logb.c,v 1.1.1.1 1994/08/19 09:39:52 jkh Exp $";
+static char rcsid[] = "$Id: s_logb.c,v 1.2 1995/05/30 05:49:59 rgrimes Exp $";
 #endif
 
 /*
@@ -24,9 +24,9 @@ static char rcsid[] = "$Id: s_logb.c,v 1.1.1.1 1994/08/19 09:39:52 jkh Exp $";
 #include "math_private.h"
 
 #ifdef __STDC__
-	double logb(double x)
+	double __generic_logb(double x)
 #else
-	double logb(x)
+	double __generic_logb(x)
 	double x;
 #endif
 {
diff --git a/lib/msun/src/s_rint.c b/lib/msun/src/s_rint.c
index 81a13965bc28..27b537c911a4 100644
--- a/lib/msun/src/s_rint.c
+++ b/lib/msun/src/s_rint.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: s_rint.c,v 1.2 1995/05/30 05:50:18 rgrimes Exp $";
+static char rcsid[] = "$Id: s_rint.c,v 1.3 1996/08/28 16:34:33 bde Exp $";
 #endif
 
 /*
@@ -45,9 +45,9 @@ TWO52[2]={
 };
 
 #ifdef __STDC__
-	double rint(double x)
+	double __generic_rint(double x)
 #else
-	double rint(x)
+	double __generic_rint(x)
 	double x;
 #endif
 {
diff --git a/lib/msun/src/s_scalbn.c b/lib/msun/src/s_scalbn.c
index 6549931fb34d..4c9c98d6e0f6 100644
--- a/lib/msun/src/s_scalbn.c
+++ b/lib/msun/src/s_scalbn.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: s_scalbn.c,v 1.1.1.1 1994/08/19 09:39:52 jkh Exp $";
+static char rcsid[] = "$Id: s_scalbn.c,v 1.2 1995/05/30 05:50:23 rgrimes Exp $";
 #endif
 
 /*
@@ -35,9 +35,9 @@ huge   = 1.0e+300,
 tiny   = 1.0e-300;
 
 #ifdef __STDC__
-	double scalbn (double x, int n)
+	double __generic_scalbn (double x, int n)
 #else
-	double scalbn (x,n)
+	double __generic_scalbn (x,n)
 	double x; int n;
 #endif
 {
diff --git a/lib/msun/src/s_significand.c b/lib/msun/src/s_significand.c
index b30e6f290d77..2f3d9b61db17 100644
--- a/lib/msun/src/s_significand.c
+++ b/lib/msun/src/s_significand.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: s_significand.c,v 1.1.1.1 1994/08/19 09:39:52 jkh Exp $";
+static char rcsid[] = "$Id: s_significand.c,v 1.2 1995/05/30 05:50:26 rgrimes Exp $";
 #endif
 
 /*
@@ -24,9 +24,9 @@ static char rcsid[] = "$Id: s_significand.c,v 1.1.1.1 1994/08/19 09:39:52 jkh Ex
 #include "math_private.h"
 
 #ifdef __STDC__
-	double significand(double x)
+	double __generic_significand(double x)
 #else
-	double significand(x)
+	double __generic_significand(x)
 	double x;
 #endif
 {
diff --git a/lib/msun/src/s_sin.c b/lib/msun/src/s_sin.c
index a06d8b084d28..80fe27b77ef3 100644
--- a/lib/msun/src/s_sin.c
+++ b/lib/msun/src/s_sin.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: s_sin.c,v 1.1.1.1 1994/08/19 09:39:52 jkh Exp $";
+static char rcsid[] = "$Id: s_sin.c,v 1.2 1995/05/30 05:50:30 rgrimes Exp $";
 #endif
 
 /* sin(x)
@@ -49,9 +49,9 @@ static char rcsid[] = "$Id: s_sin.c,v 1.1.1.1 1994/08/19 09:39:52 jkh Exp $";
 #include "math_private.h"
 
 #ifdef __STDC__
-	double sin(double x)
+	double __generic_sin(double x)
 #else
-	double sin(x)
+	double __generic_sin(x)
 	double x;
 #endif
 {
diff --git a/lib/msun/src/s_tan.c b/lib/msun/src/s_tan.c
index 24a406323d27..1f8e9d8693a9 100644
--- a/lib/msun/src/s_tan.c
+++ b/lib/msun/src/s_tan.c
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: s_tan.c,v 1.1.1.1 1994/08/19 09:39:53 jkh Exp $";
+static char rcsid[] = "$Id: s_tan.c,v 1.2 1995/05/30 05:50:33 rgrimes Exp $";
 #endif
 
 /* tan(x)
@@ -48,9 +48,9 @@ static char rcsid[] = "$Id: s_tan.c,v 1.1.1.1 1994/08/19 09:39:53 jkh Exp $";
 #include "math_private.h"
 
 #ifdef __STDC__
-	double tan(double x)
+	double __generic_tan(double x)
 #else
-	double tan(x)
+	double __generic_tan(x)
 	double x;
 #endif
 {