diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index e136405bf..c92ac3dbc 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,20 @@
+2001-08-29  Joel Sherrill <joel@OARcorp.com>
+
+	* libc/include/sys/unistd.h: Prototype chroot() for RTEMS.
+
+2001-08-29  Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* libc/machine/i386/f_atan2.S, libc/machine/i386/f_atan2f.S,
+	  libc/machine/i386/f_exp.c, libc/machine/i386/f_expf.c,
+	  libc/machine/i386/f_frexp.S, libc/machine/i386/f_frexpf.S,
+	  libc/machine/i386/f_ldexp.S, libc/machine/i386/f_ldexpf.S,
+	  libc/machine/i386/f_log.S, libc/machine/i386/f_log10.S,
+	  libc/machine/i386/f_log10f.S, libc/machine/i386/f_logf.S,
+	  libc/machine/i386/f_pow.c, libc/machine/i386/f_powf.c,
+	  libc/machine/i386/f_tan.S, libc/machine/i386/f_tanf.S:
+	Add conditional compilation to avoid HW FPU instructions
+	when compiled for soft-float.
+
 2001-08-29  Jeff Johnston  <jjohnstn@redhat.com>
 
 	* Makefile.am: Add check for ln failing when creating libg.a
diff --git a/newlib/libc/include/sys/unistd.h b/newlib/libc/include/sys/unistd.h
index efd8ebb7b..0d4af5c1e 100644
--- a/newlib/libc/include/sys/unistd.h
+++ b/newlib/libc/include/sys/unistd.h
@@ -21,7 +21,7 @@ unsigned  _EXFUN(alarm, (unsigned __secs ));
 int     _EXFUN(chdir, (const char *__path ));
 int     _EXFUN(chmod, (const char *__path, mode_t __mode ));
 int     _EXFUN(chown, (const char *__path, uid_t __owner, gid_t __group ));
-#ifdef __CYGWIN__
+#if defined(__CYGWIN__) || defined(__rtems__)
 int     _EXFUN(chroot, (const char *__path ));
 #endif
 int     _EXFUN(close, (int __fildes ));
diff --git a/newlib/libc/machine/i386/f_atan2.S b/newlib/libc/machine/i386/f_atan2.S
index 51ac98140..5b44a495e 100644
--- a/newlib/libc/machine/i386/f_atan2.S
+++ b/newlib/libc/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/libc/machine/i386/f_atan2f.S b/newlib/libc/machine/i386/f_atan2f.S
index 092fec4d6..babd7ff9d 100644
--- a/newlib/libc/machine/i386/f_atan2f.S
+++ b/newlib/libc/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/libc/machine/i386/f_exp.c b/newlib/libc/machine/i386/f_exp.c
index a7fb05507..a348cbe93 100644
--- a/newlib/libc/machine/i386/f_exp.c
+++ b/newlib/libc/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/libc/machine/i386/f_expf.c b/newlib/libc/machine/i386/f_expf.c
index 438772764..6b86e8997 100644
--- a/newlib/libc/machine/i386/f_expf.c
+++ b/newlib/libc/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/libc/machine/i386/f_frexp.S b/newlib/libc/machine/i386/f_frexp.S
index 58397b79c..0aabb2011 100644
--- a/newlib/libc/machine/i386/f_frexp.S
+++ b/newlib/libc/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/libc/machine/i386/f_frexpf.S b/newlib/libc/machine/i386/f_frexpf.S
index 13d5a82be..7b373612c 100644
--- a/newlib/libc/machine/i386/f_frexpf.S
+++ b/newlib/libc/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/libc/machine/i386/f_ldexp.S b/newlib/libc/machine/i386/f_ldexp.S
index af6b05825..86992540a 100644
--- a/newlib/libc/machine/i386/f_ldexp.S
+++ b/newlib/libc/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/libc/machine/i386/f_ldexpf.S b/newlib/libc/machine/i386/f_ldexpf.S
index cded4cd95..6fcf045a0 100644
--- a/newlib/libc/machine/i386/f_ldexpf.S
+++ b/newlib/libc/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/libc/machine/i386/f_log.S b/newlib/libc/machine/i386/f_log.S
index e0eb7e0b1..79df23eb9 100644
--- a/newlib/libc/machine/i386/f_log.S
+++ b/newlib/libc/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/libc/machine/i386/f_log10.S b/newlib/libc/machine/i386/f_log10.S
index eed997f16..440647e42 100644
--- a/newlib/libc/machine/i386/f_log10.S
+++ b/newlib/libc/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/libc/machine/i386/f_log10f.S b/newlib/libc/machine/i386/f_log10f.S
index 5f781e309..32a8e76cb 100644
--- a/newlib/libc/machine/i386/f_log10f.S
+++ b/newlib/libc/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/libc/machine/i386/f_logf.S b/newlib/libc/machine/i386/f_logf.S
index 3620c05c4..614ca3a79 100644
--- a/newlib/libc/machine/i386/f_logf.S
+++ b/newlib/libc/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/libc/machine/i386/f_pow.c b/newlib/libc/machine/i386/f_pow.c
index ac7dcfe26..fca40c76f 100644
--- a/newlib/libc/machine/i386/f_pow.c
+++ b/newlib/libc/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/libc/machine/i386/f_powf.c b/newlib/libc/machine/i386/f_powf.c
index 501b6b1f3..2daa5b038 100644
--- a/newlib/libc/machine/i386/f_powf.c
+++ b/newlib/libc/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/libc/machine/i386/f_tan.S b/newlib/libc/machine/i386/f_tan.S
index ae0431f4a..7b13c4edf 100644
--- a/newlib/libc/machine/i386/f_tan.S
+++ b/newlib/libc/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/libc/machine/i386/f_tanf.S b/newlib/libc/machine/i386/f_tanf.S
index 23ba7376a..3d0b903c7 100644
--- a/newlib/libc/machine/i386/f_tanf.S
+++ b/newlib/libc/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