2001-12-18 Thomas Fitzsimmons <fitzsim@redhat.com>

	* libc/machine/i386/f_*: Move to libm/machine/i386.

2001-12-18      Joel Sherrill <joel@OARcorp.com>

	* libm/machine/Makefile.am: Add dummy doc stub so
	"make info" works.

2001-12-17	Joel Sherrill <joel@OARcorp.com>

	* libc/include/sys/types.h (ino_t): RTEMS uses long also.

25 files changed, 86 insertions, 22 deletions

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index b5df76184..5b64e7bfc 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -3,6 +3,19 @@
 	* Makefile.am (DOCDIR): Force to empty string when doc
 	directory is not present.
 
+2001-12-18  Thomas Fitzsimmons  <fitzsim@redhat.com>
+
+	* libc/machine/i386/f_*: Move to libm/machine/i386.
+
+2001-12-18      Joel Sherrill <joel@OARcorp.com>
+
+	* libm/machine/Makefile.am: Add dummy doc stub so
+	"make info" works.
+
+2001-12-17	Joel Sherrill <joel@OARcorp.com>
+
+	* libc/include/sys/types.h (ino_t): RTEMS uses long also.
+
 2001-12-17  Thomas Fitzsimmons  <fitzsim@redhat.com>
 
 	* libc/stdlib/Makefile.am (LIB_COMPILE): Change to equal
diff --git a/newlib/NEWS b/newlib/NEWS
index 6e3bd90ba..9a606f253 100644
--- a/newlib/NEWS
+++ b/newlib/NEWS
@@ -1,6 +1,7 @@
 *** Major changes in newlib version 1.10.0:
 
 * libtool support for i[3456]86-pc-linux native builds
+* addition of libm/machine/i386 directory, for i386 fast math routines
 
 *** Major changes in newlib version 1.9.0:
 
