* libm/math/w_cabs.c: Delete.

	* libm/math/wf_cabs.c: Delete.
	* libm/math/Makefile.am (src): Remove w_cabs.c.
	(fsrc): Remove wf_cabs.c.
	* libm/math/Makefile.in: Regenerate.

4 files changed, 8 insertions, 60 deletions

diff --git a/newlib/libm/math/Makefile.am b/newlib/libm/math/Makefile.am
index 335817920..a4589ada2 100644
--- a/newlib/libm/math/Makefile.am
+++ b/newlib/libm/math/Makefile.am
@@ -19,7 +19,7 @@ src = 	k_standard.c k_rem_pio2.c \
 	w_log.c w_log10.c w_pow.c w_remainder.c \
 	w_scalb.c w_sinh.c w_sqrt.c \
 	w_sincos.c \
-	w_cabs.c w_drem.c \
+	w_drem.c \
 	s_asinh.c s_atan.c s_ceil.c \
 	s_cos.c s_erf.c s_fabs.c s_floor.c \
 	s_frexp.c s_ldexp.c \
@@ -42,7 +42,7 @@ fsrc =	kf_rem_pio2.c \
 	wf_log.c wf_log10.c wf_pow.c wf_remainder.c \
 	wf_scalb.c wf_sinh.c wf_sqrt.c \
 	wf_sincos.c \
-	wf_cabs.c wf_drem.c \
+	wf_drem.c \
 	sf_asinh.c sf_atan.c sf_ceil.c \
 	sf_cos.c sf_erf.c sf_fabs.c sf_floor.c \
 	sf_frexp.c sf_ldexp.c \
diff --git a/newlib/libm/math/Makefile.in b/newlib/libm/math/Makefile.in
index 69493636e..a20d30dce 100644
--- a/newlib/libm/math/Makefile.in
+++ b/newlib/libm/math/Makefile.in
@@ -80,7 +80,7 @@ am__objects_1 = lib_a-k_standard.$(OBJEXT) lib_a-k_rem_pio2.$(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-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) \
@@ -114,7 +114,7 @@ am__objects_2 = lib_a-kf_rem_pio2.$(OBJEXT) lib_a-kf_cos.$(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-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) \
@@ -137,7 +137,7 @@ am__objects_3 = k_standard.lo k_rem_pio2.lo k_cos.lo k_sin.lo k_tan.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 \
+	w_sincos.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 \
@@ -150,7 +150,7 @@ am__objects_4 = kf_rem_pio2.lo kf_cos.lo kf_sin.lo kf_tan.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 \
+	wf_sincos.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
@@ -319,7 +319,7 @@ src = k_standard.c k_rem_pio2.c \
 	w_log.c w_log10.c w_pow.c w_remainder.c \
 	w_scalb.c w_sinh.c w_sqrt.c \
 	w_sincos.c \
-	w_cabs.c w_drem.c \
+	w_drem.c \
 	s_asinh.c s_atan.c s_ceil.c \
 	s_cos.c s_erf.c s_fabs.c s_floor.c \
 	s_frexp.c s_ldexp.c \
@@ -342,7 +342,7 @@ fsrc = kf_rem_pio2.c \
 	wf_log.c wf_log10.c wf_pow.c wf_remainder.c \
 	wf_scalb.c wf_sinh.c wf_sqrt.c \
 	wf_sincos.c \
-	wf_cabs.c wf_drem.c \
+	wf_drem.c \
 	sf_asinh.c sf_atan.c sf_ceil.c \
 	sf_cos.c sf_erf.c sf_fabs.c sf_floor.c \
 	sf_frexp.c sf_ldexp.c \
@@ -745,12 +745,6 @@ lib_a-w_sincos.o: w_sincos.c
 lib_a-w_sincos.obj: w_sincos.c
 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-w_sincos.obj `if test -f 'w_sincos.c'; then $(CYGPATH_W) 'w_sincos.c'; else $(CYGPATH_W) '$(srcdir)/w_sincos.c'; fi`
 
-lib_a-w_cabs.o: w_cabs.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-w_cabs.o `test -f 'w_cabs.c' || echo '$(srcdir)/'`w_cabs.c
-
-lib_a-w_cabs.obj: w_cabs.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-w_cabs.obj `if test -f 'w_cabs.c'; then $(CYGPATH_W) 'w_cabs.c'; else $(CYGPATH_W) '$(srcdir)/w_cabs.c'; fi`
-
 lib_a-w_drem.o: w_drem.c
 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-w_drem.o `test -f 'w_drem.c' || echo '$(srcdir)/'`w_drem.c
 
@@ -1147,12 +1141,6 @@ lib_a-wf_sincos.o: wf_sincos.c
 lib_a-wf_sincos.obj: wf_sincos.c
 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-wf_sincos.obj `if test -f 'wf_sincos.c'; then $(CYGPATH_W) 'wf_sincos.c'; else $(CYGPATH_W) '$(srcdir)/wf_sincos.c'; fi`
 
-lib_a-wf_cabs.o: wf_cabs.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-wf_cabs.o `test -f 'wf_cabs.c' || echo '$(srcdir)/'`wf_cabs.c
-
-lib_a-wf_cabs.obj: wf_cabs.c
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-wf_cabs.obj `if test -f 'wf_cabs.c'; then $(CYGPATH_W) 'wf_cabs.c'; else $(CYGPATH_W) '$(srcdir)/wf_cabs.c'; fi`
-
 lib_a-wf_drem.o: wf_drem.c
 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-wf_drem.o `test -f 'wf_drem.c' || echo '$(srcdir)/'`wf_drem.c
 
diff --git a/newlib/libm/math/w_cabs.c b/newlib/libm/math/w_cabs.c
deleted file mode 100644
index bef76680c..000000000
--- a/newlib/libm/math/w_cabs.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * cabs() wrapper for hypot().
- * 
- * Written by J.T. Conklin, <jtc@wimsey.com>
- * Placed into the Public Domain, 1994.
- */
-
-#include "fdlibm.h"
-
-struct complex {
-	double x;
-	double y;
-};
-
-double
-cabs(z)
-	struct complex z;
-{
-	return hypot(z.x, z.y);
-}
diff --git a/newlib/libm/math/wf_cabs.c b/newlib/libm/math/wf_cabs.c
deleted file mode 100644
index c3ed0caa2..000000000
--- a/newlib/libm/math/wf_cabs.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * cabsf() wrapper for hypotf().
- * 
- * Written by J.T. Conklin, <jtc@wimsey.com>
- * Placed into the Public Domain, 1994.
- */
-
-#include "fdlibm.h"
-
-struct complex {
-	float x;
-	float y;
-};
-
-float
-cabsf(z)
-	struct complex z;
-{
-	return hypotf(z.x, z.y);
-}