* intrinsics/hyper.c: Remove file.

	* intrinsics/c99_functions.c: Add fallback functions asinhf,
	acoshf and atanhf.
	* Makefile.am: Remove file intrinsics/hyper.c.
	* Makefile.in: Regenerate.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@117560 138bc75d-0d04-0410-961f-82ee72b054a4

5 files changed, 40 insertions, 74 deletions

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 6825bc32576..49990ab2115 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,5 +1,13 @@
 2006-10-08  Francois-Xavier Coudert  <coudert@clipper.ens.fr>
 
+	* intrinsics/hyper.c: Remove file.
+	* intrinsics/c99_functions.c: Add fallback functions asinhf,
+	acoshf and atanhf.
+	* Makefile.am: Remove file intrinsics/hyper.c.
+	* Makefile.in: Regenerate.
+
+2006-10-08  Francois-Xavier Coudert  <coudert@clipper.ens.fr>
+
 	* c99_protos.h: Correctly protect definitions of prototypes for
 	asinhf, acoshf and atanhf to be the same as in intrinsics/hyper.c.
 
diff --git a/libgfortran/Makefile.am b/libgfortran/Makefile.am
index dd5b684c017..21a7e603fbf 100644
--- a/libgfortran/Makefile.am
+++ b/libgfortran/Makefile.am
@@ -66,7 +66,6 @@ intrinsics/gerror.c \
 intrinsics/getcwd.c \
 intrinsics/getlog.c \
 intrinsics/getXid.c \
-intrinsics/hyper.c \
 intrinsics/hostnm.c \
 intrinsics/kill.c \
 intrinsics/ierrno.c \
diff --git a/libgfortran/Makefile.in b/libgfortran/Makefile.in
index 32cdf404816..6b726fcc39b 100644
--- a/libgfortran/Makefile.in
+++ b/libgfortran/Makefile.in
@@ -167,14 +167,14 @@ am__objects_30 = associated.lo abort.lo access.lo args.lo bessel.lo \
 	c99_functions.lo chdir.lo chmod.lo clock.lo cpu_time.lo \
 	cshift0.lo ctime.lo date_and_time.lo env.lo erf.lo eoshift0.lo \
 	eoshift2.lo etime.lo exit.lo fget.lo flush.lo fnum.lo ftell.lo \
-	gerror.lo getcwd.lo getlog.lo getXid.lo hyper.lo hostnm.lo \
-	kill.lo ierrno.lo ishftc.lo link.lo malloc.lo mvbits.lo \
-	move_alloc.lo pack_generic.lo perror.lo signal.lo size.lo \
-	sleep.lo spread_generic.lo string_intrinsics.lo system.lo \
-	rand.lo random.lo rename.lo reshape_generic.lo \
-	reshape_packed.lo selected_int_kind.lo selected_real_kind.lo \
-	stat.lo symlnk.lo system_clock.lo time.lo transpose_generic.lo \
-	tty.lo umask.lo unlink.lo unpack_generic.lo in_pack_generic.lo \
+	gerror.lo getcwd.lo getlog.lo getXid.lo hostnm.lo kill.lo \
+	ierrno.lo ishftc.lo link.lo malloc.lo mvbits.lo \
+	pack_generic.lo perror.lo signal.lo size.lo sleep.lo \
+	spread_generic.lo string_intrinsics.lo system.lo rand.lo \
+	random.lo rename.lo reshape_generic.lo reshape_packed.lo \
+	selected_int_kind.lo selected_real_kind.lo stat.lo symlnk.lo \
+	system_clock.lo time.lo transpose_generic.lo tty.lo umask.lo \
+	unlink.lo unpack_generic.lo in_pack_generic.lo \
 	in_unpack_generic.lo
 am__objects_31 =
 am__objects_32 = _abs_c4.lo _abs_c8.lo _abs_c10.lo _abs_c16.lo \
@@ -419,7 +419,6 @@ intrinsics/gerror.c \
 intrinsics/getcwd.c \
 intrinsics/getlog.c \
 intrinsics/getXid.c \
-intrinsics/hyper.c \
 intrinsics/hostnm.c \
 intrinsics/kill.c \
 intrinsics/ierrno.c \
@@ -427,7 +426,6 @@ intrinsics/ishftc.c \
 intrinsics/link.c \
 intrinsics/malloc.c \
 intrinsics/mvbits.c \
-intrinsics/move_alloc.c \
 intrinsics/pack_generic.c \
 intrinsics/perror.c \
 intrinsics/signal.c \
