GitLab

at 2026-03-12T07:31:26-07:00

Fix #486:  Rename openlibm functions to be different from libm

Merge branch 'issue-486-rename-openlibm-functions' into 'master'

Fix #486:  Rename openlibm functions to be different from libm

Closes #486

See merge request cmucl/cmucl!363
 extern void cr_sincosf(float, float *, float *);

 #else

 #include "openlibm_math.h"

+/*

+ * Declare the openlibm functions we use.  This is needed because we

+ * changed the names of the openlibm functions.

+ */

+extern float openlibm_asinhf(float);

+extern float openlibm_atanf(float);

+extern float openlibm_cosf(float);

+extern float openlibm_expm1f(float);

+extern float openlibm_log1pf(float);

+extern float openlibm_sinf(float);

+extern float openlibm_tanf(float);

+extern float openlibm_tanhf(float);

+extern void openlibm_sincosf(float, float*, float*);

+extern float __ieee754_acosf(float);

+extern float __ieee754_acoshf(float);

+extern float __ieee754_logf(float);

+extern float __ieee754_atanhf(float);

+extern float __ieee754_asinf(float);

+extern float __ieee754_atan2f(float, float);

+extern float __ieee754_expf(float);

+extern float __ieee754_coshf(float);

+extern float __ieee754_log10f(float);

+extern float __ieee754_sinhf(float);

+extern float __ieee754_hypotf(float, float);

+

 #endif

 

 

 #ifdef FEATURE_CORE_MATH

     return cr_sinf(x);

 #else    

-    return sinf(x);

+    return openlibm_sinf(x);

 #endif    

 }

 

 #ifdef FEATURE_CORE_MATH

     return cr_cosf(x);

 #else    

-    return cosf(x);

+    return openlibm_cosf(x);

 #endif

 }

 

 #ifdef FEATURE_CORE_MATH

     return cr_tanf(x);

 #else    

-    return tanf(x);

+    return openlibm_tanf(x);

 #endif

 }

 

 #ifdef FEATURE_CORE_MATH

     return cr_atanf(x);

 #else    

-    return atanf(x);

+    return openlibm_atanf(x);

 #endif

 }

 

 #ifdef FEATURE_CORE_MATH

     return cr_atan2f(y, x);

 #else    

-    return atan2f(y, x);

+    return __ieee754_atan2f(y, x);

 #endif

 }

 

 #ifdef FEATURE_CORE_MATH

     return cr_asinf(x);

 #else    

-    return asinf(x);

+    return __ieee754_asinf(x);

 #endif

 }

 

 #ifdef FEATURE_CORE_MATH

     return cr_acosf(x);

 #else    

-    return acosf(x);

+    return __ieee754_acosf(x);

 #endif

 }

 

 #ifdef FEATURE_CORE_MATH

     return cr_sinhf(x);

 #else    

-    return sinhf(x);

+    return __ieee754_sinhf(x);

 #endif

 }

 

 #ifdef FEATURE_CORE_MATH

     return cr_coshf(x);

 #else    

-    return coshf(x);

+    return __ieee754_coshf(x);

 #endif

 }

 

 #ifdef FEATURE_CORE_MATH

     return cr_tanhf(x);

 #else    

-    return tanhf(x);

+    return openlibm_tanhf(x);

 #endif

 }

 

 #ifdef FEATURE_CORE_MATH

     return cr_asinhf(x);

 #else    

-    return asinhf((double) x);

+    return openlibm_asinhf((double) x);

 #endif

 }

 

 #ifdef FEATURE_CORE_MATH

     return cr_acoshf(x);

 #else    

-    return acoshf(x);

+    return __ieee754_acoshf(x);

 #endif

 }

 

 #ifdef FEATURE_CORE_MATH

     return cr_atanhf(x);

 #else    

-    return atanhf(x);

+    return __ieee754_atanhf(x);

 #endif

 }

 

 #ifdef FEATURE_CORE_MATH

     return cr_expf(x);

 #else    

-    return expf(x);

+    return __ieee754_expf(x);

 #endif

 }

 

 #ifdef FEATURE_CORE_MATH

     return cr_logf(x);

 #else    

-    return log(x);

+    return __ieee754_log(x);

 #endif

 }

 

 #ifdef FEATURE_CORE_MATH

     return cr_log10f(x);

 #else    

-    return log10f(x);

+    return __ieee754_log10f(x);

 #endif

 }

 

 #ifdef FEATURE_CORE_MATH

     return cr_hypotf(x, y);

 #else    

-    return hypotf(x, y);

