diff --git a/libm/amd64/fenv.c b/libm/amd64/fenv.c
index b2c017be8..b058de29c 100755
--- a/libm/amd64/fenv.c
+++ b/libm/amd64/fenv.c
@@ -42,7 +42,7 @@
  * x87 fpu registers are 16bit wide. The upper bits, 31-16, are marked as
  * RESERVED.
  */
-fenv_t __fe_dfl_env = {
+const fenv_t __fe_dfl_env = {
   {
     0xffff0000 | __INITIAL_NPXCW__, /* Control word register */
     0xffff0000,                     /* Status word register */
diff --git a/libm/include/amd64/machine/fenv.h b/libm/include/amd64/machine/fenv.h
index f22a931f5..79a4120d9 100644
--- a/libm/include/amd64/machine/fenv.h
+++ b/libm/include/amd64/machine/fenv.h
@@ -97,7 +97,7 @@ typedef struct {
  * A floating-point control mode is a system variable whose value may be set by
  * the user to affect the subsequent behavior of floating-point arithmetic.
  */
-typedef __uint_32 fexcept_t;
+typedef __uint32_t fexcept_t;
 
 __END_DECLS