diff --git a/newlib/libc/include/sys/types.h b/newlib/libc/include/sys/types.h
index 9c932a62c..96d25c4a0 100644
--- a/newlib/libc/include/sys/types.h
+++ b/newlib/libc/include/sys/types.h
@@ -87,7 +87,7 @@ struct itimerspec {
 typedef	long	daddr_t;
 typedef	char *	caddr_t;
 
-#ifdef __MS_types__
+#if defined(__MS_types__) || defined(__rtems__)
 typedef	unsigned long	ino_t;
 #else
 #ifdef __sparc__
@@ -218,7 +218,7 @@ typedef _TIMER_T_ timer_t;
 #define __timer_t_defined
 #endif
 
-#ifdef __CYGWIN__
+#if defined(__CYGWIN__) || defined(__rtems__)
 typedef long useconds_t;
 #endif
 
diff --git a/newlib/libc/machine/i386/Makefile.am b/newlib/libc/machine/i386/Makefile.am
index 804345a5f..100d8c46e 100644
--- a/newlib/libc/machine/i386/Makefile.am
+++ b/newlib/libc/machine/i386/Makefile.am
@@ -12,10 +12,7 @@ endif
 
 LIB_SOURCES = \
 	memchr.S memcmp.S memcpy.S memset.S strchr.S \
-	memmove.S strlen.S f_atan2.S f_atan2f.S f_exp.c f_expf.c \
-	f_frexp.S f_frexpf.S f_log.S f_logf.S f_log10.S f_log10f.S \
-	f_ldexp.S f_ldexpf.S f_pow.c f_powf.c f_tan.S f_tanf.S \
-	$(mach_add_src)
+	memmove.S strlen.S $(mach_add_src) i386mach.h
 
 libi386_la_LDFLAGS = -Xcompiler -nostdlib
 
diff --git a/newlib/libc/machine/i386/Makefile.in b/newlib/libc/machine/i386/Makefile.in
index 506e485d8..7866af949 100644
--- a/newlib/libc/machine/i386/Makefile.in
+++ b/newlib/libc/machine/i386/Makefile.in
@@ -91,10 +91,7 @@ INCLUDES = -I $(newlib_basedir)/libm/common $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(T
 
 LIB_SOURCES = \
 	memchr.S memcmp.S memcpy.S memset.S strchr.S \
-	memmove.S strlen.S f_atan2.S f_atan2f.S f_exp.c f_expf.c \
-	f_frexp.S f_frexpf.S f_log.S f_logf.S f_log10.S f_log10f.S \
-	f_ldexp.S f_ldexpf.S f_pow.c f_powf.c f_tan.S f_tanf.S \
-	$(mach_add_src)
+	memmove.S strlen.S $(mach_add_src) i386mach.h
 
 
 libi386_la_LDFLAGS = -Xcompiler -nostdlib
@@ -119,18 +116,12 @@ CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
 lib_a_LIBADD = 
 @USE_LIBTOOL_FALSE@lib_a_OBJECTS =  memchr.o memcmp.o memcpy.o memset.o \
-@USE_LIBTOOL_FALSE@strchr.o memmove.o strlen.o f_atan2.o f_atan2f.o \
-@USE_LIBTOOL_FALSE@f_exp.o f_expf.o f_frexp.o f_frexpf.o f_log.o \
-@USE_LIBTOOL_FALSE@f_logf.o f_log10.o f_log10f.o f_ldexp.o f_ldexpf.o \
-@USE_LIBTOOL_FALSE@f_pow.o f_powf.o f_tan.o f_tanf.o
+@USE_LIBTOOL_FALSE@strchr.o memmove.o strlen.o
 LTLIBRARIES =  $(noinst_LTLIBRARIES)
 
 libi386_la_LIBADD = 
 @USE_LIBTOOL_TRUE@libi386_la_OBJECTS =  memchr.lo memcmp.lo memcpy.lo \
-@USE_LIBTOOL_TRUE@memset.lo strchr.lo memmove.lo strlen.lo f_atan2.lo \
-@USE_LIBTOOL_TRUE@f_atan2f.lo f_exp.lo f_expf.lo f_frexp.lo f_frexpf.lo \
-@USE_LIBTOOL_TRUE@f_log.lo f_logf.lo f_log10.lo f_log10f.lo f_ldexp.lo \
-@USE_LIBTOOL_TRUE@f_ldexpf.lo f_pow.lo f_powf.lo f_tan.lo f_tanf.lo
+@USE_LIBTOOL_TRUE@memset.lo strchr.lo memmove.lo strlen.lo
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/newlib/libm/machine/Makefile.am b/newlib/libm/machine/Makefile.am
index 65b5b40a7..d452c7fb3 100644
--- a/newlib/libm/machine/Makefile.am
+++ b/newlib/libm/machine/Makefile.am
@@ -13,3 +13,5 @@ endif # USE_LIBTOOL
 
 ACLOCAL_AMFLAGS = -I ../..
 CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host
+
+doc:  
diff --git a/newlib/libm/machine/Makefile.in b/newlib/libm/machine/Makefile.in
index ea87ea6dd..82e207f8a 100644
--- a/newlib/libm/machine/Makefile.in
+++ b/newlib/libm/machine/Makefile.in
@@ -418,6 +418,8 @@ clean-generic maintainer-clean-generic clean mostlyclean distclean \
 maintainer-clean
 
 
+doc:  
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/newlib/libm/machine/i386/Makefile.am b/newlib/libm/machine/i386/Makefile.am
index 1544dfaac..901cf5979 100644
--- a/newlib/libm/machine/i386/Makefile.am
+++ b/newlib/libm/machine/i386/Makefile.am
@@ -7,7 +7,7 @@ INCLUDES = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) $(CROSS_C
 LIB_SOURCES = \
 	f_atan2.S f_atan2f.S f_exp.c f_expf.c \
 	f_frexp.S f_frexpf.S f_log.S f_logf.S f_log10.S f_log10f.S \
-	f_ldexp.S f_ldexpf.S f_pow.c f_powf.c f_tan.S f_tanf.S
+	f_ldexp.S f_ldexpf.S f_pow.c f_powf.c f_tan.S f_tanf.S f_math.h i386mach.h
 
 libi386_la_LDFLAGS = -Xcompiler -nostdlib
 
diff --git a/newlib/libm/machine/i386/Makefile.in b/newlib/libm/machine/i386/Makefile.in
index baea74838..7436536eb 100644
--- a/newlib/libm/machine/i386/Makefile.in
+++ b/newlib/libm/machine/i386/Makefile.in
@@ -90,7 +90,7 @@ INCLUDES = -I $(newlib_basedir)/../newlib/libm/common $(NEWLIB_CFLAGS) $(CROSS_C
 LIB_SOURCES = \
 	f_atan2.S f_atan2f.S f_exp.c f_expf.c \
 	f_frexp.S f_frexpf.S f_log.S f_logf.S f_log10.S f_log10f.S \
-	f_ldexp.S f_ldexpf.S f_pow.c f_powf.c f_tan.S f_tanf.S
+	f_ldexp.S f_ldexpf.S f_pow.c f_powf.c f_tan.S f_tanf.S f_math.h i386mach.h
 
 
 libi386_la_LDFLAGS = -Xcompiler -nostdlib
diff --git a/newlib/libm/machine/i386/f_atan2.S b/newlib/libm/machine/i386/f_atan2.S
index 51ac98140..5b44a495e 100644
--- a/newlib/libm/machine/i386/f_atan2.S
+++ b/newlib/libm/machine/i386/f_atan2.S
@@ -8,6 +8,8 @@
  * ====================================================
  */
 
+#if !defined(_SOFT_FLOAT)
+
 /* 
 Fast version of atan2 using Intel float instructions.
 
@@ -31,3 +33,5 @@ SYM (_f_atan2):
 
 	leave
 	ret
+
+#endif
diff --git a/newlib/libm/machine/i386/f_atan2f.S b/newlib/libm/machine/i386/f_atan2f.S
index 092fec4d6..babd7ff9d 100644
--- a/newlib/libm/machine/i386/f_atan2f.S
+++ b/newlib/libm/machine/i386/f_atan2f.S
@@ -8,6 +8,8 @@
  * ====================================================
  */
 
+#if !defined(_SOFT_FLOAT)
+
 /*
 Fast version of atan2f using Intel float instructions.
 
@@ -31,3 +33,5 @@ SYM (_f_atan2f):
 
 	leave
 	ret
+
+#endif
diff --git a/newlib/libm/machine/i386/f_exp.c b/newlib/libm/machine/i386/f_exp.c
index a7fb05507..a348cbe93 100644
--- a/newlib/libm/machine/i386/f_exp.c
+++ b/newlib/libm/machine/i386/f_exp.c
@@ -8,6 +8,8 @@
  * ====================================================
  */
 
+#if !defined(_SOFT_FLOAT)
+
 /*
 Fast version of exp using Intel float instructions.
 
@@ -42,4 +44,4 @@ double _f_exp (double x)
    return x;
 }
 
-
+#endif
diff --git a/newlib/libm/machine/i386/f_expf.c b/newlib/libm/machine/i386/f_expf.c
index 438772764..6b86e8997 100644
--- a/newlib/libm/machine/i386/f_expf.c
+++ b/newlib/libm/machine/i386/f_expf.c
@@ -8,6 +8,8 @@
  * ====================================================
  */
 
+#if !defined(_SOFT_FLOAT)
+
 /*
 Fast version of exp using Intel float instructions.
 
@@ -42,4 +44,4 @@ float _f_expf (float x)
    return x;
 }
 
-
+#endif
diff --git a/newlib/libm/machine/i386/f_frexp.S b/newlib/libm/machine/i386/f_frexp.S
index 58397b79c..0aabb2011 100644
--- a/newlib/libm/machine/i386/f_frexp.S
+++ b/newlib/libm/machine/i386/f_frexp.S
@@ -8,6 +8,8 @@
  * ====================================================
  */
 
+#if !defined(_SOFT_FLOAT)
+
 /*
 Fast version of frexp using Intel float instructions.
 
@@ -42,3 +44,5 @@ SYM (_f_frexp):
 
 	leave
 	ret
+
+#endif
diff --git a/newlib/libm/machine/i386/f_frexpf.S b/newlib/libm/machine/i386/f_frexpf.S
index 13d5a82be..7b373612c 100644
--- a/newlib/libm/machine/i386/f_frexpf.S
+++ b/newlib/libm/machine/i386/f_frexpf.S
@@ -8,6 +8,8 @@
  * ====================================================
  */
 
+#if !defined(_SOFT_FLOAT)
+
 /*
 Fast version of frexpf using Intel float instructions.
 
@@ -42,3 +44,5 @@ SYM (_f_frexpf):
 
 	leave
 	ret
+
+#endif
diff --git a/newlib/libm/machine/i386/f_ldexp.S b/newlib/libm/machine/i386/f_ldexp.S
index af6b05825..86992540a 100644
--- a/newlib/libm/machine/i386/f_ldexp.S
+++ b/newlib/libm/machine/i386/f_ldexp.S
@@ -8,6 +8,8 @@
  * ====================================================
  */
 
+#if !defined(_SOFT_FLOAT)
+
 /*
 Fast version of ldexp using Intel float instructions.
 
@@ -32,3 +34,5 @@ SYM (_f_ldexp):
 
 	leave
 	ret
+
+#endif
diff --git a/newlib/libm/machine/i386/f_ldexpf.S b/newlib/libm/machine/i386/f_ldexpf.S
index cded4cd95..6fcf045a0 100644
--- a/newlib/libm/machine/i386/f_ldexpf.S
+++ b/newlib/libm/machine/i386/f_ldexpf.S
@@ -8,6 +8,8 @@
  * ==================================================== 
  */
 
+#if !defined(_SOFT_FLOAT)
+
 /*
 Fast version of ldexpf using Intel float instructions.
 
@@ -32,3 +34,5 @@ SYM (_f_ldexpf):
 
 	leave
 	ret
+
+#endif
diff --git a/newlib/libm/machine/i386/f_log.S b/newlib/libm/machine/i386/f_log.S
index e0eb7e0b1..79df23eb9 100644
--- a/newlib/libm/machine/i386/f_log.S
+++ b/newlib/libm/machine/i386/f_log.S
@@ -8,6 +8,8 @@
  * ==================================================== 
  */
 
+#if !defined(_SOFT_FLOAT)
+
 /*
 Fast version of log using Intel float instructions.
 
@@ -34,3 +36,5 @@ SYM (_f_log):
 
 	leave
 	ret
+
+#endif
diff --git a/newlib/libm/machine/i386/f_log10.S b/newlib/libm/machine/i386/f_log10.S
index eed997f16..440647e42 100644
--- a/newlib/libm/machine/i386/f_log10.S
+++ b/newlib/libm/machine/i386/f_log10.S
@@ -8,6 +8,8 @@
  * ==================================================== 
  */
 
+#if !defined(_SOFT_FLOAT)
+
 /*
 Fast version of log10 using Intel float instructions.
 
@@ -34,3 +36,5 @@ SYM (_f_log10):
 
 	leave
 	ret
+
+#endif
diff --git a/newlib/libm/machine/i386/f_log10f.S b/newlib/libm/machine/i386/f_log10f.S
index 5f781e309..32a8e76cb 100644
--- a/newlib/libm/machine/i386/f_log10f.S
+++ b/newlib/libm/machine/i386/f_log10f.S
@@ -8,6 +8,8 @@
  * ==================================================== 
  */
 
+#if !defined(_SOFT_FLOAT)
+
 /*
 Fast version of logf using Intel float instructions.
 
@@ -34,3 +36,5 @@ SYM (_f_log10f):
 
 	leave
 	ret
+
+#endif
diff --git a/newlib/libm/machine/i386/f_logf.S b/newlib/libm/machine/i386/f_logf.S
index 3620c05c4..614ca3a79 100644
--- a/newlib/libm/machine/i386/f_logf.S
+++ b/newlib/libm/machine/i386/f_logf.S
@@ -8,6 +8,8 @@
  * ==================================================== 
  */
 
+#if !defined(_SOFT_FLOAT)
+
 /*
 Fast version of logf using Intel float instructions.
 
@@ -34,3 +36,5 @@ SYM (_f_logf):
 
 	leave
 	ret
+
+#endif
diff --git a/newlib/libm/machine/i386/f_pow.c b/newlib/libm/machine/i386/f_pow.c
index ac7dcfe26..fca40c76f 100644
--- a/newlib/libm/machine/i386/f_pow.c
+++ b/newlib/libm/machine/i386/f_pow.c
@@ -8,6 +8,8 @@
  * ====================================================
  */
 
+#if !defined(_SOFT_FLOAT)
+
 /*
 Fast version of pow using Intel float instructions.
 
@@ -42,3 +44,4 @@ double _f_pow (double x, double y)
     return pow (x,y);
 }
 
+#endif
diff --git a/newlib/libm/machine/i386/f_powf.c b/newlib/libm/machine/i386/f_powf.c
index 501b6b1f3..2daa5b038 100644
--- a/newlib/libm/machine/i386/f_powf.c
+++ b/newlib/libm/machine/i386/f_powf.c
@@ -8,6 +8,8 @@
  * ====================================================
  */
 
+#if !defined(_SOFT_FLOAT)
+
 /*
 Fast version of pow using Intel float instructions.
 
@@ -42,3 +44,4 @@ float _f_powf (float x, float y)
     return powf (x,y);
 }
 
+#endif
diff --git a/newlib/libm/machine/i386/f_tan.S b/newlib/libm/machine/i386/f_tan.S
index ae0431f4a..7b13c4edf 100644
--- a/newlib/libm/machine/i386/f_tan.S
+++ b/newlib/libm/machine/i386/f_tan.S
@@ -8,6 +8,8 @@
  * ==================================================== 
  */             
 
+#if !defined(_SOFT_FLOAT)
+
 /*
 Fast version of tan using Intel float instructions.
 
@@ -31,3 +33,5 @@ SYM (_f_tan):
 
 	leave
 	ret
+
+#endif
diff --git a/newlib/libm/machine/i386/f_tanf.S b/newlib/libm/machine/i386/f_tanf.S
index 23ba7376a..3d0b903c7 100644
--- a/newlib/libm/machine/i386/f_tanf.S
+++ b/newlib/libm/machine/i386/f_tanf.S
@@ -8,6 +8,8 @@
  * ====================================================
  */                     
 
+#if !defined(_SOFT_FLOAT)
+
 /*
 Fast version of tanf using Intel float instructions.
 
@@ -31,3 +33,5 @@ SYM (_f_tanf):
 
 	leave
 	ret
+
+#endif