+    return __ieee754_hypotf(x, y);

 #endif

 }

 

 #ifdef FEATURE_CORE_MATH

     return cr_log1pf(x);

 #else    

-    return log1pf(x);

+    return openlibm_log1pf(x);

 #endif

 }

 

 #ifdef FEATURE_CORE_MATH

     return cr_expm1f(x);

 #else    

-    return expm1f(x);

+    return openlibm_expm1f(x);

 #endif

 }

 

 #ifdef FEATURE_CORE_MATH

     cr_sincosf(x, s, c);

 #else    

-    extern void sincosf(float x, float *s, float *c);

+    extern void openlibm_sincosf(float x, float *s, float *c);

 

-    sincosf(x, s, c);

+    openlibm_sincosf(x, s, c);

 #endif

 }
 #define	__ieee754_yn	yn

 #define	__ieee754_remainder remainder

 #define	__ieee754_sqrtf	sqrtf

+#if 0

 #define	__ieee754_acosf	acosf

 #define	__ieee754_acoshf acoshf

 #define	__ieee754_logf	logf

 #define	__ieee754_atan2f atan2f

 #define	__ieee754_expf	expf

 #define	__ieee754_coshf	coshf

+#else

+extern float __ieee754_acosf(float);

+extern float __ieee754_acoshf(float);

+extern float __ieee754_logf(float);

+extern float __ieee754_atanhf(float);

+extern float __ieee754_asinf(float);

+extern float __ieee754_atan2f(float, float);

+extern float __ieee754_expf(float);

+extern float __ieee754_coshf(float);

+#endif

 #define	__ieee754_fmodf	fmodf

 #define	__ieee754_powf	powf

 #define	__ieee754_lgammaf lgammaf

 #define	__ieee754_lgammaf_r lgammaf_r

+#if 0

 #define	__ieee754_log10f log10f

 #define	__ieee754_log2f log2f

 #define	__ieee754_sinhf	sinhf

 #define	__ieee754_hypotf hypotf

+#else

+extern float __ieee754_log10f(float);

+extern float __ieee754_log2f(float);

+extern float __ieee754_sinhf(float);

+extern float __ieee754_hypotf(float, float);

+#endif

 #define	__ieee754_j0f	j0f

 #define	__ieee754_j1f	j1f

 #define	__ieee754_y0f	y0f

 huge=  1.0000000000e+30;

 

 OLM_DLLEXPORT float

-asinhf(float x)

+openlibm_asinhf(float x)

 {

 	float t,w;

 	int32_t hx,ix;

 huge   = 1.0e30;

 

 OLM_DLLEXPORT float

-atanf(float x)

+openlibm_atanf(float x)

 {

 	float w,s1,s2,z;

 	int32_t ix,hx,id;

 c4pio2 = 4*M_PI_2;			/* 0x401921FB, 0x54442D18 */

 

 OLM_DLLEXPORT float

-cosf(float x)

+openlibm_cosf(float x)

 {

 	double y;

 	int32_t n, hx, ix;

 Q2 =  1.5807170421e-3;		/*  0xcf3010.0p-33 */

 

 OLM_DLLEXPORT float

-expm1f(float x)

+openlibm_expm1f(float x)

 {

 	float y,hi,lo,c,t,e,hxs,hfx,r1,twopk;

 	int32_t k,xsb;

 static const float zero = 0.0;

 

 OLM_DLLEXPORT float

-log1pf(float x)

+openlibm_log1pf(float x)

 {

 	float hfsq,f,c,s,z,R,u;

 	int32_t k,hx,hu,ax;

 }

 

 OLM_DLLEXPORT void

-sincosf(float x, float * s, float * c) {

+openlibm_sincosf(float x, float * s, float * c) {

 	// Worst approximation of sin and cos NA

 	*s = x;

 	*c = x;

 s4pio2 = 4*M_PI_2;			/* 0x401921FB, 0x54442D18 */

 

 OLM_DLLEXPORT float

-sinf(float x)

+openlibm_sinf(float x)

 {

 	double y;

 	int32_t n, hx, ix;

 t4pio2 = 4*M_PI_2;			/* 0x401921FB, 0x54442D18 */

 

 OLM_DLLEXPORT float

-tanf(float x)

+openlibm_tanf(float x)

 {

 	double y;

 	int32_t n, hx, ix;

 

 static const float one=1.0, two=2.0, tiny = 1.0e-30, huge = 1.0e30;

 OLM_DLLEXPORT float

-tanhf(float x)

+openlibm_tanhf(float x)

 {

 	float t,z;

 	int32_t jx,ix;

Raymond Toy pushed to branch master at cmucl / cmucl

Commits:

11 changed files:

Changes: