Get the ld80 routines from OpenBSD to build on mac and linux.

ViralBShah · ViralBShah · commit 9ecf223fc1f9 · 2014-12-04T23:56:11.000+05:30
Bump version number and SO major version, since we have
introduced new long double APIs.
diff --git a/Make.inc b/Make.inc
@@ -3,8 +3,8 @@
 OS := $(shell uname)
 # Do not forget to bump SOMINOR when changing VERSION,
 # and SOMAJOR when breaking ABI in a backward-incompatible way
-VERSION = 0.4
-SOMAJOR = 1
+VERSION = 0.5
+SOMAJOR = 2
 SOMINOR = 0
 DESTDIR =
 prefix = /usr/local
@@ -64,7 +64,7 @@ endif
 
 ifeq ($(ARCH),x86_64)
 override ARCH := amd64
-endif 
+endif
 
 ifneq (,$(findstring MINGW,$(OS)))
 override OS=WINNT
diff --git a/ld80/Make.files b/ld80/Make.files
@@ -1,10 +1,12 @@
 $(CUR_SRCS) += 	invtrig.c \
-            e_acoshl.c     e_hypotl.c     e_powl.c       k_tanl.c       s_exp2l.c      s_nanl.c \
+            e_acoshl.c     e_powl.c       k_tanl.c       s_exp2l.c \
             e_atanhl.c     e_lgammal.c    e_sinhl.c      s_asinhl.c     s_expm1l.c \
-            e_coshl.c      e_log10l.c     e_tgammal.c    s_floorl.c     s_nextafterl.c \
-            e_expl.c       e_log2l.c      k_cosl.c       s_ceill.c      s_log1pl.c     s_tanhl.c \
-            e_fmodl.c      e_logl.c       k_sinl.c       s_erfl.c       s_modfl.c      s_truncl.c
-#           s_remquol.c
+            e_coshl.c      e_log10l.c     e_tgammal.c \
+            e_expl.c       e_log2l.c      k_cosl.c       s_log1pl.c     s_tanhl.c \
+            e_logl.c       k_sinl.c       s_erfl.c
+
+#           s_remquol.c    e_fmodl.c      s_truncl.c
+#           e_hypotl.c     s_floorl.c     s_nextafterl.c s_ceill.c      s_modfl.c
 
 ifneq ($(OS), WINNT)
 $(CUR_SRCS) += s_nanl.c
diff --git a/ld80/e_acoshl.c b/ld80/e_acoshl.c
@@ -24,7 +24,7 @@
  *	acoshl(NaN) is NaN without signal.
  */
 
-#include <math.h>
+#include <openlibm.h>
 
 #include "math_private.h"
 
diff --git a/ld80/e_atanhl.c b/ld80/e_atanhl.c
@@ -28,7 +28,7 @@
  *
  */
 
-#include <math.h>
+#include <openlibm.h>
 
 #include "math_private.h"
 
diff --git a/ld80/e_coshl.c b/ld80/e_coshl.c
@@ -31,7 +31,7 @@
  *	only coshl(0)=1 is exact for finite x.
  */
 
-#include "math.h"
+#include "openlibm.h"
 #include "math_private.h"
 
 static const long double one = 1.0, half=0.5, huge = 1.0e4900L;
diff --git a/ld80/e_expl.c b/ld80/e_expl.c
@@ -72,7 +72,7 @@
 
 /*	Exponential function	*/
 
-#include <math.h>
+#include <openlibm.h>
 
 #include "math_private.h"
 
diff --git a/ld80/e_hypotl.c b/ld80/e_hypotl.c
@@ -42,7 +42,7 @@
  * 	than 1 ulps (units in the last place)
  */
 
-#include <math.h>
+#include <openlibm.h>
 
 #include "math_private.h"
 
diff --git a/ld80/e_lgammal.c b/ld80/e_lgammal.c
@@ -86,9 +86,10 @@
  *
  */
 
-#include <math.h>
+#include <openlibm.h>
 
 #include "math_private.h"
+extern int signgam;
 
 static const long double
   half = 0.5L,
diff --git a/ld80/e_log10l.c b/ld80/e_log10l.c
@@ -63,7 +63,7 @@
  * log domain:       x < 0; returns MINLOG
  */
 
-#include <math.h>
+#include <openlibm.h>
 
 #include "math_private.h"
 
diff --git a/ld80/e_log2l.c b/ld80/e_log2l.c
@@ -63,7 +63,7 @@
  * log domain:       x < 0; returns NAN
  */
 
-#include <math.h>
+#include <openlibm.h>
 
 #include "math_private.h"
 
diff --git a/ld80/e_logl.c b/ld80/e_logl.c
@@ -63,7 +63,7 @@
  * log domain:       x < 0; returns NAN
  */
 
-#include <math.h>
+#include <openlibm.h>
 
 #include "math_private.h"
 
diff --git a/ld80/e_powl.c b/ld80/e_powl.c
@@ -73,7 +73,7 @@
  */
 
 #include <float.h>
