X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fmath%2Fnextafterl.c;h=58737ee2d2d4eb52dd110eea1c77cddb89c4c046;hb=713aa1df9c8a3b2a5515c862a06bdab47e20dcf2;hp=cbdf2873f57c856a5e0180c34070140b9dd4b117;hpb=457b0dbfc1d72080f6ba9fe47cd712e0f090732a;p=libc-test

diff --git a/src/math/nextafterl.c b/src/math/nextafterl.c
index cbdf287..58737ee 100644
--- a/src/math/nextafterl.c
+++ b/src/math/nextafterl.c
@@ -4,14 +4,17 @@
 
 static struct ll_l t[] = {
 #if LDBL_MANT_DIG == 53
+#include "sanity/nextafter.h"
 
 #elif LDBL_MANT_DIG == 64
+#include "sanity/nextafterl.h"
 
 #endif
 };
 
 int main(void)
 {
+	#pragma STDC FENV_ACCESS ON
 	long double y;
 	float d;
 	int e, i, err = 0;
@@ -19,9 +22,14 @@ int main(void)
 
 	for (i = 0; i < sizeof t/sizeof *t; i++) {
 		p = t + i;
-		setupfenv(p->r);
+
+		if (p->r < 0)
+			continue;
+		fesetround(p->r);
+		feclearexcept(FE_ALL_EXCEPT);
 		y = nextafterl(p->x, p->x2);
-		e = getexcept();
+		e = fetestexcept(INEXACT|INVALID|DIVBYZERO|UNDERFLOW|OVERFLOW);
+
 		if (!checkexcept(e, p->e, p->r)) {
 			printf("%s:%d: bad fp exception: %s nextafterl(%La,%La)=%La, want %s",
 				p->file, p->line, rstr(p->r), p->x, p->x2, p->y, estr(p->e));
@@ -29,7 +37,7 @@ int main(void)
 			err++;
 		}
 		d = ulperrl(y, p->y, p->dy);
-		if (!checkulp(d, p->r)) {
+		if (!checkcr(y, p->y, p->r)) {
 			printf("%s:%d: %s nextafterl(%La,%La) want %La got %La ulperr %.3f = %a + %a\n",
 				p->file, p->line, rstr(p->r), p->x, p->x2, p->y, y, d, d-p->dy, p->dy);
 			err++;