5 files changed, 16 insertions, 0 deletions
diff --git a/sysdeps/generic/math-type-macros-double.h b/sysdeps/generic/math-type-macros-double.h
index 1e84d3f..f03aea1 100644
--- a/sysdeps/generic/math-type-macros-double.h
+++ b/sysdeps/generic/math-type-macros-double.h
@@ -28,6 +28,8 @@
 #define M_STRTO_NAN __strtod_nan
 #define M_USE_BUILTIN(c) USE_ ##c ##_BUILTIN
 
+#define M_SET_RESTORE_ROUND(RM) SET_RESTORE_ROUND (RM)
+
 #include <libm-alias-double.h>
 #include <math-nan-payload-double.h>
 
diff --git a/sysdeps/generic/math-type-macros-float.h b/sysdeps/generic/math-type-macros-float.h
index 4aac524..445535a 100644
--- a/sysdeps/generic/math-type-macros-float.h
+++ b/sysdeps/generic/math-type-macros-float.h
@@ -30,6 +30,8 @@
 /* GNU extension float constant macros.  */
 #define M_MLIT(c) c ## f
 
+#define M_SET_RESTORE_ROUND(RM) SET_RESTORE_ROUNDF (RM)
+
 #include <libm-alias-float.h>
 #include <math-nan-payload-float.h>
 
diff --git a/sysdeps/generic/math-type-macros-float128.h b/sysdeps/generic/math-type-macros-float128.h
index ad2310b..f64c1d3 100644
--- a/sysdeps/generic/math-type-macros-float128.h
+++ b/sysdeps/generic/math-type-macros-float128.h
@@ -19,6 +19,8 @@
 #ifndef _MATH_TYPE_MACROS_FLOAT128
 #define _MATH_TYPE_MACROS_FLOAT128
 
+#include <fenv_private.h>
+
 #define M_LIT(c) __f128 (c)
 #define M_PFX FLT128
 #define M_SUF(c) c ## f128
@@ -30,6 +32,13 @@
 
 #define M_MLIT(c) c ## f128
 
+/* fenv_private.h may not define SET_RESTORE_ROUNDF128.  */
+#ifdef SET_RESTORE_ROUNDF128
+# define M_SET_RESTORE_ROUND(RM) SET_RESTORE_ROUNDF128 (RM)
+#else
+# define M_SET_RESTORE_ROUND(RM) SET_RESTORE_ROUNDL (RM)
+#endif
+
 #include <libm-alias-float128.h>
 #include <math-nan-payload-float128.h>
 
diff --git a/sysdeps/generic/math-type-macros-ldouble.h b/sysdeps/generic/math-type-macros-ldouble.h
index 931d5ec..00309cb 100644
--- a/sysdeps/generic/math-type-macros-ldouble.h
+++ b/sysdeps/generic/math-type-macros-ldouble.h
@@ -28,6 +28,8 @@
 #define M_STRTO_NAN __strtold_nan
 #define M_USE_BUILTIN(c) USE_ ##c ##L_BUILTIN
 
+#define M_SET_RESTORE_ROUND(RM) SET_RESTORE_ROUNDL (RM)
+
 #include <libm-alias-ldouble.h>
 #include <math-nan-payload-ldouble.h>
 
diff --git a/sysdeps/generic/math-type-macros.h b/sysdeps/generic/math-type-macros.h
index e3224a0..21c5fee 100644
--- a/sysdeps/generic/math-type-macros.h
+++ b/sysdeps/generic/math-type-macros.h
@@ -33,6 +33,7 @@
    M_STRTO_NAN - Resolves to the internal libc function which
 		converts a string into the appropriate FLOAT nan
 		value.
+   M_SET_RESTORE_ROUND - Resolves to a SET_RESTORE_ROUND call for M_TYPE.
 
   declare_mgen_alias(from,to)
       This exposes the appropriate symbol(s) for a