From 6cb8c2aaa0c0b659bba47c4aae9f2209751fb84b Mon Sep 17 00:00:00 2001 From: "Viral B. Shah" Date: Sun, 1 Jan 2012 01:35:33 +0530 Subject: [PATCH] The inline stuff was causing too much pain linking. Disable inline stuff for now. --- src/Makefile | 2 ++ src/e_rem_pio2.c | 3 ++- src/e_rem_pio2f.c | 3 ++- src/k_cosf.c | 3 ++- src/k_sinf.c | 3 ++- src/k_tanf.c | 3 ++- src/s_cos.c | 4 ++-- src/s_cosf.c | 12 ++++++------ src/s_sin.c | 4 ++-- src/s_sinf.c | 12 ++++++------ src/s_tan.c | 4 ++-- src/s_tanf.c | 8 ++++---- 12 files changed, 34 insertions(+), 27 deletions(-) diff --git a/src/Makefile b/src/Makefile index af6c172..26623b3 100644 --- a/src/Makefile +++ b/src/Makefile @@ -7,9 +7,11 @@ SRCS= \ e_gammaf_r.o e_hypot.o e_hypotf.o e_j0.o e_j0f.o e_j1.o e_j1f.o \ e_jn.o e_jnf.o e_lgamma.o e_lgamma_r.o e_lgammaf.o e_lgammaf_r.o \ e_log.o e_log10.o e_log10f.o e_log2.o e_log2f.o e_logf.o \ + e_rem_pio2.o e_rem_pio2f.o \ e_pow.o e_powf.o e_remainder.o e_remainderf.o e_scalb.o e_scalbf.o \ e_sinh.o e_sinhf.o e_sqrt.o e_sqrtf.o \ k_cos.o k_exp.o k_expf.o k_rem_pio2.o k_sin.o k_tan.o \ + k_cosf.o k_sinf.o k_tanf.o \ s_asinh.o s_asinhf.o s_atan.o s_atanf.o s_carg.o s_cargf.o s_cargl.o \ s_cbrt.o s_cbrtf.o s_ceil.o s_ceilf.o \ s_copysign.o s_copysignf.o s_cos.o s_cosf.o \ diff --git a/src/e_rem_pio2.c b/src/e_rem_pio2.c index b33d60c..ebe5e07 100644 --- a/src/e_rem_pio2.c +++ b/src/e_rem_pio2.c @@ -51,7 +51,8 @@ pio2_3t = 8.47842766036889956997e-32; /* 0x397B839A, 0x252049C1 */ #ifndef INLINE_REM_PIO2 extern #endif -__inline int +//__inline int +int __ieee754_rem_pio2(double x, double *y) { double z,w,t,r,fn; diff --git a/src/e_rem_pio2f.c b/src/e_rem_pio2f.c index bedcc4e..da46e59 100644 --- a/src/e_rem_pio2f.c +++ b/src/e_rem_pio2f.c @@ -43,7 +43,8 @@ pio2_1t = 1.58932547735281966916e-08; /* 0x3E5110b4, 0x611A6263 */ #ifndef INLINE_REM_PIO2F extern #endif -__inline int +//__inline int +int __ieee754_rem_pio2f(float x, double *y) { double w,r,fn; diff --git a/src/k_cosf.c b/src/k_cosf.c index bd5158b..a3f200f 100644 --- a/src/k_cosf.c +++ b/src/k_cosf.c @@ -33,7 +33,8 @@ C3 = 0x199342e0ee5069.0p-68; /* 0.0000243904487962774090654 */ #ifndef INLINE_KERNEL_COSDF extern #endif -__inline float +//__inline float +float __kernel_cosdf(double x) { double r, w, z; diff --git a/src/k_sinf.c b/src/k_sinf.c index 750d26a..89f3ae3 100644 --- a/src/k_sinf.c +++ b/src/k_sinf.c @@ -32,7 +32,8 @@ S4 = 0x16cd878c3b46a7.0p-71; /* 0.0000027183114939898219064 */ #ifndef INLINE_KERNEL_SINDF extern #endif -__inline float +//__inline float +float __kernel_sindf(double x) { double r, s, w, z; diff --git a/src/k_tanf.c b/src/k_tanf.c index f92cb19..d165e3a 100644 --- a/src/k_tanf.c +++ b/src/k_tanf.c @@ -35,7 +35,8 @@ T[] = { #ifndef INLINE_KERNEL_TANDF extern #endif -__inline float +//__inline float +float __kernel_tandf(double x, int iy) { double z,r,w,s,t,u; diff --git a/src/s_cos.c b/src/s_cos.c index d802cee..9dafbca 100644 --- a/src/s_cos.c +++ b/src/s_cos.c @@ -47,9 +47,9 @@ #include #include "openlibm.h" -#define INLINE_REM_PIO2 +//#define INLINE_REM_PIO2 #include "math_private.h" -#include "e_rem_pio2.c" +//#include "e_rem_pio2.c" double cos(double x) diff --git a/src/s_cosf.c b/src/s_cosf.c index 7756b34..5547dae 100644 --- a/src/s_cosf.c +++ b/src/s_cosf.c @@ -20,13 +20,13 @@ #include #include "openlibm.h" -#define INLINE_KERNEL_COSDF -#define INLINE_KERNEL_SINDF -#define INLINE_REM_PIO2F +//#define INLINE_KERNEL_COSDF +//#define INLINE_KERNEL_SINDF +//#define INLINE_REM_PIO2F #include "math_private.h" -#include "e_rem_pio2f.c" -#include "k_cosf.c" -#include "k_sinf.c" +//#include "e_rem_pio2f.c" +//#include "k_cosf.c" +//#include "k_sinf.c" /* Small multiples of pi/2 rounded to double precision. */ static const double diff --git a/src/s_sin.c b/src/s_sin.c index 664fe14..8b7109b 100644 --- a/src/s_sin.c +++ b/src/s_sin.c @@ -47,9 +47,9 @@ #include #include "openlibm.h" -#define INLINE_REM_PIO2 +//#define INLINE_REM_PIO2 #include "math_private.h" -#include "e_rem_pio2.c" +//#include "e_rem_pio2.c" double sin(double x) diff --git a/src/s_sinf.c b/src/s_sinf.c index b5bbf28..c03b94c 100644 --- a/src/s_sinf.c +++ b/src/s_sinf.c @@ -20,13 +20,13 @@ #include #include "openlibm.h" -#define INLINE_KERNEL_COSDF -#define INLINE_KERNEL_SINDF -#define INLINE_REM_PIO2F +//#define INLINE_KERNEL_COSDF +//#define INLINE_KERNEL_SINDF +//#define INLINE_REM_PIO2F #include "math_private.h" -#include "e_rem_pio2f.c" -#include "k_cosf.c" -#include "k_sinf.c" +//#include "e_rem_pio2f.c" +//#include "k_cosf.c" +//#include "k_sinf.c" /* Small multiples of pi/2 rounded to double precision. */ static const double diff --git a/src/s_tan.c b/src/s_tan.c index 96ca470..6616702 100644 --- a/src/s_tan.c +++ b/src/s_tan.c @@ -46,9 +46,9 @@ #include #include "openlibm.h" -#define INLINE_REM_PIO2 +//#define INLINE_REM_PIO2 #include "math_private.h" -#include "e_rem_pio2.c" +//#include "e_rem_pio2.c" double tan(double x) diff --git a/src/s_tanf.c b/src/s_tanf.c index 06794e7..c212c43 100644 --- a/src/s_tanf.c +++ b/src/s_tanf.c @@ -20,11 +20,11 @@ #include #include "openlibm.h" -#define INLINE_KERNEL_TANDF -#define INLINE_REM_PIO2F +//#define INLINE_KERNEL_TANDF +//#define INLINE_REM_PIO2F #include "math_private.h" -#include "e_rem_pio2f.c" -#include "k_tanf.c" +//#include "e_rem_pio2f.c" +//#include "k_tanf.c" /* Small multiples of pi/2 rounded to double precision. */ static const double