diff --git a/src/math/log2l.c b/src/math/log2l.c
index 76a7aacd9d6e46a0f8f8ffbf8eb9fc51b6373d46..345b395daf6eafd340122c0c35b96ca6f6c4ee5b 100644
--- a/src/math/log2l.c
+++ b/src/math/log2l.c
@@ -108,8 +108,7 @@ static const long double S[4] = {
 
 long double log2l(long double x)
 {
-	long double z;
-	long double y;
+	long double y, z;
 	int e;
 
 	if (isnan(x))
diff --git a/src/math/logl.c b/src/math/logl.c
index ffd8103813eade25cc51b70944b93d78a49b8cf8..ef2b55156ad57f18f1b9223054440ea4e1569d5f 100644
--- a/src/math/logl.c
+++ b/src/math/logl.c
@@ -50,11 +50,6 @@
  * In the tests over the interval exp(+-10000), the logarithms
  * of the random arguments were uniformly distributed over
  * [-10000, +10000].
- *
- * ERROR MESSAGES:
- *
- * log singularity:  x = 0; returns -INFINITY
- * log domain:       x < 0; returns NAN
  */
 
 #include "libm.h"
@@ -121,8 +116,8 @@ long double logl(long double x)
 		return x;
 	if (x <= 0.0) {
 		if (x == 0.0)
-			return -INFINITY;
-		return NAN;
+			return -1/(x+0); /* -inf with divbyzero */
+		return 0/0.0f; /* nan with invalid */
 	}
 
 	/* separate mantissa from exponent */