@@ -2386,9 +2384,6 @@ getlog.lo: intrinsics/getlog.c
 getXid.lo: intrinsics/getXid.c
 	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getXid.lo `test -f 'intrinsics/getXid.c' || echo '$(srcdir)/'`intrinsics/getXid.c
 
-hyper.lo: intrinsics/hyper.c
-	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hyper.lo `test -f 'intrinsics/hyper.c' || echo '$(srcdir)/'`intrinsics/hyper.c
-
 hostnm.lo: intrinsics/hostnm.c
 	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hostnm.lo `test -f 'intrinsics/hostnm.c' || echo '$(srcdir)/'`intrinsics/hostnm.c
 
@@ -2410,9 +2405,6 @@ malloc.lo: intrinsics/malloc.c
 mvbits.lo: intrinsics/mvbits.c
 	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mvbits.lo `test -f 'intrinsics/mvbits.c' || echo '$(srcdir)/'`intrinsics/mvbits.c
 
-move_alloc.lo: intrinsics/move_alloc.c
-	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o move_alloc.lo `test -f 'intrinsics/move_alloc.c' || echo '$(srcdir)/'`intrinsics/move_alloc.c
-
 pack_generic.lo: intrinsics/pack_generic.c
 	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pack_generic.lo `test -f 'intrinsics/pack_generic.c' || echo '$(srcdir)/'`intrinsics/pack_generic.c
 
diff --git a/libgfortran/intrinsics/c99_functions.c b/libgfortran/intrinsics/c99_functions.c
index e26be0ecdb9..86867a20b9f 100644
--- a/libgfortran/intrinsics/c99_functions.c
+++ b/libgfortran/intrinsics/c99_functions.c
@@ -76,7 +76,6 @@ float complex clog10f(float complex);
 double complex clog10(double complex);
 long double complex clog10l(long double complex);
 
-
 #ifndef HAVE_ACOSF
 #define HAVE_ACOSF 1
 float
@@ -86,6 +85,14 @@ acosf(float x)
 }
 #endif
 
+#if HAVE_ACOSH && !HAVE_ACOSHF
+float
+acoshf (float x)
+{
+  return (float) acosh ((double) x);
+}
+#endif
+
 #ifndef HAVE_ASINF
 #define HAVE_ASINF 1
 float
@@ -95,6 +102,14 @@ asinf(float x)
 }
 #endif
 
+#if HAVE_ASINH && !HAVE_ASINHF
+float
+asinhf (float x)
+{
+  return (float) asinh ((double) x);
+}
+#endif
+
 #ifndef HAVE_ATAN2F
 #define HAVE_ATAN2F 1
 float
@@ -113,6 +128,14 @@ atanf(float x)
 }
 #endif
 
+#if HAVE_ATANH && !HAVE_ATANHF
+float
+atanhf (float x)
+{
+  return (float) atanh ((double) x);
+}
+#endif
+
 #ifndef HAVE_CEILF
 #define HAVE_CEILF 1
 float
diff --git a/libgfortran/intrinsics/hyper.c b/libgfortran/intrinsics/hyper.c
deleted file mode 100644
index ec7f27d3d01..00000000000
--- a/libgfortran/intrinsics/hyper.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Wrapper for systems without the C99 acosh(), asinh(), and atanh() functions
-   Copyright (C) 2005 Free Software Foundation, Inc.
-
-This file is part of the GNU Fortran 95 runtime library (libgfortran).
-
-Libgfortran 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 of the License, or (at your option) any later version.
-
-In addition to the permissions in the GNU General Public License, the
-Free Software Foundation gives you unlimited permission to link the
-compiled version of this file into combinations with other programs,
-and to distribute those combinations without any restriction coming
-from the use of this file.  (The General Public License restrictions
-do apply in other respects; for example, they cover modification of
-the file, and distribution when not linked into a combine
-executable.)
-
-Libgfortran 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 libgfortran; see the file COPYING.  If not,
-write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-
-#include "config.h"
-#include <math.h>
-#include "libgfortran.h"
-
-#if HAVE_ACOSH && !HAVE_ACOSHF
-float
-acoshf (float x)
-{
-  return (float) acosh ((double) x);
-}
-#endif
-
-#if HAVE_ASINH && !HAVE_ASINHF
-float
-asinhf (float x)
-{
-  return (float) asinh ((double) x);
-}
-#endif
-
-#if HAVE_ATANH && !HAVE_ATANHF
-float
-atanhf (float x)
-{
-  return (float) atanh ((double) x);
-}
-#endif