Index: newlib-trunk/newlib/libm/math/Makefile.in |
=================================================================== |
--- a/newlib-trunk/newlib/libm/math/Makefile.in |
+++ b/newlib-trunk/newlib/libm/math/Makefile.in |
@@ -79,16 +79,15 @@ |
lib_a-w_log.$(OBJEXT) lib_a-w_log10.$(OBJEXT) \ |
lib_a-w_pow.$(OBJEXT) lib_a-w_remainder.$(OBJEXT) \ |
lib_a-w_scalb.$(OBJEXT) lib_a-w_sinh.$(OBJEXT) \ |
- lib_a-w_sqrt.$(OBJEXT) lib_a-w_sincos.$(OBJEXT) \ |
- lib_a-w_cabs.$(OBJEXT) lib_a-w_drem.$(OBJEXT) \ |
- lib_a-s_asinh.$(OBJEXT) lib_a-s_atan.$(OBJEXT) \ |
- lib_a-s_ceil.$(OBJEXT) lib_a-s_cos.$(OBJEXT) \ |
- lib_a-s_erf.$(OBJEXT) lib_a-s_fabs.$(OBJEXT) \ |
- lib_a-s_floor.$(OBJEXT) lib_a-s_frexp.$(OBJEXT) \ |
- lib_a-s_ldexp.$(OBJEXT) lib_a-s_signif.$(OBJEXT) \ |
- lib_a-s_sin.$(OBJEXT) lib_a-s_tan.$(OBJEXT) \ |
- lib_a-s_tanh.$(OBJEXT) lib_a-w_exp2.$(OBJEXT) \ |
- lib_a-w_tgamma.$(OBJEXT) |
+ lib_a-w_sincos.$(OBJEXT) lib_a-w_cabs.$(OBJEXT) \ |
+ lib_a-w_drem.$(OBJEXT) lib_a-s_asinh.$(OBJEXT) \ |
+ lib_a-s_atan.$(OBJEXT) lib_a-s_ceil.$(OBJEXT) \ |
+ lib_a-s_cos.$(OBJEXT) lib_a-s_erf.$(OBJEXT) \ |
+ lib_a-s_fabs.$(OBJEXT) lib_a-s_floor.$(OBJEXT) \ |
+ lib_a-s_frexp.$(OBJEXT) lib_a-s_ldexp.$(OBJEXT) \ |
+ lib_a-s_signif.$(OBJEXT) lib_a-s_sin.$(OBJEXT) \ |
+ lib_a-s_tan.$(OBJEXT) lib_a-s_tanh.$(OBJEXT) \ |
+ lib_a-w_exp2.$(OBJEXT) lib_a-w_tgamma.$(OBJEXT) |
am__objects_2 = lib_a-kf_rem_pio2.$(OBJEXT) lib_a-kf_cos.$(OBJEXT) \ |
lib_a-kf_sin.$(OBJEXT) lib_a-kf_tan.$(OBJEXT) \ |
lib_a-ef_acos.$(OBJEXT) lib_a-ef_acosh.$(OBJEXT) \ |
@@ -113,16 +112,15 @@ |
lib_a-wf_log.$(OBJEXT) lib_a-wf_log10.$(OBJEXT) \ |
lib_a-wf_pow.$(OBJEXT) lib_a-wf_remainder.$(OBJEXT) \ |
lib_a-wf_scalb.$(OBJEXT) lib_a-wf_sinh.$(OBJEXT) \ |
- lib_a-wf_sqrt.$(OBJEXT) lib_a-wf_sincos.$(OBJEXT) \ |
- lib_a-wf_cabs.$(OBJEXT) lib_a-wf_drem.$(OBJEXT) \ |
- lib_a-sf_asinh.$(OBJEXT) lib_a-sf_atan.$(OBJEXT) \ |
- lib_a-sf_ceil.$(OBJEXT) lib_a-sf_cos.$(OBJEXT) \ |
- lib_a-sf_erf.$(OBJEXT) lib_a-sf_fabs.$(OBJEXT) \ |
- lib_a-sf_floor.$(OBJEXT) lib_a-sf_frexp.$(OBJEXT) \ |
- lib_a-sf_ldexp.$(OBJEXT) lib_a-sf_signif.$(OBJEXT) \ |
- lib_a-sf_sin.$(OBJEXT) lib_a-sf_tan.$(OBJEXT) \ |
- lib_a-sf_tanh.$(OBJEXT) lib_a-wf_exp2.$(OBJEXT) \ |
- lib_a-wf_tgamma.$(OBJEXT) |
+ lib_a-wf_sincos.$(OBJEXT) lib_a-wf_cabs.$(OBJEXT) \ |
+ lib_a-wf_drem.$(OBJEXT) lib_a-sf_asinh.$(OBJEXT) \ |
+ lib_a-sf_atan.$(OBJEXT) lib_a-sf_ceil.$(OBJEXT) \ |
+ lib_a-sf_cos.$(OBJEXT) lib_a-sf_erf.$(OBJEXT) \ |
+ lib_a-sf_fabs.$(OBJEXT) lib_a-sf_floor.$(OBJEXT) \ |
+ lib_a-sf_frexp.$(OBJEXT) lib_a-sf_ldexp.$(OBJEXT) \ |
+ lib_a-sf_signif.$(OBJEXT) lib_a-sf_sin.$(OBJEXT) \ |
+ lib_a-sf_tan.$(OBJEXT) lib_a-sf_tanh.$(OBJEXT) \ |
+ lib_a-wf_exp2.$(OBJEXT) lib_a-wf_tgamma.$(OBJEXT) |
@USE_LIBTOOL_FALSE@am_lib_a_OBJECTS = $(am__objects_1) \ |
@USE_LIBTOOL_FALSE@ $(am__objects_2) |
lib_a_OBJECTS = $(am_lib_a_OBJECTS) |
@@ -136,9 +134,9 @@ |
w_acos.lo w_acosh.lo w_asin.lo w_atan2.lo w_atanh.lo w_cosh.lo \ |
w_exp.lo w_fmod.lo w_gamma.lo wr_gamma.lo w_hypot.lo w_j0.lo \ |
w_j1.lo w_jn.lo w_lgamma.lo wr_lgamma.lo w_log.lo w_log10.lo \ |
- w_pow.lo w_remainder.lo w_scalb.lo w_sinh.lo w_sqrt.lo \ |
- w_sincos.lo w_cabs.lo w_drem.lo s_asinh.lo s_atan.lo s_ceil.lo \ |
- s_cos.lo s_erf.lo s_fabs.lo s_floor.lo s_frexp.lo s_ldexp.lo \ |
+ w_pow.lo w_remainder.lo w_scalb.lo w_sinh.lo w_sincos.lo \ |
+ w_cabs.lo w_drem.lo s_asinh.lo s_atan.lo s_ceil.lo s_cos.lo \ |
+ s_erf.lo s_fabs.lo s_floor.lo s_frexp.lo s_ldexp.lo \ |
s_signif.lo s_sin.lo s_tan.lo s_tanh.lo w_exp2.lo w_tgamma.lo |
am__objects_4 = kf_rem_pio2.lo kf_cos.lo kf_sin.lo kf_tan.lo \ |
ef_acos.lo ef_acosh.lo ef_asin.lo ef_atan2.lo ef_atanh.lo \ |
@@ -149,11 +147,11 @@ |
wf_atan2.lo wf_atanh.lo wf_cosh.lo wf_exp.lo wf_fmod.lo \ |
wf_gamma.lo wrf_gamma.lo wf_hypot.lo wf_j0.lo wf_j1.lo \ |
wf_jn.lo wf_lgamma.lo wrf_lgamma.lo wf_log.lo wf_log10.lo \ |
- wf_pow.lo wf_remainder.lo wf_scalb.lo wf_sinh.lo wf_sqrt.lo \ |
- wf_sincos.lo wf_cabs.lo wf_drem.lo sf_asinh.lo sf_atan.lo \ |
- sf_ceil.lo sf_cos.lo sf_erf.lo sf_fabs.lo sf_floor.lo \ |
- sf_frexp.lo sf_ldexp.lo sf_signif.lo sf_sin.lo sf_tan.lo \ |
- sf_tanh.lo wf_exp2.lo wf_tgamma.lo |
+ wf_pow.lo wf_remainder.lo wf_scalb.lo wf_sinh.lo wf_sincos.lo \ |
+ wf_cabs.lo wf_drem.lo sf_asinh.lo sf_atan.lo sf_ceil.lo \ |
+ sf_cos.lo sf_erf.lo sf_fabs.lo sf_floor.lo sf_frexp.lo \ |
+ sf_ldexp.lo sf_signif.lo sf_sin.lo sf_tan.lo sf_tanh.lo \ |
+ wf_exp2.lo wf_tgamma.lo |
@USE_LIBTOOL_TRUE@am_libmath_la_OBJECTS = $(am__objects_3) \ |
@USE_LIBTOOL_TRUE@ $(am__objects_4) |
libmath_la_OBJECTS = $(am_libmath_la_OBJECTS) |
@@ -234,6 +232,7 @@ |
PACKAGE_NAME = @PACKAGE_NAME@ |
PACKAGE_STRING = @PACKAGE_STRING@ |
PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
+PACKAGE_URL = @PACKAGE_URL@ |
PACKAGE_VERSION = @PACKAGE_VERSION@ |
PATH_SEPARATOR = @PATH_SEPARATOR@ |
RANLIB = @RANLIB@ |
@@ -318,7 +317,7 @@ |
w_gamma.c wr_gamma.c w_hypot.c w_j0.c \ |
w_j1.c w_jn.c w_lgamma.c wr_lgamma.c \ |
w_log.c w_log10.c w_pow.c w_remainder.c \ |
- w_scalb.c w_sinh.c w_sqrt.c \ |
+ w_scalb.c w_sinh.c \ |
w_sincos.c \ |
w_cabs.c w_drem.c \ |
s_asinh.c s_atan.c s_ceil.c \ |
@@ -328,6 +327,10 @@ |
s_tan.c s_tanh.c \ |
w_exp2.c w_tgamma.c |
+ |
+#@LOCALMOD |
+# NOTE: these are already overwritten in newlib/libm/machine/pnacl/ |
+src_pnacl_eliminated = w_sqrt.c |
fsrc = kf_rem_pio2.c \ |
kf_cos.c kf_sin.c kf_tan.c \ |
ef_acos.c ef_acosh.c ef_asin.c ef_atan2.c \ |
@@ -341,7 +344,7 @@ |
wf_gamma.c wrf_gamma.c wf_hypot.c wf_j0.c \ |
wf_j1.c wf_jn.c wf_lgamma.c wrf_lgamma.c \ |
wf_log.c wf_log10.c wf_pow.c wf_remainder.c \ |
- wf_scalb.c wf_sinh.c wf_sqrt.c \ |
+ wf_scalb.c wf_sinh.c \ |
wf_sincos.c \ |
wf_cabs.c wf_drem.c \ |
sf_asinh.c sf_atan.c sf_ceil.c \ |
@@ -351,6 +354,10 @@ |
sf_tan.c sf_tanh.c \ |
wf_exp2.c wf_tgamma.c |
+ |
+#@LOCALMOD |
+# NOTE: these are already overwritten in newlib/libm/machine/pnacl/ |
+fsrc_pnacl_eliminated = wf_sqrt.c |
libmath_la_LDFLAGS = -Xcompiler -nostdlib |
@USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = libmath.la |
@USE_LIBTOOL_TRUE@libmath_la_SOURCES = $(src) $(fsrc) |
@@ -734,12 +741,6 @@ |
lib_a-w_sinh.obj: w_sinh.c |
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-w_sinh.obj `if test -f 'w_sinh.c'; then $(CYGPATH_W) 'w_sinh.c'; else $(CYGPATH_W) '$(srcdir)/w_sinh.c'; fi` |
-lib_a-w_sqrt.o: w_sqrt.c |
- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-w_sqrt.o `test -f 'w_sqrt.c' || echo '$(srcdir)/'`w_sqrt.c |
- |
-lib_a-w_sqrt.obj: w_sqrt.c |
- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-w_sqrt.obj `if test -f 'w_sqrt.c'; then $(CYGPATH_W) 'w_sqrt.c'; else $(CYGPATH_W) '$(srcdir)/w_sqrt.c'; fi` |
- |
lib_a-w_sincos.o: w_sincos.c |
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-w_sincos.o `test -f 'w_sincos.c' || echo '$(srcdir)/'`w_sincos.c |
@@ -1136,12 +1137,6 @@ |
lib_a-wf_sinh.obj: wf_sinh.c |
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-wf_sinh.obj `if test -f 'wf_sinh.c'; then $(CYGPATH_W) 'wf_sinh.c'; else $(CYGPATH_W) '$(srcdir)/wf_sinh.c'; fi` |
-lib_a-wf_sqrt.o: wf_sqrt.c |
- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-wf_sqrt.o `test -f 'wf_sqrt.c' || echo '$(srcdir)/'`wf_sqrt.c |
- |
-lib_a-wf_sqrt.obj: wf_sqrt.c |
- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-wf_sqrt.obj `if test -f 'wf_sqrt.c'; then $(CYGPATH_W) 'wf_sqrt.c'; else $(CYGPATH_W) '$(srcdir)/wf_sqrt.c'; fi` |
- |
lib_a-wf_sincos.o: wf_sincos.c |
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-wf_sincos.o `test -f 'wf_sincos.c' || echo '$(srcdir)/'`wf_sincos.c |