entered into RCS

diff --git a/sysdeps/m68k/fpu/asin.c b/sysdeps/m68k/fpu/asin.c
index 44a8e5791b98edcefd0d0902693245929f3c848c..0e3e58f697ad1a26340b7b8301ab9485dd54b724 100644 (file)
--- a/sysdeps/m68k/fpu/asin.c
+++ b/sysdeps/m68k/fpu/asin.c
@@ -1,2 +1,2 @@
 #define        FUNC    asin
-#include "acos-68881.c"
+#include <acos.c>

diff --git a/sysdeps/m68k/fpu/atan.c b/sysdeps/m68k/fpu/atan.c
index 71ec30362aadcdf12f204fa8d9fb340d33980a90..b9d428e170b9afdc7f102657eecfede1aeaa0e73 100644 (file)
--- a/sysdeps/m68k/fpu/atan.c
+++ b/sysdeps/m68k/fpu/atan.c
@@ -1,2 +1,2 @@
 #define        FUNC    atan
-#include "acos-68881.c"
+#include <acos.c>

diff --git a/sysdeps/m68k/fpu/atanh.c b/sysdeps/m68k/fpu/atanh.c
new file mode 100644 (file)
index 0000000..d4636ec
--- /dev/null
+++ b/sysdeps/m68k/fpu/atanh.c
@@ -0,0 +1,2 @@
+#define        FUNC    atanh
+#include <acos.c>

diff --git a/sysdeps/m68k/fpu/ceil.c b/sysdeps/m68k/fpu/ceil.c
index d65ab0e05de937cd735cbf578778d4599090ba90..b4605e1b29a0e41eff9d9ef3288f4f5a47477a75 100644 (file)
--- a/sysdeps/m68k/fpu/ceil.c
+++ b/sysdeps/m68k/fpu/ceil.c
@@ -1,20 +1,4 @@
-/* Copyright (C) 1990 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
-
-The GNU C 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 1, or (at your option)
-any later version.
-
-The GNU C 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 the GNU C Library; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define        FUNC    ceil
 
-#include "acos-68881.c"
+#include <acos.c>

diff --git a/sysdeps/m68k/fpu/cos.c b/sysdeps/m68k/fpu/cos.c
index db6b8a49357ffb4746fcd33f347a6339a9e90954..fa50130af70b9281d4515f2077a5ce58922c3e96 100644 (file)
--- a/sysdeps/m68k/fpu/cos.c
+++ b/sysdeps/m68k/fpu/cos.c
@@ -1,2 +1,2 @@
 #define        FUNC    cos
-#include "acos-68881.c"
+#include <acos.c>

diff --git a/sysdeps/m68k/fpu/cosh.c b/sysdeps/m68k/fpu/cosh.c
index cc91b2ea9b756920a89fe47ec905514aed66fb03..78a81943c682b3714131b4c2861dd5c7ae061516 100644 (file)
--- a/sysdeps/m68k/fpu/cosh.c
+++ b/sysdeps/m68k/fpu/cosh.c
@@ -1,2 +1,2 @@
 #define        FUNC    cosh
-#include "acos-68881.c"
+#include <acos.c>

diff --git a/sysdeps/m68k/fpu/exp.c b/sysdeps/m68k/fpu/exp.c
index 2748fd351f8e25f0079acaddeea7a20aa8f41449..2649d721435e535ebeb6b9ebdb58710747465d8f 100644 (file)
--- a/sysdeps/m68k/fpu/exp.c
+++ b/sysdeps/m68k/fpu/exp.c
@@ -1,3 +1,3 @@
 #define        FUNC    exp
 #define        OP      etox
-#include "acos-68881.c"
+#include <acos.c>

diff --git a/sysdeps/m68k/fpu/expm1.c b/sysdeps/m68k/fpu/expm1.c
index 88a34dba667593cfa32e2508573a11b132d28ffb..19f1802e56df3f8b76f2f9a05184a4a0a162a5f1 100644 (file)
--- a/sysdeps/m68k/fpu/expm1.c
+++ b/sysdeps/m68k/fpu/expm1.c
@@ -1,2 +1,3 @@
-#define        FUNC    expm1
-#include <../sysdeps/m68k/68881/acos.c>
+#define        FUNC    __expm1
+#define        OP      expm1
+#include <acos.c>

diff --git a/sysdeps/m68k/fpu/fabs.c b/sysdeps/m68k/fpu/fabs.c
index 0f8feeab9771f4fc9f28d7b27c51c6092ffd6a6e..f9538a599ceb0c6fb9e9c14f36209aa0abf4381e 100644 (file)
--- a/sysdeps/m68k/fpu/fabs.c
+++ b/sysdeps/m68k/fpu/fabs.c
@@ -1,3 +1,3 @@
 #define        FUNC    fabs
 #define        OP      abs
-#include "acos-68881.c"
+#include <acos.c>

diff --git a/sysdeps/m68k/fpu/fl.h b/sysdeps/m68k/fpu/fl.h
index add735122e98e32f44d04bda60586d2740585b1e..098e880601dd53d0262de6fea9cbebf2daa281c0 100644 (file)
--- a/sysdeps/m68k/fpu/fl.h
+++ b/sysdeps/m68k/fpu/fl.h
@@ -6,7 +6,10 @@
 /* ansidecl.m4 here inserts the ieee file.  Kludge o rama.
    $) ENDCOMMENT INCLUDE($sysdeps/ieee754/fl.h$) STARTCOMMENT */
 
