entered into RCS

sysdeps/m68k/fpu/asin.c

@@ -1,2 +1,2 @@
 #define	FUNC	asin
-#include "acos-68881.c"
+#include <acos.c>

sysdeps/m68k/fpu/atan.c

@@ -1,2 +1,2 @@
 #define	FUNC	atan
-#include "acos-68881.c"
+#include <acos.c>

sysdeps/m68k/fpu/atanh.c

@@ -0,0 +1,2 @@
+#define	FUNC	atanh
+#include <acos.c>

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>

sysdeps/m68k/fpu/cos.c

@@ -1,2 +1,2 @@
 #define	FUNC	cos
-#include "acos-68881.c"
+#include <acos.c>

sysdeps/m68k/fpu/cosh.c

@@ -1,2 +1,2 @@
 #define	FUNC	cosh
-#include "acos-68881.c"
+#include <acos.c>

sysdeps/m68k/fpu/exp.c

@@ -1,3 +1,3 @@
 #define	FUNC	exp
 #define	OP	etox
-#include "acos-68881.c"
+#include <acos.c>

sysdeps/m68k/fpu/expm1.c

@@ -1,2 +1,3 @@
-#define	FUNC	expm1
+#define	FUNC	__expm1
-#include <../sysdeps/m68k/68881/acos.c>
+#define	OP	expm1
+#include <acos.c>

sysdeps/m68k/fpu/fabs.c

@@ -1,3 +1,3 @@
 #define	FUNC	fabs
 #define	OP	abs
-#include "acos-68881.c"
+#include <acos.c>

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.  */

sysdeps/m68k/fpu/floor.c

@@ -1,3 +1,3 @@
 #define	FUNC	floor
 #define	OP	intrz
-#include "acos-68881.c"
+#include <acos.c>

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

sysdeps/m68k/fpu/isnan.c

@@ -1,2 +1,2 @@
 #define	FUNC	__isnan
-#include <../sysdeps/m68k/68881/isinf.c>
+#include <__isinf.c>

sysdeps/m68k/fpu/log.c

@@ -1,3 +1,3 @@
 #define	FUNC	log
 #define	OP	logn
-#include "acos-68881.c"
+#include <acos.c>

sysdeps/m68k/fpu/log10.c

@@ -1,2 +1,2 @@
 #define	FUNC	log10
-#include "acos-68881.c"
+#include <acos.c>

sysdeps/m68k/fpu/log1p.c

@@ -0,0 +1,2 @@
+#define	FUNC	log1p
+#include <acos.c>

sysdeps/m68k/fpu/rint.c

@@ -0,0 +1,3 @@
+#define	FUNC	__rint
+#define	OP	intr
+#include <acos.c>

sysdeps/m68k/fpu/sin.c

@@ -1,2 +1,2 @@
 #define	FUNC	sin
-#include "acos-68881.c"
+#include <acos.c>

sysdeps/m68k/fpu/sinh.c

@@ -1,2 +1,2 @@
 #define	FUNC	sinh
-#include "acos-68881.c"
+#include <acos.c>

sysdeps/m68k/fpu/sqrt.c

@@ -1,2 +1,2 @@
 #define	FUNC	sqrt
-#include "acos-68881.c"
+#include <acos.c>

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).
+# Sysdep directories other than fpu and fpu/switch (this one).
-+non68881-dirs := $(filter-out %/68881 %/68881-switch,$(+sysdep_dirs))
++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

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

sysdeps/m68k/fpu/tan.c

@@ -1,2 +1,2 @@
 #define	FUNC	tan
-#include "acos-68881.c"
+#include <acos.c>

sysdeps/m68k/fpu/tanh.c

@@ -1,2 +1,2 @@
 #define	FUNC	tanh
-#include "acos-68881.c"
+#include <acos.c>