From f2b7f92d71c5045803612e07b3812798d73a4012 Mon Sep 17 00:00:00 2001
From: Jacob Young <jacobly0@users.noreply.github.com>
Date: Tue, 12 Sep 2017 03:56:25 -0400
Subject: [PATCH] Merge in upstream openbsd commit yu8HfTXRTrrv8b2W which
 allows isnanf, isnand, isinff, and isinfd to be deleted.

---
 liba/Makefile                        | 4 ----
 liba/src/external/openbsd/s_roundf.c | 2 +-
 liba/src/isinfd.c                    | 6 ------
 liba/src/isinff.c                    | 6 ------
 liba/src/isnand.c                    | 6 ------
 liba/src/isnanf.c                    | 6 ------
 6 files changed, 1 insertion(+), 29 deletions(-)
 delete mode 100644 liba/src/isinfd.c
 delete mode 100644 liba/src/isinff.c
 delete mode 100644 liba/src/isnand.c
 delete mode 100644 liba/src/isnanf.c

diff --git a/liba/Makefile b/liba/Makefile
index 65866a7f3..36778c01b 100644
--- a/liba/Makefile
+++ b/liba/Makefile
@@ -12,10 +12,6 @@ objs += $(addprefix liba/src/, \
   fpclassify.o \
   fpclassifyf.o \
   ieee754.o \
-  isnand.o \
-  isnanf.o \
-  isinfd.o \
-  isinff.o \
   malloc.o \
   memcmp.o \
   memcpy.o \
diff --git a/liba/src/external/openbsd/s_roundf.c b/liba/src/external/openbsd/s_roundf.c
index f56d21878..83bf3a9b8 100644
--- a/liba/src/external/openbsd/s_roundf.c
+++ b/liba/src/external/openbsd/s_roundf.c
@@ -34,7 +34,7 @@ roundf(float x)
 {
 	float t;
 
-	if (isinff(x) || isnanf(x))
+	if (isinf(x) || isnan(x))
 		return (x);
 
 	if (x >= 0.0) {
diff --git a/liba/src/isinfd.c b/liba/src/isinfd.c
deleted file mode 100644
index 67907bbbf..000000000
--- a/liba/src/isinfd.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <math.h>
-#include <private/ieee754.h>
-
-int isinfd(double x) {
-  return (ieee754exp64(x) == 0x7FF && ieee754man64(x) == 0);
-}
diff --git a/liba/src/isinff.c b/liba/src/isinff.c
deleted file mode 100644
index 07ffae6cf..000000000
--- a/liba/src/isinff.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <math.h>
-#include <private/ieee754.h>
-
-int isinff(float x) {
-  return (ieee754exp32(x) == 0xFF && ieee754man32(x) == 0);
-}
diff --git a/liba/src/isnand.c b/liba/src/isnand.c
deleted file mode 100644
index 22e3518e8..000000000
--- a/liba/src/isnand.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <math.h>
-#include <private/ieee754.h>
-
-int isnand(double x) {
-  return (ieee754exp64(x) == 0x7FF && ieee754man64(x) != 0);
-}
diff --git a/liba/src/isnanf.c b/liba/src/isnanf.c
deleted file mode 100644
index f524ae486..000000000
--- a/liba/src/isnanf.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <math.h>
-#include <private/ieee754.h>
-
-int isnanf(float x) {
-  return (ieee754exp32(x) == 0xFF && ieee754man32(x) != 0);
-}