Fix x86 floating point vs. thread problem in 5.1 branch.

diff --git a/gdb/i387-nat.c b/gdb/i387-nat.c
index 5cb1a04c694ec547e3ce92d1887325203e3248aa..3c9f7b7b92477f9ad5751fb1f6192b5c26eeb4e8 100644 (file)
--- a/gdb/i387-nat.c
+++ b/gdb/i387-nat.c
@@ -269,7 +269,7 @@ i387_fill_fxsave (char *fxsave, int regnum)
              {
                /* Converting back is much easier.  */
 
-               unsigned char val = 0;
+               unsigned short val = 0;
                unsigned short ftag;
                int fpreg;
 
@@ -280,7 +280,7 @@ i387_fill_fxsave (char *fxsave, int regnum)
                    int tag = (ftag >> (fpreg * 2)) & 3;
 
                    if (tag != 3)
-                     val |= (1 << (fpreg * 2));
+                     val |= (1 << fpreg);
                  }
 
                memcpy (FXSAVE_ADDR (fxsave, i), &val, 2);