-#include <math.h>
+#include <openlibm.h>
 
 #include "math_private.h"
 
diff --git a/ld80/e_rem_pio2l.h b/ld80/e_rem_pio2l.h
@@ -6,7 +6,7 @@
  *
  * Developed at SunSoft, a Sun Microsystems, Inc. business.
  * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
+ * software is freely granted, provided that this notice
  * is preserved.
  * ====================================================
  *
@@ -17,16 +17,16 @@
 //__FBSDID("$FreeBSD: src/lib/msun/ld80/e_rem_pio2l.h,v 1.3 2011/06/18 13:56:33 benl Exp $");
 
 /* ld80 version of __ieee754_rem_pio2l(x,y)
- * 
- * return the remainder of x rem pi/2 in y[0]+y[1] 
+ *
+ * return the remainder of x rem pi/2 in y[0]+y[1]
  * use __kernel_rem_pio2()
  */
 
 #include <float.h>
 
 #include "openlibm.h"
 #include "math_private.h"
-#include "fpmath.h"
+#include "openlibm.h"
 
 #define	BIAS	(LDBL_MAX_EXP - 1)
 
@@ -102,32 +102,32 @@ __ieee754_rem_pio2l(long double x, long double *y)
 		union IEEEl2bits u2;
 	        int ex1;
 	        j  = ex;
-	        y[0] = r-w; 
+	        y[0] = r-w;
 		u2.e = y[0];
 		ex1 = u2.xbits.expsign & 0x7fff;
 	        i = j-ex1;
 	        if(i>22) {  /* 2nd iteration needed, good to 141 */
 		    t  = r;
-		    w  = fn*pio2_2;	
+		    w  = fn*pio2_2;
 		    r  = t-w;
-		    w  = fn*pio2_2t-((t-r)-w);	
+		    w  = fn*pio2_2t-((t-r)-w);
 		    y[0] = r-w;
 		    u2.e = y[0];
 		    ex1 = u2.xbits.expsign & 0x7fff;
 		    i = j-ex1;
 		    if(i>61) {	/* 3rd iteration need, 180 bits acc */
 		    	t  = r;	/* will cover all possible cases */
-		    	w  = fn*pio2_3;	
+		    	w  = fn*pio2_3;
 		    	r  = t-w;
-		    	w  = fn*pio2_3t-((t-r)-w);	
+		    	w  = fn*pio2_3t-((t-r)-w);
 		    	y[0] = r-w;
 		    }
 		}
 	    }
 	    y[1] = (r-y[0])-w;
 	    return n;
 	}
-    /* 
+    /*
      * all other (large) arguments
      */
 	if(ex==0x7fff) {		/* x is inf or NaN */
diff --git a/ld80/e_sinhl.c b/ld80/e_sinhl.c
@@ -28,7 +28,7 @@
  *	only sinhl(0)=0 is exact for finite x.
  */
 
-#include <math.h>
+#include <openlibm.h>
 
 #include "math_private.h"
 
diff --git a/ld80/e_tgammal.c b/ld80/e_tgammal.c
@@ -58,9 +58,10 @@
  */
 
 #include <float.h>
-#include <math.h>
+#include <openlibm.h>
 
 #include "math_private.h"
+extern int signgam;
 
 /*
 tgamma(x+2)  = tgamma(x+2) P(x)/Q(x)
diff --git a/ld80/invtrig.h b/ld80/invtrig.h
@@ -28,7 +28,7 @@
 
 #include <float.h>
 
-#include "fpmath.h"
+#include <openlibm.h>
 
 #define	BIAS		(LDBL_MAX_EXP - 1)
 #define	MANH_SIZE	LDBL_MANH_SIZE
diff --git a/ld80/s_asinhl.c b/ld80/s_asinhl.c
@@ -21,7 +21,7 @@
  *		  := signl(x)*log1pl(|x| + x^2/(1 + sqrtl(1+x^2)))
  */
 
-#include <math.h>
+#include <openlibm.h>
 
 #include "math_private.h"
 
diff --git a/ld80/s_ceill.c b/ld80/s_ceill.c
@@ -19,7 +19,7 @@
  *	Inexact flag raised if x not equal to ceil(x).
  */
 
-#include <math.h>
+#include <openlibm.h>
 
 #include "math_private.h"
 
diff --git a/ld80/s_erfl.c b/ld80/s_erfl.c
@@ -99,7 +99,7 @@
  */
 
 
-#include <math.h>
+#include <openlibm.h>
 
 #include "math_private.h"
 
diff --git a/ld80/s_exp2l.c b/ld80/s_exp2l.c
@@ -32,7 +32,7 @@
 
 #include "amd64/bsd_ieeefp.h"
 
-#include "fpmath.h"
+#include "openlibm.h"
 #include "openlibm.h"
 #include "math_private.h"
 
diff --git a/ld80/s_expm1l.c b/ld80/s_expm1l.c
@@ -57,7 +57,7 @@
  *
  */
 
-#include <math.h>
+#include <openlibm.h>
 
 static const long double MAXLOGL = 1.1356523406294143949492E4L;
 
diff --git a/ld80/s_floorl.c b/ld80/s_floorl.c
@@ -19,7 +19,7 @@
  *	Inexact flag raised if x not equal to floor(x).
  */
 
-#include <math.h>
+#include <openlibm.h>
 
 #include "math_private.h"
 
diff --git a/ld80/s_log1pl.c b/ld80/s_log1pl.c
@@ -59,7 +59,7 @@
  * log domain:       x-1 < 0; returns NAN
  */
 
-#include <math.h>
+#include <openlibm.h>
 
 #include "math_private.h"
 
diff --git a/ld80/s_modfl.c b/ld80/s_modfl.c
@@ -20,7 +20,7 @@
  *	No exception.
  */
 
-#include <math.h>
+#include <openlibm.h>
 
 #include "math_private.h"
 
diff --git a/ld80/s_nanl.c b/ld80/s_nanl.c
@@ -28,7 +28,7 @@
 
 #include "openlibm.h"
 
-#include "fpmath.h"
+#include "openlibm.h"
 #include "math_private.h"
 
 DLLEXPORT long double
diff --git a/ld80/s_nextafterl.c b/ld80/s_nextafterl.c
@@ -17,7 +17,7 @@
  *   Special cases:
  */
 
-#include <math.h>
+#include <openlibm.h>
 
 #include "math_private.h"
 
@@ -87,4 +87,4 @@ nextafterl(long double x, long double y)
 	return x;
 }
 