-#if    defined(FLT_ROUNDS) && defined(__GNUC__)
+#ifndef        __need_HUGE_VAL
+
+#ifdef __GNUC__
+
 #undef FLT_ROUNDS
 
 /* Interrogate the 68881 to find the current rounding mode.  */
@@ -33,4 +36,6 @@ DEFUN_VOID(__flt_rounds)
 
 #define        FLT_ROUNDS      (__flt_rounds())
 
-#endif
+#endif /* GCC.  */
+
+#endif /* Don't need HUGE_VAL.  */

diff --git a/sysdeps/m68k/fpu/floor.c b/sysdeps/m68k/fpu/floor.c
index bcd6be32a7b52858009554e0d7d6bcdc5c8c2bf4..92a2ca68bb388fd2114efb3c021a40245c62b746 100644 (file)
--- a/sysdeps/m68k/fpu/floor.c
+++ b/sysdeps/m68k/fpu/floor.c
@@ -1,3 +1,3 @@
 #define        FUNC    floor
 #define        OP      intrz
-#include "acos-68881.c"
+#include <acos.c>

diff --git a/sysdeps/m68k/fpu/frexp.c b/sysdeps/m68k/fpu/frexp.c
index 6ab7c5b93713866527b1c3222c238bb92a845165..de74851de987eb6198c7a15e7174a034e59b25ea 100644 (file)
--- a/sysdeps/m68k/fpu/frexp.c
+++ b/sysdeps/m68k/fpu/frexp.c
@@ -1,19 +1,20 @@
 /* Copyright (C) 1991 Free Software Foundation, Inc.
 This file is part of the GNU C Library.
 
-The GNU C 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 1, or (at your option)
-any later version.
+The GNU C Library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public License as
+published by the Free Software Foundation; either version 2 of the
+License, or (at your option) any later version.
 
 The GNU C 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.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Library General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with the GNU C Library; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+You should have received a copy of the GNU Library General Public
+License along with the GNU C Library; see the file COPYING.LIB.  If
+not, write to the Free Software Foundation, Inc., 675 Mass Ave,
+Cambridge, MA 02139, USA.  */
 
 #include <ansidecl.h>
 #define        __NO_MATH_INLINES

diff --git a/sysdeps/m68k/fpu/isnan.c b/sysdeps/m68k/fpu/isnan.c
index f74a05b4ba58aead1cb4d480cfe931a78e85b473..e90c691cca9a73e1ddc691e205d5bd29e520d2ac 100644 (file)
--- a/sysdeps/m68k/fpu/isnan.c
+++ b/sysdeps/m68k/fpu/isnan.c
@@ -1,2 +1,2 @@
 #define        FUNC    __isnan
-#include <../sysdeps/m68k/68881/isinf.c>
+#include <__isinf.c>

diff --git a/sysdeps/m68k/fpu/log.c b/sysdeps/m68k/fpu/log.c
index c5f5a5bf995a4cfba0ddfe76968c7b1c6f60f835..4de3346545b27f8324dbb593293249d25828940b 100644 (file)
--- a/sysdeps/m68k/fpu/log.c
+++ b/sysdeps/m68k/fpu/log.c
@@ -1,3 +1,3 @@
 #define        FUNC    log
 #define        OP      logn
-#include "acos-68881.c"
+#include <acos.c>

diff --git a/sysdeps/m68k/fpu/log10.c b/sysdeps/m68k/fpu/log10.c
index 9a9923da95a93d13bb26a06b17424a6ea1f5e266..246b69a3644d8493c198b1623efe26b568a0b8c5 100644 (file)
--- a/sysdeps/m68k/fpu/log10.c
+++ b/sysdeps/m68k/fpu/log10.c
@@ -1,2 +1,2 @@
 #define        FUNC    log10
-#include "acos-68881.c"
+#include <acos.c>

diff --git a/sysdeps/m68k/fpu/log1p.c b/sysdeps/m68k/fpu/log1p.c
new file mode 100644 (file)
index 0000000..0287838
--- /dev/null
+++ b/sysdeps/m68k/fpu/log1p.c
@@ -0,0 +1,2 @@
+#define        FUNC    log1p
+#include <acos.c>

diff --git a/sysdeps/m68k/fpu/rint.c b/sysdeps/m68k/fpu/rint.c
new file mode 100644 (file)
index 0000000..288ae81
--- /dev/null
+++ b/sysdeps/m68k/fpu/rint.c
@@ -0,0 +1,3 @@
+#define        FUNC    __rint
+#define        OP      intr
+#include <acos.c>

