Makefile.am (EXTRA_LONG_DOUBLE_yes): Remove cabsl.c

	* libmath/Makefile.am (EXTRA_LONG_DOUBLE_yes): Remove cabsl.c
	* libmath/Makefile.in: Regenerate.
	* libmath/cabs.c: Remove.
	* libmath/cabsf.c: Likewise.
	* libmath/cabsl.c: Likewise.
	* libmath/complex-stub.h: Remove declarations for cabs*.

	* acinclude.m4: Remove check for cabs*.
	* aclocal.m4: Regenerate.

	* Makefile.in: Regenerate.

From-SVN: r37758

10 files changed, 85 insertions, 143 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 73953fb..649f078 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,19 @@
 2000-11-26  Gabriel Dos Reis  <gdr@codesourcery.com>
 
+	* libmath/Makefile.am (EXTRA_LONG_DOUBLE_yes): Remove cabsl.c 
+	* libmath/Makefile.in: Regenerate.
+	* libmath/cabs.c: Remove.
+	* libmath/cabsf.c: Likewise.
+	* libmath/cabsl.c: Likewise.
+	* libmath/complex-stub.h: Remove declarations for cabs*.
+
+	* acinclude.m4: Remove check for cabs*. 
+	* aclocal.m4: Regenerate.
+
+	* Makefile.in: Regenerate.
+
+2000-11-26  Gabriel Dos Reis  <gdr@codesourcery.com>
+
 	* tests_flags.in: New file. Split out of ...
 	* mkcheck.in: ... this. Move flags computation into
 	tests_flags.in. 
diff --git a/libstdc++-v3/Makefile.in b/libstdc++-v3/Makefile.in
index d1e96f1..0b7efe3 100644
--- a/libstdc++-v3/Makefile.in
+++ b/libstdc++-v3/Makefile.in
@@ -135,15 +135,56 @@ MULTICLEAN = true
 # Work around what appears to be a GNU make bug handling MAKEFLAGS
 # values defined in terms of make variables, as is the case for CC and
 # friends when we are called from the top level Makefile.
-AM_MAKEFLAGS =  	"AR_FLAGS=$(AR_FLAGS)" 	"CC_FOR_BUILD=$(CC_FOR_BUILD)" 	"CC_FOR_TARGET=$(CC_FOR_TARGET)" 	"CFLAGS=$(CFLAGS)" 	"CXXFLAGS=$(CXXFLAGS)" 	"CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" 	"CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" 	"INSTALL=$(INSTALL)" 	"INSTALL_DATA=$(INSTALL_DATA)" 	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" 	"INSTALL_SCRIPT=$(INSTALL_SCRIPT)" 	"LDFLAGS=$(LDFLAGS)" 	"LIBCFLAGS=$(LIBCFLAGS)" 	"LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" 	"MAKE=$(MAKE)" 	"MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" 	"PICFLAG=$(PICFLAG)" 	"PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" 	"SHELL=$(SHELL)" 	"EXPECT=$(EXPECT)" 	"RUNTEST=$(RUNTEST)" 	"RUNTESTFLAGS=$(RUNTESTFLAGS)" 	"exec_prefix=$(exec_prefix)" 	"infodir=$(infodir)" 	"libdir=$(libdir)" 	"includedir=$(includedir)" 	"prefix=$(prefix)" 	"tooldir=$(tooldir)" 	"AR=$(AR)" 	"AS=$(AS)" 	"CC=$(CC)" 	"CXX=$(CXX)" 	"LD=$(LD)" 	"LIBCFLAGS=$(LIBCFLAGS)" 	"PICFLAG=$(PICFLAG)" 	"RANLIB=$(RANLIB)" 	"NM=$(NM)" 	"NM_FOR_BUILD=$(NM_FOR_BUILD)" 	"NM_FOR_TARGET=$(NM_FOR_TARGET)" 	"DESTDIR=$(DESTDIR)" 	"WERROR=$(WERROR)" 
+AM_MAKEFLAGS = \
+	"AR_FLAGS=$(AR_FLAGS)" \
+	"CC_FOR_BUILD=$(CC_FOR_BUILD)" \
+	"CC_FOR_TARGET=$(CC_FOR_TARGET)" \
+	"CFLAGS=$(CFLAGS)" \
+	"CXXFLAGS=$(CXXFLAGS)" \
+	"CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
+	"CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
+	"INSTALL=$(INSTALL)" \
+	"INSTALL_DATA=$(INSTALL_DATA)" \
+	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
+	"INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
+	"LDFLAGS=$(LDFLAGS)" \
+	"LIBCFLAGS=$(LIBCFLAGS)" \
+	"LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \
+	"MAKE=$(MAKE)" \
+	"MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \
+	"PICFLAG=$(PICFLAG)" \
+	"PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \
+	"SHELL=$(SHELL)" \
+	"EXPECT=$(EXPECT)" \
+	"RUNTEST=$(RUNTEST)" \
+	"RUNTESTFLAGS=$(RUNTESTFLAGS)" \
+	"exec_prefix=$(exec_prefix)" \
+	"infodir=$(infodir)" \
+	"libdir=$(libdir)" \
+	"includedir=$(includedir)" \
+	"prefix=$(prefix)" \
+	"tooldir=$(tooldir)" \
+	"AR=$(AR)" \
+	"AS=$(AS)" \
+	"CC=$(CC)" \
+	"CXX=$(CXX)" \
+	"LD=$(LD)" \
+	"LIBCFLAGS=$(LIBCFLAGS)" \
+	"PICFLAG=$(PICFLAG)" \
+	"RANLIB=$(RANLIB)" \
+	"NM=$(NM)" \
+	"NM_FOR_BUILD=$(NM_FOR_BUILD)" \
+	"NM_FOR_TARGET=$(NM_FOR_TARGET)" \
+	"DESTDIR=$(DESTDIR)" \
+	"WERROR=$(WERROR)" 
 
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =  mkcheck
+CONFIG_CLEAN_FILES =  tests_flags mkcheck
 DIST_COMMON =  README ./stamp-h.in ChangeLog Makefile.am Makefile.in \
 acconfig.h acinclude.m4 aclocal.m4 config.h.in configure configure.in \
