Revert the changes for inline. With both gcc 4.2 and 4.6, the link

fails with:

ld: duplicate symbol ___ieee754_rem_pio2 in src/s_sin.o and src/s_cos.o for architecture x86_64
collect2: ld returned 1 exit status
This commit is contained in:
Viral B. Shah 2012-01-01 10:14:06 +05:30
parent dbd5b338ee
commit d24a3296fa
8 changed files with 23 additions and 25 deletions

View file

@ -1,5 +1,5 @@
CC=gcc
CFLAGS=-O2 -fPIC -I. -I../include -I../ld128 -I../src -D__BSD_VISIBLE -Wno-implicit-function-declaration
CFLAGS=-std=c99 -O2 -fPIC -I. -I../include -I../ld128 -I../src -D__BSD_VISIBLE -Wno-implicit-function-declaration
default: all

View file

@ -7,11 +7,9 @@ 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 \

View file

@ -47,9 +47,9 @@
#include <float.h>
#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)

View file

@ -20,13 +20,13 @@
#include <float.h>
#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

View file

@ -47,9 +47,9 @@
#include <float.h>
#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)

View file

@ -20,13 +20,13 @@
#include <float.h>
#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

View file

@ -46,9 +46,9 @@
#include <float.h>
#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)

View file

@ -20,11 +20,11 @@
#include <float.h>
#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