diff --git a/ChangeLog b/ChangeLog
index b9d30100d9..cd886956ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2017-06-22  Joseph Myers  <joseph@codesourcery.com>
 
+	* sysdeps/generic/math_private.h (__EXPR_FLT128): Do not apply
+	typeof to argument passed to __builtin_types_compatible_p.
+	(min_of_type): Pass type argument, not x, to __EXPR_FLT128.
+
 	* math/w_acos_template.c [__USE_WRAPPER_TEMPLATE]: Include
 	<errno.h>.
 	* math/w_acosh_template.c [__USE_WRAPPER_TEMPLATE]: Likewise.
diff --git a/sysdeps/generic/math_private.h b/sysdeps/generic/math_private.h
index 6ea5e25e5a..1418bbda27 100644
--- a/sysdeps/generic/math_private.h
+++ b/sysdeps/generic/math_private.h
@@ -304,7 +304,7 @@ extern void __docos (double __x, double __dx, double __v[]);
 #if __HAVE_DISTINCT_FLOAT128
 # define __EXPR_FLT128(x, yes, no)				\
   __builtin_choose_expr (__builtin_types_compatible_p		\
-			 (__typeof (x), long double), no, yes)
+			 (x, long double), no, yes)
 #else
 # define __EXPR_FLT128(x, yes, no) no
 #endif
@@ -318,7 +318,7 @@ extern void __docos (double __x, double __dx, double __v[]);
    __builtin_choose_expr				\
    (__builtin_types_compatible_p (type, double),	\
     DBL_MIN,						\
-    __EXPR_FLT128 (x, FLT128_MIN, LDBL_MIN)))
+    __EXPR_FLT128 (type, FLT128_MIN, LDBL_MIN)))
 
 /* If X (which is not a NaN) is subnormal, force an underflow
    exception.  */