-mkcheck.in
+mkcheck.in tests_flags.in
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
@@ -194,6 +235,8 @@ distclean-hdr:
 	-rm -f config.h
 
 maintainer-clean-hdr:
+tests_flags: $(top_builddir)/config.status tests_flags.in
+	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 mkcheck: $(top_builddir)/config.status mkcheck.in
 	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index 2d323db..058074d 100644
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -737,7 +737,7 @@ AC_DEFUN(GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT, [
   dnl Check for complex versions of math functions of platform.
   AC_CHECK_HEADERS([complex.h])
   AC_CHECK_LIB(m, main)
-  AC_REPLACE_MATHFUNCS(cabs cabsf ccos ccosf ccosh ccoshf cexp cexpf \
+  AC_REPLACE_MATHFUNCS(ccos ccosf ccosh ccoshf cexp cexpf \
   c_log c_logf clog10 clog10f cpow cpowf csin csinf csinh csinhf csqrt \
   csqrtf ctan ctanf ctanh ctanhf carg cargf nan hypot hypotf atan2f expf \
   copysignf)
@@ -750,7 +750,7 @@ AC_DEFUN(GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT, [
   if test x$ac_cv_func_atan2l = x"yes" \
      && test x$ac_cv_func_copysignl = x"yes"; then
     USE_COMPLEX_LONG_DOUBLE=yes
-    AC_REPLACE_MATHFUNCS(cabsl ccoshl ccosl cexpl cpowl csinhl csinl \
+    AC_REPLACE_MATHFUNCS(ccoshl ccosl cexpl cpowl csinhl csinl \
     csqrtl ctanhl ctanl cargl hypotl signbitl c_logl clog10l)
   fi
 
diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4
index e3580f2..f7ff969 100644
--- a/libstdc++-v3/aclocal.m4
+++ b/libstdc++-v3/aclocal.m4
@@ -749,7 +749,7 @@ AC_DEFUN(GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT, [
   dnl Check for complex versions of math functions of platform.
   AC_CHECK_HEADERS([complex.h])
   AC_CHECK_LIB(m, main)
-  AC_REPLACE_MATHFUNCS(cabs cabsf ccos ccosf ccosh ccoshf cexp cexpf \
+  AC_REPLACE_MATHFUNCS(ccos ccosf ccosh ccoshf cexp cexpf \
   c_log c_logf clog10 clog10f cpow cpowf csin csinf csinh csinhf csqrt \
   csqrtf ctan ctanf ctanh ctanhf carg cargf nan hypot hypotf atan2f expf \
   copysignf)
@@ -762,7 +762,7 @@ AC_DEFUN(GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT, [
   if test x$ac_cv_func_atan2l = x"yes" \
      && test x$ac_cv_func_copysignl = x"yes"; then
     USE_COMPLEX_LONG_DOUBLE=yes
-    AC_REPLACE_MATHFUNCS(cabsl ccoshl ccosl cexpl cpowl csinhl csinl \
+    AC_REPLACE_MATHFUNCS(ccoshl ccosl cexpl cpowl csinhl csinl \
     csqrtl ctanhl ctanl cargl hypotl signbitl c_logl clog10l)
   fi
 
diff --git a/libstdc++-v3/libmath/Makefile.am b/libstdc++-v3/libmath/Makefile.am
index b114f54..2ad8f87 100644
--- a/libstdc++-v3/libmath/Makefile.am
+++ b/libstdc++-v3/libmath/Makefile.am
@@ -28,7 +28,7 @@ noinst_LTLIBRARIES = libmath.la
 EXTRA_LONG_DOUBLE_yes = \
 	ccosl.c cexpl.c c_logl.c clog10l.c cpowl.c csinhl.c \
 	csqrtl.c ctanhl.c ctanl.c cargl.c hypotl.c \
-	signbitl.c cabsl.c 
+	signbitl.c
 
 EXTRA_DIST = \
 	ccos.c ccosf.c ccosh.c ccoshf.c ccoshl.c \
diff --git a/libstdc++-v3/libmath/Makefile.in b/libstdc++-v3/libmath/Makefile.in
index b533db6..3c9ac41 100644
--- a/libstdc++-v3/libmath/Makefile.in
+++ b/libstdc++-v3/libmath/Makefile.in
@@ -113,18 +113,31 @@ AUTOMAKE_OPTIONS = 1.3 cygnus
 
 noinst_LTLIBRARIES = libmath.la
 
-EXTRA_LONG_DOUBLE_yes =  	ccosl.c cexpl.c c_logl.c clog10l.c cpowl.c csinhl.c 	csqrtl.c ctanhl.c ctanl.c cargl.c hypotl.c 	signbitl.c cabsl.c 
+EXTRA_LONG_DOUBLE_yes = \
+	ccosl.c cexpl.c c_logl.c clog10l.c cpowl.c csinhl.c \
+	csqrtl.c ctanhl.c ctanl.c cargl.c hypotl.c \
+	signbitl.c
 
 
-EXTRA_DIST =  	ccos.c ccosf.c ccosh.c ccoshf.c ccoshl.c 	cexp.c cexpf.c c_log.c c_logf.c  clog10.c clog10f.c 	cpow.c cpowf.c csin.c csinf.c csinh.c csinhf.c 	csinl.c csqrt.c csqrtf.c  ctan.c ctanf.c ctanh.c 	ctanhf.c  carg.c cargf.c hypot.c hypotf.c 	atan2f.c expf.c 	$(EXTRA_LONG_DOUBLE_yes) 
+EXTRA_DIST = \
+	ccos.c ccosf.c ccosh.c ccoshf.c ccoshl.c \
+	cexp.c cexpf.c c_log.c c_logf.c  clog10.c clog10f.c \
+	cpow.c cpowf.c csin.c csinf.c csinh.c csinhf.c \
+	csinl.c csqrt.c csqrtf.c  ctan.c ctanf.c ctanh.c \
+	ctanhf.c  carg.c cargf.c hypot.c hypotf.c\
+	atan2f.c expf.c \
+	$(EXTRA_LONG_DOUBLE_yes) 
 
 
-libmath_la_LIBADD =  	@LIBMATHOBJS@ 	$(EXTRA_LONG_DOUBLE_$(USE_COMPLEX_LONG_DOUBLE)) 
+libmath_la_LIBADD = \
+	@LIBMATHOBJS@ \
+	$(EXTRA_LONG_DOUBLE_$(USE_COMPLEX_LONG_DOUBLE)) 
 
 
 libmath_la_DEPENDENCIES = $(libmath_la_LIBADD)
 
-libmath_la_SOURCES =  	signbit.c signbitf.c
+libmath_la_SOURCES = \
+	signbit.c signbitf.c
 
 
 LINK = $(LIBTOOL) --mode=link "$(CCLD)" $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
@@ -138,7 +151,9 @@ LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
 LIBIO_INCLUDES = @LIBIO_INCLUDES@
 CSHADOW_INCLUDES = @CSHADOW_INCLUDES@
 
-INCLUDES =  	-I$(GLIBCPP_INCLUDE_DIR) -I$(top_builddir)/include  	$(TOPLEVEL_INCLUDES) 
+INCLUDES = \
+	-I$(GLIBCPP_INCLUDE_DIR) -I$(top_builddir)/include  \
+	$(TOPLEVEL_INCLUDES) 
 
 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
 CONFIG_HEADER = ../config.h
diff --git a/libstdc++-v3/libmath/cabs.c b/libstdc++-v3/libmath/cabs.c
deleted file mode 100644
index f2f41e2..0000000
--- a/libstdc++-v3/libmath/cabs.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Return the complex absolute value of double complex value. */
-
-/* Copyright (C) 1997-1999 Free Software Foundation, Inc.
-
-   This file is part of the GNU ISO C++ Library.  This library is free
-   software; you can redistribute it and/or modify it under the
-   terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License along
-   with this library; see the file COPYING.  If not, write to the Free
-   Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.
-
-   As a special exception, you may use this file as part of a free software
-   library without restriction.  Specifically, if other files instantiate
-   templates or use macros or inline functions from this file, or you compile
-   this file and link it with other files to produce an executable, this
-   file does not by itself cause the resulting executable to be covered by
-   the GNU General Public License.  This exception does not however
-   invalidate any other reasons why the executable file might be covered by
-   the GNU General Public License.  */
-
-
-#include <math.h>
-#include "mathconf.h"
-
-double
-cabs (__complex__ double z)
-{
-  return hypot (__real__ z, __imag__ z);
-}
diff --git a/libstdc++-v3/libmath/cabsf.c b/libstdc++-v3/libmath/cabsf.c
deleted file mode 100644
index 53358cf..0000000
--- a/libstdc++-v3/libmath/cabsf.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Return the complex absolute value of double complex value. */
-
-/* Copyright (C) 1997-1999 Free Software Foundation, Inc.
-
-   This file is part of the GNU ISO C++ Library.  This library is free
-   software; you can redistribute it and/or modify it under the
-   terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License along
-   with this library; see the file COPYING.  If not, write to the Free
-   Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.
-
-   As a special exception, you may use this file as part of a free software
-   library without restriction.  Specifically, if other files instantiate
-   templates or use macros or inline functions from this file, or you compile
-   this file and link it with other files to produce an executable, this
-   file does not by itself cause the resulting executable to be covered by
-   the GNU General Public License.  This exception does not however
-   invalidate any other reasons why the executable file might be covered by
-   the GNU General Public License.  */
-
-
-#include <math.h>
-#include "mathconf.h"
-
-float
-cabsf (__complex__ float z)
-{
-  return hypotf (__real__ z, __imag__ z);
-}
diff --git a/libstdc++-v3/libmath/cabsl.c b/libstdc++-v3/libmath/cabsl.c
deleted file mode 100644
index 4b36a3a..0000000
--- a/libstdc++-v3/libmath/cabsl.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Return the complex absolute value of double complex value. */
-
-/* Copyright (C) 1997-1999 Free Software Foundation, Inc.
-
-   This file is part of the GNU ISO C++ Library.  This library is free
-   software; you can redistribute it and/or modify it under the
-   terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License along
-   with this library; see the file COPYING.  If not, write to the Free
-   Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-   USA.
-
-   As a special exception, you may use this file as part of a free software
-   library without restriction.  Specifically, if other files instantiate
-   templates or use macros or inline functions from this file, or you compile
-   this file and link it with other files to produce an executable, this
-   file does not by itself cause the resulting executable to be covered by
-   the GNU General Public License.  This exception does not however
-   invalidate any other reasons why the executable file might be covered by
-   the GNU General Public License.  */
-
-#include <math.h>
-#include "mathconf.h"
-
-/* Thanks to SGI we have to trick here.  At least Irix 6.2 provides hypotl,
-   but it has a wrong prototype.  Grrr.  */
-extern long double local_hypotl (long double, long double) asm ("hypotl");
-
-
-long double
-__mycabsl (__complex__ long double z)
-{
-  return local_hypotl (__real__ z, __imag__ z);
-}
diff --git a/libstdc++-v3/libmath/complex-stub.h b/libstdc++-v3/libmath/complex-stub.h
index b5f393a..bd3ebe6 100644
--- a/libstdc++-v3/libmath/complex-stub.h
+++ b/libstdc++-v3/libmath/complex-stub.h
@@ -78,17 +78,5 @@ double carg (__complex__ double x);
 float cargf (__complex__ float x);
 long double cargl (__complex__ long double x);
 
-/* Some systems (like IRIX 6.5) already define these functions in 
-   <math.h>.  */
-#ifndef _GLIBCPP_HAVE_CABS
-double cabs (__complex__ double x);
-#endif /* defined(_GLIBCPP_HAVE_CABS) */
-#ifndef _GLIBCPP_HAVE_CABSF
-float cabsf (__complex__ float x);
-#endif /* defined(_GLIBCPP_HAVE_CABSF) */
-#ifndef _GLIBCPP_HAVE_CABSL
-long double cabsl (__complex__ long double x);
-#endif /* defined(_GLIBCPP_HAVE_CABSL) */
-
 #endif