svn commit: r193370 - projects/clangbsd/lib/msun/src

[Ed Schouten]

Author: ed
Date: Wed Jun  3 08:21:11 2009
New Revision: 193370
URL: http://svn.freebsd.org/changeset/base/193370

Log:
  Commit local msun changes.
  
  Apart from changes similar to r193368, I have to disable inline asm in
  msun, related to LLVM PR3678.

Modified:
  projects/clangbsd/lib/msun/src/e_rem_pio2.c
  projects/clangbsd/lib/msun/src/e_rem_pio2f.c
  projects/clangbsd/lib/msun/src/k_cosf.c
  projects/clangbsd/lib/msun/src/k_sinf.c
  projects/clangbsd/lib/msun/src/k_tanf.c
  projects/clangbsd/lib/msun/src/math_private.h

Modified: projects/clangbsd/lib/msun/src/e_rem_pio2.c
==============================================================================
--- projects/clangbsd/lib/msun/src/e_rem_pio2.c	Wed Jun  3 08:17:18 2009	(r193369)
+++ projects/clangbsd/lib/msun/src/e_rem_pio2.c	Wed Jun  3 08:21:11 2009	(r193370)
@@ -48,10 +48,10 @@ pio2_2t =  2.02226624879595063154e-21, /
 pio2_3  =  2.02226624871116645580e-21, /* 0x3BA3198A, 0x2E000000 */
 pio2_3t =  8.47842766036889956997e-32; /* 0x397B839A, 0x252049C1 */
 
-#ifdef INLINE_REM_PIO2
-extern __gnu89_inline
+#ifndef INLINE_REM_PIO2
+extern
 #endif
-int
+__inline int
 __ieee754_rem_pio2(double x, double *y)
 {
 	double z,w,t,r,fn;

Modified: projects/clangbsd/lib/msun/src/e_rem_pio2f.c
==============================================================================
--- projects/clangbsd/lib/msun/src/e_rem_pio2f.c	Wed Jun  3 08:17:18 2009	(r193369)
+++ projects/clangbsd/lib/msun/src/e_rem_pio2f.c	Wed Jun  3 08:21:11 2009	(r193370)
@@ -40,10 +40,10 @@ invpio2 =  6.36619772367581382433e-01, /
 pio2_1  =  1.57079631090164184570e+00, /* 0x3FF921FB, 0x50000000 */
 pio2_1t =  1.58932547735281966916e-08; /* 0x3E5110b4, 0x611A6263 */
 
-#ifdef INLINE_REM_PIO2F
-extern __gnu89_inline
+#ifndef INLINE_REM_PIO2F
+extern
 #endif
-int
+__inline int
 __ieee754_rem_pio2f(float x, double *y)
 {
 	double w,r,fn;

Modified: projects/clangbsd/lib/msun/src/k_cosf.c
==============================================================================
--- projects/clangbsd/lib/msun/src/k_cosf.c	Wed Jun  3 08:17:18 2009	(r193369)
+++ projects/clangbsd/lib/msun/src/k_cosf.c	Wed Jun  3 08:21:11 2009	(r193370)
@@ -30,10 +30,10 @@ C1  =  0x155553e1053a42.0p-57,	/*  0.041
 C2  = -0x16c087e80f1e27.0p-62,	/* -0.00138867637746099294692 */
 C3  =  0x199342e0ee5069.0p-68;	/*  0.0000243904487962774090654 */
 
-#ifdef INLINE_KERNEL_COSDF
-extern __gnu89_inline
+#ifndef INLINE_KERNEL_COSDF
+extern
 #endif
-float
+__inline float
 __kernel_cosdf(double x)
 {
 	double r, w, z;

Modified: projects/clangbsd/lib/msun/src/k_sinf.c
==============================================================================
--- projects/clangbsd/lib/msun/src/k_sinf.c	Wed Jun  3 08:17:18 2009	(r193369)
+++ projects/clangbsd/lib/msun/src/k_sinf.c	Wed Jun  3 08:21:11 2009	(r193370)
@@ -29,10 +29,10 @@ S2 =  0x111110896efbb2.0p-59,	/*  0.0083
 S3 = -0x1a00f9e2cae774.0p-65,	/* -0.000198393348360966317347 */
 S4 =  0x16cd878c3b46a7.0p-71;	/*  0.0000027183114939898219064 */
 
-#ifdef INLINE_KERNEL_SINDF
-extern __gnu89_inline
+#ifndef INLINE_KERNEL_SINDF
+extern
 #endif
-float
+__inline float
 __kernel_sindf(double x)
 {
 	double r, s, w, z;

Modified: projects/clangbsd/lib/msun/src/k_tanf.c
==============================================================================
--- projects/clangbsd/lib/msun/src/k_tanf.c	Wed Jun  3 08:17:18 2009	(r193369)
+++ projects/clangbsd/lib/msun/src/k_tanf.c	Wed Jun  3 08:21:11 2009	(r193370)
@@ -32,10 +32,10 @@ T[] =  {
   0x1362b9bf971bcd.0p-59,	/* 0.00946564784943673166728 */
 };
 
-#ifdef INLINE_KERNEL_TANDF
-extern __gnu89_inline
+#ifndef INLINE_KERNEL_TANDF
+extern
 #endif
-float
+__inline float
 __kernel_tandf(double x, int iy)
 {
 	double z,r,w,s,t,u;

Modified: projects/clangbsd/lib/msun/src/math_private.h
==============================================================================
--- projects/clangbsd/lib/msun/src/math_private.h	Wed Jun  3 08:17:18 2009	(r193369)
+++ projects/clangbsd/lib/msun/src/math_private.h	Wed Jun  3 08:21:11 2009	(r193370)
@@ -252,7 +252,7 @@ cpackl(long double x, long double y)
 }
 #endif /* _COMPLEX_H */
  
-#ifdef __GNUCLIKE_ASM
+#if defined(__GNUCLIKE_ASM) && !defined(__clang__)
 
 /* Asm versions of some functions. */
 
@@ -280,7 +280,7 @@ irint(double x)
 #define	HAVE_EFFICIENT_IRINT
 #endif
 
-#endif /* __GNUCLIKE_ASM */
+#endif /* __GNUCLIKE_ASM && !__clang__ */
 
 /*
  * ieee style elementary functions
@@ -345,15 +345,30 @@ irint(double x)
 int	__kernel_rem_pio2(double*,double*,int,int,int);
 
 /* double precision kernel functions */
+#ifdef INLINE_REM_PIO2
+__inline
+#endif
 int	__ieee754_rem_pio2(double,double*);
 double	__kernel_sin(double,double,int);
 double	__kernel_cos(double,double);
 double	__kernel_tan(double,double,int);
 
 /* float precision kernel functions */
+#ifdef INLINE_REM_PIO2F
+__inline
+#endif
 int	__ieee754_rem_pio2f(float,double*);
+#ifdef INLINE_KERNEL_SINDF
+__inline
+#endif
 float	__kernel_sindf(double);
+#ifdef INLINE_KERNEL_COSDF
+__inline
+#endif
 float	__kernel_cosdf(double);
+#ifdef INLINE_KERNEL_TANDF
+__inline
+#endif
 float	__kernel_tandf(double,int);
 
 /* long double precision kernel functions */