-__strong_alias(nexttowardl, nextafterl);
+//__strong_alias(nexttowardl, nextafterl);
diff --git a/ld80/s_nexttoward.c b/ld80/s_nexttoward.c
@@ -17,7 +17,7 @@
  *   Special cases:
  */
 
-#include <math.h>
+#include <openlibm.h>
 #include <float.h>
 
 #include "math_private.h"
diff --git a/ld80/s_nexttowardf.c b/ld80/s_nexttowardf.c
@@ -10,7 +10,7 @@
  * ====================================================
  */
 
-#include <math.h>
+#include <openlibm.h>
 #include <float.h>
 
 #include "math_private.h"
diff --git a/ld80/s_remquol.c b/ld80/s_remquol.c
@@ -14,7 +14,7 @@
 #include <machine/ieee.h>
 
 #include <float.h>
-#include <math.h>
+#include <openlibm.h>
 #include <stdint.h>
 
 #include "math_private.h"
diff --git a/ld80/s_tanhl.c b/ld80/s_tanhl.c
@@ -34,7 +34,7 @@
  *	only tanhl(0)=0 is exact for finite argument.
  */
 
-#include <math.h>
+#include <openlibm.h>
 
 #include "math_private.h"
 
diff --git a/ld80/s_truncl.c b/ld80/s_truncl.c
@@ -21,10 +21,10 @@
  */
 
 #include <sys/types.h>
-#include <machine/ieee.h>
+//#include <machine/ieee.h>
 
 #include <float.h>
-#include <math.h>
+#include "openlibm.h"
 #include <stdint.h>
 
 #include "math_private.h"
diff --git a/src/Make.files b/src/Make.files
@@ -50,7 +50,7 @@ $(CUR_SRCS) +=	e_acosl.c e_asinl.c e_atan2l.c e_fmodl.c \
 	s_frexpl.c s_logbl.c s_nexttoward.c \
 	s_remquol.c \
 	s_sinl.c s_sincosl.c s_tanl.c s_truncl.c w_cabsl.c \
-	s_nextafterl.c s_rintl.c s_scalbnl.c
+	s_nextafterl.c s_rintl.c s_scalbnl.c polevll.c
 #	s_cbrtl.c
 endif
 
diff --git a/src/math_private.h b/src/math_private.h
@@ -22,6 +22,7 @@
 #include "fpmath.h"
 #include <complex.h>
 #include <stdint.h>
+#include "math_private_openbsd.h"
 
 /*
  * The original fdlibm code used statements like:
@@ -228,7 +229,7 @@ do {								\
  * Common routine to process the arguments to nan(), nanf(), and nanl().
  */
 void _scan_nan(u_int32_t *__words, int __num_words, const char *__s);
- 
+
 #ifdef __GNUCLIKE_ASM
 
 /* Asm versions of some functions. */
diff --git a/src/math_private_openbsd.h b/src/math_private_openbsd.h
diff --git a/src/polevll.c b/src/polevll.c

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`*`
`29`	`29`	`*/`
`30`	`30`
`31`		`-#include <math.h>`
	`31`	`+#include <openlibm.h>`
`32`	`32`
`33`	`33`	`#include "math_private.h"`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -86,9 +86,10 @@`
`86`	`86`	`*`
`87`	`87`	`*/`
`88`	`88`
`89`		`-#include <math.h>`
	`89`	`+#include <openlibm.h>`
`90`	`90`
`91`	`91`	`#include "math_private.h"`
	`92`	`+extern int signgam;`
`92`	`93`
`93`	`94`	`static const long double`
`94`	`95`	`half = 0.5L,`