Merge commit 'origin/master' into nptl

Signed-off-by: Austin Foxley <austinf@cetoncorp.com>

2 files changed, 8 insertions, 2 deletions

diff --git a/test/inet/gethostid.c b/test/inet/gethostid.c
new file mode 100644
index 000000000..295166536
--- /dev/null
+++ b/test/inet/gethostid.c
@@ -0,0 +1,6 @@
+#include <unistd.h>
+#include <stdio.h>
+int main(void) {
+	printf("hostid=%d\n", gethostid());
+	return 0;
+}
diff --git a/test/math/compile_test.c b/test/math/compile_test.c
index 61488857a..ab8c40c48 100644
--- a/test/math/compile_test.c
+++ b/test/math/compile_test.c
@@ -18,7 +18,7 @@ r += cosf(float_x);
 r += coshf(float_x);
 r += erfcf(float_x);
 r += erff(float_x);
-/*r += exp2f(float_x); - uclibc does not have it (yet?) */
+r += exp2f(float_x);
 r += expf(float_x);
 r += expm1f(float_x);
 r += fabsf(float_x);
@@ -38,7 +38,7 @@ r += llrintf(float_x);
 r += llroundf(float_x);
 r += log10f(float_x);
 r += log1pf(float_x);
-/*r += log2f(float_x); - uclibc does not have it (yet?) */
+r += log2f(float_x);
 r += logbf(float_x);
 r += logf(float_x);
 r += lrintf(float_x);