soft-fp: Fix alpha kernel build problem

 * soft-fp/op-common.h (_FP_FROM_INT): Don't write to R.

diff --git a/ChangeLog b/ChangeLog
index c68ea67448a755701a8ebaebb2b7a48dcd097f34..07f478a227794a64918ec6230b34406b52f8ef04 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2015-05-19  Richard Henderson  <rth@redhat.com>
 
+       * soft-fp/op-common.h (_FP_FROM_INT): Don't write to R.
+
        * sysdeps/alpha/fpu/libm-test-ulps: Update.
 
 2015-05-19  Siddhesh Poyarekar  <siddhesh@redhat.com>

diff --git a/soft-fp/op-common.h b/soft-fp/op-common.h
index 9c1c5e35f2de427e7fee90619a7ff9c27896e67a..080ef0e9b9040bb7d7a9619bbe4405546deaf9c6 100644 (file)
--- a/soft-fp/op-common.h
+++ b/soft-fp/op-common.h
@@ -1794,12 +1794,11 @@
       __label__ pack_semiraw;                                          \
       if (r)                                                           \
        {                                                               \
-         rtype _FP_FROM_INT_ur;                                        \
+         rtype _FP_FROM_INT_ur = (r);                                  \
                                                                        \
          if ((X##_s = ((r) < 0)))                                      \
-           (r) = -(rtype) (r);                                         \
+           _FP_FROM_INT_ur = -_FP_FROM_INT_ur;                         \
                                                                        \
-         _FP_FROM_INT_ur = (rtype) (r);                                \
          _FP_STATIC_ASSERT ((rsize) <= 2 * _FP_W_TYPE_SIZE,            \
                             "rsize too large");                        \
          (void) (((rsize) <= _FP_W_TYPE_SIZE)                          \