Update ARM _FPU_RESERVED value.

diff --git a/NEWS b/NEWS
index 6de51bf..31fcb6c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -19,8 +19,8 @@ Version 2.18
   15330, 15335, 15336, 15337, 15339, 15342, 15346, 15359, 15361, 15366,
   15380, 15381, 15394, 15395, 15405, 15406, 15409, 15416, 15418, 15419,
   15423, 15424, 15426, 15429, 15431, 15432, 15441, 15442, 15448, 15465,
-  15480, 15485, 15488, 15490, 15493, 15497, 15506, 15529, 15536, 15553,
-  15577, 15583, 15618, 15627.
+  15480, 15485, 15488, 15490, 15492, 15493, 15497, 15506, 15529, 15536,
+  15553, 15577, 15583, 15618, 15627.
 
 * CVE-2013-0242 Buffer overrun in regexp matcher has been fixed (Bugzilla
   #15078).

diff --git a/ports/ChangeLog.arm b/ports/ChangeLog.arm
index 28ebfdf..d62d00e 100644 (file)
--- a/ports/ChangeLog.arm
+++ b/ports/ChangeLog.arm
@@ -1,3 +1,9 @@
+2013-06-14  Joseph Myers  <joseph@codesourcery.com>
+
+       [BZ #15492]
+       * sysdeps/arm/fpu_control.h [_LIBC || !__SOFTFP__]
+       (_FPU_RESERVED): Change value to 0x00086060.
+
 2013-06-11  Joseph Myers  <joseph@codesourcery.com>
 
        * sysdeps/arm/math-tests.h [__SOFTFP__] (EXCEPTION_TESTS_float):

diff --git a/ports/sysdeps/arm/fpu_control.h b/ports/sysdeps/arm/fpu_control.h
index 02d6e2c..2fee79f 100644 (file)
--- a/ports/sysdeps/arm/fpu_control.h
+++ b/ports/sysdeps/arm/fpu_control.h
@@ -39,7 +39,7 @@ extern fpu_control_t __fpu_control;
 
 /* Some bits in the FPSCR are not yet defined.  They must be preserved when
    modifying the contents.  */
-#define _FPU_RESERVED  0x0e08e0e0
+#define _FPU_RESERVED  0x00086060
 #define _FPU_DEFAULT    0x00000000
 /* Default + exceptions enabled. */
 #define _FPU_IEEE      (_FPU_DEFAULT | 0x00001f00)