Merge commit 'origin/master' into prelink

Conflicts:

	ldso/include/dl-hash.h

Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>

1 files changed, 28 insertions, 6 deletions

diff --git a/test/math/rint.c b/test/math/rint.c
index 04c195385..b595459a3 100644
--- a/test/math/rint.c
+++ b/test/math/rint.c
@@ -1,11 +1,33 @@
 #include <math.h>
+#include <float.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <stdio.h>
 
-int main(void) {
-    double d1, d2;
-    d1 = 0.6;  d2 = rint(d1);
-    printf("d1 = %f, d2 = %f\n", d1, d2);
-    return 0;
-}
+#define check_d1(func, param, expected) \
+do { \
+	int err; hex_union ur; hex_union up; \
+	double result = func(param); up.f = param; ur.f = result; \
+	errors += (err = (result != (expected))); \
+	err \
+	? printf("FAIL: %s(%g/"HEXFMT")=%g/"HEXFMT" (expected %g)\n", \
+		#func, (double)(param), (long long)up.hex, result, (long long)ur.hex, (double)(expected)) \
+	: printf("PASS: %s(%g)=%g\n", #func, (double)(param), result); \
+} while (0)
+
+#define HEXFMT "%08llx"
+typedef union {
+	double f;
+	uint64_t hex;
+} hex_union;
+double result;
+
+int errors = 0;
 
+int main(void)
+{
+	check_d1(rint, 0.6, 1.0);
+
+	printf("Errors: %d\n", errors);
+	return errors;
+}