diff --git a/lib/msun/src/s_fmaximum_num.c b/lib/msun/src/s_fmaximum_num.c
index c7cfcd26fd7..4d7c860d2ce 100644
--- a/lib/msun/src/s_fmaximum_num.c
+++ b/lib/msun/src/s_fmaximum_num.c
@@ -53,12 +53,18 @@ fmaximum_num(double x, double y)
 	nan_y = isnan(y);
 
 	if (nan_x || nan_y) {
-		/* These ternary conditionals force (x+y), so that sNaN's raise exceptions */
+		/* If both are NaN, adding returns qNaN */
 		if (nan_x && nan_y)
-			return (x + y);
+		    return (x + y);
+
+		/* force_except makes sure sNaN's raise exceptions */
+		volatile double force_except = x + y;
+		force_except;
+
 		if (nan_x)
-			return ((x + y) != 0.0 ? y : y);
-		return ((x + y) != 0.0 ? x : x);
+			return (y);
+		else
+			return (x);
 	}
 
 	/* Handle comparisons of signed zeroes. */
diff --git a/lib/msun/src/s_fmaximum_numf.c b/lib/msun/src/s_fmaximum_numf.c
index 60a7ccae343..b41f293a428 100644
--- a/lib/msun/src/s_fmaximum_numf.c
+++ b/lib/msun/src/s_fmaximum_numf.c
@@ -52,12 +52,18 @@ fmaximum_numf(float x, float y)
 	nan_y = isnan(y);
 
 	if (nan_x || nan_y) {
-		/* These ternary conditionals force (x+y), so that sNaN's raise exceptions */
+		/* If both are NaN, adding returns qNaN */
 		if (nan_x && nan_y)
-			return (x + y);
+		    return (x + y);
+
+		/* force_except makes sure sNaN's raise exceptions */
+		volatile float force_except = x + y;
+		force_except;
+
 		if (nan_x)
-			return ((x + y) != 0.0 ? y : y);
-		return ((x + y) != 0.0 ? x : x);
+			return (y);
+		else
+			return (x);
 	}
 
 	/* Handle comparisons of signed zeroes. */
diff --git a/lib/msun/src/s_fmaximum_numl.c b/lib/msun/src/s_fmaximum_numl.c
index a2a5383ab85..74a3d9ba221 100644
--- a/lib/msun/src/s_fmaximum_numl.c
+++ b/lib/msun/src/s_fmaximum_numl.c
@@ -47,12 +47,18 @@ fmaximum_numl(long double x, long double y)
 	nan_y = isnan(y);
 
 	if (nan_x || nan_y) {
-		/* These ternary conditionals force (x+y), so that sNaN's raise exceptions */
+		/* If both are NaN, adding returns qNaN */
 		if (nan_x && nan_y)
-			return (x + y);
+		    return (x + y);
+
+		/* force_except makes sure sNaN's raise exceptions */
+		volatile long double force_except = x + y;
+		force_except;
+
 		if (nan_x)
-			return ((x + y) != 0.0 ? y : y);
-		return ((x + y) != 0.0 ? x : x);
+			return (y);
+		else
+			return (x);
 	}
 
 	/* Handle comparisons of signed zeroes. */
diff --git a/lib/msun/src/s_fminimum_num.c b/lib/msun/src/s_fminimum_num.c
index a5fd657955c..67999c366a7 100644
--- a/lib/msun/src/s_fminimum_num.c
+++ b/lib/msun/src/s_fminimum_num.c
@@ -53,12 +53,18 @@ fminimum_num(double x, double y)
 	nan_y = isnan(y);
 
 	if (nan_x || nan_y) {
-		/* These ternary conditionals force (x+y), so that sNaN's raise exceptions */
+		/* If both are NaN, adding returns qNaN */
 		if (nan_x && nan_y)
-			return (x + y);
+		    return (x + y);
+
+		/* force_except makes sure sNaN's raise exceptions */
+		volatile double force_except = x + y;
+		force_except;
+
 		if (nan_x)
-			return ((x + y) != 0.0 ? y : y);
-		return ((x + y) != 0.0 ? x : x);
+			return (y);
+		else
+			return (x);
 	}
 
 	/* Handle comparisons of signed zeroes. */
diff --git a/lib/msun/src/s_fminimum_numf.c b/lib/msun/src/s_fminimum_numf.c
index d5e8f0812bd..c4b686be158 100644
--- a/lib/msun/src/s_fminimum_numf.c
+++ b/lib/msun/src/s_fminimum_numf.c
@@ -52,12 +52,18 @@ fminimum_numf(float x, float y)
 	nan_y = isnan(y);
 
 	if (nan_x || nan_y) {
-		/* These ternary conditionals force (x+y), so that sNaN's raise exceptions */
+		/* If both are NaN, adding returns qNaN */
 		if (nan_x && nan_y)
-			return (x + y);
+		    return (x + y);
+
+		/* force_except makes sure sNaN's raise exceptions */
+		volatile float force_except = x + y;
+		force_except;
+
 		if (nan_x)
-			return ((x + y) != 0.0 ? y : y);
-		return ((x + y) != 0.0 ? x : x);
+			return (y);
+		else
+			return (x);
 	}
 
 	/* Handle comparisons of signed zeroes. */
diff --git a/lib/msun/src/s_fminimum_numl.c b/lib/msun/src/s_fminimum_numl.c
index dc088400249..b30fbc721b6 100644
--- a/lib/msun/src/s_fminimum_numl.c
+++ b/lib/msun/src/s_fminimum_numl.c
@@ -47,12 +47,18 @@ fminimum_numl(long double x, long double y)
 	nan_y = isnan(y);
 
 	if (nan_x || nan_y) {
-		/* These ternary conditionals force (x+y), so that sNaN's raise exceptions */
+		/* If both are NaN, adding returns qNaN */
 		if (nan_x && nan_y)
-			return (x + y);
+		    return (x + y);
+
+		/* force_except makes sure sNaN's raise exceptions */
+		volatile long double force_except = x + y;
+		force_except;
+
 		if (nan_x)
-			return ((x + y) != 0.0 ? y : y);
-		return ((x + y) != 0.0 ? x : x);
+			return (y);
+		else
+			return (x);
 	}
 
 	/* Handle comparisons of signed zeroes. */