diff --git a/sysdeps/m68k/fpu/sin.c b/sysdeps/m68k/fpu/sin.c
index 6ee32e7986f80505df0f1870b7833482c394fc67..28ac9e50c32c89fed13ca632540eb191bbf1f714 100644 (file)
--- a/sysdeps/m68k/fpu/sin.c
+++ b/sysdeps/m68k/fpu/sin.c
@@ -1,2 +1,2 @@
 #define        FUNC    sin
-#include "acos-68881.c"
+#include <acos.c>

diff --git a/sysdeps/m68k/fpu/sinh.c b/sysdeps/m68k/fpu/sinh.c
index 51c8b3f92246c0b37112ab3a3ba0e0fc1aca7d62..fae7c71459d23e3b0accbe61f294f4f673ce67a2 100644 (file)
--- a/sysdeps/m68k/fpu/sinh.c
+++ b/sysdeps/m68k/fpu/sinh.c
@@ -1,2 +1,2 @@
 #define        FUNC    sinh
-#include "acos-68881.c"
+#include <acos.c>

diff --git a/sysdeps/m68k/fpu/sqrt.c b/sysdeps/m68k/fpu/sqrt.c
index 3ba32bfcce011d821438ddfe534ec58c99ffbdcf..2365b61780e54e183b5c24a360b66de245ef717e 100644 (file)
--- a/sysdeps/m68k/fpu/sqrt.c
+++ b/sysdeps/m68k/fpu/sqrt.c
@@ -1,2 +1,2 @@
 #define        FUNC    sqrt
-#include "acos-68881.c"
+#include <acos.c>

diff --git a/sysdeps/m68k/fpu/switch/Makefile b/sysdeps/m68k/fpu/switch/Makefile
index 9482471597a093a8c0cc3eacd655b2bf23368f9d..fd8d7c11f4a02eb40174e9992153fb6f50a4eea2 100644 (file)
--- a/sysdeps/m68k/fpu/switch/Makefile
+++ b/sysdeps/m68k/fpu/switch/Makefile
@@ -22,16 +22,16 @@ sysdep_routines := $(sysdep_routines) switch
 
 # Find all the sources that have 68881 versions.
 +68881-sources := \
-  $(notdir $(wildcard $(addprefix $(filter %/68881,$(sysdirs)),$(sources))))
+  $(notdir $(wildcard $(addprefix $(filter %/fpu,$(sysdirs)),$(sources))))
 
-# Sysdep directories other than 68881 and 68881-sw (this one).
-+non68881-dirs := $(filter-out %/68881 %/68881-switch,$(+sysdep_dirs))
+# Sysdep directories other than fpu and fpu/switch (this one).
++non68881-dirs := $(filter-out %/fpu %/fpu/switch,$(+sysdep_dirs))
 
 # Get a non-68881 version of the target.
 +non68881-version = $(firstword $(wildcard $(addsuffix /$@,$(+non68881-dirs))))
 
 # Directory containing 68881 sources.
-+68881-dir := $(filter %/68881,$(+sysdep_dirs))
++68881-dir := $(filter %/fpu,$(+sysdep_dirs))
 
 # For all the files that have 68881 versions and don't exist already in
 # the source directory (math), automatically make ones that switch between

diff --git a/sysdeps/m68k/fpu/switch/switch.c b/sysdeps/m68k/fpu/switch/switch.c
index b1deef2e987c5c49f28f60644f90c876e8263993..057bd1509ade960cbc125e330d7405e981478a83 100644 (file)
--- a/sysdeps/m68k/fpu/switch/switch.c
+++ b/sysdeps/m68k/fpu/switch/switch.c
@@ -18,7 +18,7 @@ Cambridge, MA 02139, USA.  */
 
 #include <ansidecl.h>
 #include <signal.h>
-#include <68881-switch.h>
+#include <68881-sw.h>
 
 
 /* The signal that is sent when a 68881 instruction

diff --git a/sysdeps/m68k/fpu/tan.c b/sysdeps/m68k/fpu/tan.c
index 2adc921247e141126cb106500a5bf29174be4a22..53b3b5342ec94984fc8a81e7a8441467cda1f4b1 100644 (file)
--- a/sysdeps/m68k/fpu/tan.c
+++ b/sysdeps/m68k/fpu/tan.c
@@ -1,2 +1,2 @@
 #define        FUNC    tan
-#include "acos-68881.c"
+#include <acos.c>

diff --git a/sysdeps/m68k/fpu/tanh.c b/sysdeps/m68k/fpu/tanh.c
index 1815c0ae5b10a9e123f5e408a814996ef622d783..cc6739539aeb29ff1b2f0fa419d550fc795a6bcf 100644 (file)
--- a/sysdeps/m68k/fpu/tanh.c
+++ b/sysdeps/m68k/fpu/tanh.c
@@ -1,2 +1,2 @@
 #define        FUNC    tanh
-#include "acos-68881.c"
+#include <acos.c>