diff --git a/libs/libc/math/lib_log.c b/libs/libc/math/lib_log.c
index 638ed62b0a..24edee3afb 100644
--- a/libs/libc/math/lib_log.c
+++ b/libs/libc/math/lib_log.c
@@ -39,13 +39,15 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* To avoid looping forever in particular corner cases, every LOGF_MAX_ITER
- * the error criteria is relaxed by a factor LOGF_RELAX_MULTIPLIER.
+#define DBL_MAX_EXP_X   700.0
+
+/* To avoid looping forever in particular corner cases, every LOG_MAX_ITER
+ * the error criteria is relaxed by a factor LOG_RELAX_MULTIPLIER.
  * todo: might need to adjust the double floating point version too.
  */
 
-#define LOGF_MAX_ITER         10
-#define LOGF_RELAX_MULTIPLIER 2
+#define LOG_MAX_ITER         10
+#define LOG_RELAX_MULTIPLIER 2.0
 
 /****************************************************************************
  * Public Functions
@@ -62,7 +64,7 @@ double log(double x)
   double y_old;
   double ey;
   double epsilon;
-  int    relax_factor;
+  double relax_factor;
   int    iter;
 
   y = 0.0;
@@ -70,7 +72,7 @@ double log(double x)
   epsilon = DBL_EPSILON;
 
   iter         = 0;
-  relax_factor = 1;
+  relax_factor = 1.0;
 
   while (y > y_old + epsilon || y < y_old - epsilon)
     {
@@ -78,36 +80,36 @@ double log(double x)
       ey    = exp(y);
       y    -= (ey - x) / ey;
 
-      if (y > 700.0)
+      if (y > DBL_MAX_EXP_X)
         {
-          y = 700.0;
+          y = DBL_MAX_EXP_X;
         }
 
-      if (y < -700.0)
+      if (y < -DBL_MAX_EXP_X)
         {
-          y = -700.0;
+          y = -DBL_MAX_EXP_X;
         }
 
       epsilon = (fabs(y) > 1.0) ? fabs(y) * DBL_EPSILON : DBL_EPSILON;
 
-      if (++iter >= LOGF_MAX_ITER)
+      if (++iter >= LOG_MAX_ITER)
         {
-          relax_factor *= LOGF_RELAX_MULTIPLIER;
+          relax_factor *= LOG_RELAX_MULTIPLIER;
           iter = 0;
         }
 
-      if (relax_factor > 1)
+      if (relax_factor > 1.0)
         {
           epsilon *= relax_factor;
         }
     }
 
-  if (y == 700.0)
+  if (y == DBL_MAX_EXP_X)
     {
       return INFINITY;
     }
 
-  if (y == -700.0)
+  if (y == -DBL_MAX_EXP_X)
     {
       return INFINITY;
     }
diff --git a/libs/libc/math/lib_logf.c b/libs/libc/math/lib_logf.c
index b53805da84..efaac61b4b 100644
--- a/libs/libc/math/lib_logf.c
+++ b/libs/libc/math/lib_logf.c
@@ -44,7 +44,7 @@
  */
 
 #define LOGF_MAX_ITER         10
-#define LOGF_RELAX_MULTIPLIER 2
+#define LOGF_RELAX_MULTIPLIER 2.0F
 
 /****************************************************************************
  * Public Functions
@@ -60,7 +60,7 @@ float logf(float x)
   float y_old;
   float ey;
   float epsilon;
-  int   relax_factor;
+  float relax_factor;
   int   iter;
 
   y       = 0.0F;
@@ -68,7 +68,7 @@ float logf(float x)
   epsilon = FLT_EPSILON;
 
   iter         = 0;
-  relax_factor = 1;
+  relax_factor = 1.0F;
 
   while (y > y_old + epsilon || y < y_old - epsilon)
     {
@@ -94,7 +94,7 @@ float logf(float x)
           iter = 0;
         }
 
-      if (relax_factor > 1)
+      if (relax_factor > 1.0F)
         {
           epsilon *= relax_factor;
         }
diff --git a/libs/libc/math/lib_logl.c b/libs/libc/math/lib_logl.c
index 2bab0b261a..0250a2a77c 100644
--- a/libs/libc/math/lib_logl.c
+++ b/libs/libc/math/lib_logl.c
@@ -35,6 +35,12 @@
 #include <math.h>
 #include <float.h>
 
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define LDBL_MAX_EXP_X  700.0
+
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -47,8 +53,8 @@ long double logl(long double x)
   long double ey;
   long double epsilon;
 
-  y       = 0.0;
-  y_old   = 1.0;
+  y = 0.0;
+  y_old = 1.0;
   epsilon = LDBL_EPSILON;
 
   while (y > y_old + epsilon || y < y_old - epsilon)
@@ -57,23 +63,25 @@ long double logl(long double x)
       ey    = expl(y);
       y    -= (ey - x) / ey;
 
-      if (y > 700.0)
+      if (y > LDBL_MAX_EXP_X)
         {
-          y = 700.0;
+          y = LDBL_MAX_EXP_X;
         }
 
-      if (y < -700.0)
+      if (y < -LDBL_MAX_EXP_X)
         {
-          y = -700.0;
+          y = -LDBL_MAX_EXP_X;
         }
+
+      epsilon = (fabsl(y) > 1.0) ? fabsl(y) * LDBL_EPSILON : LDBL_EPSILON;
     }
 
-  if (y == 700.0)
+  if (y == LDBL_MAX_EXP_X)
     {
       return INFINITY;
     }
 
-  if (y == -700.0)
+  if (y == -LDBL_MAX_EXP_X)
     {
       return INFINITY;
     }