am ad2cfe2f: Merge "Fix x86_64 build"

* commit 'ad2cfe2f231506aed955f7e168a25fe1a1040f9a':
  Fix x86_64 build

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 */

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