From: Richard Henderson <rth@twiddle.net>
Date: Tue, 19 May 2015 18:23:56 +0000 (-0700)
Subject: soft-fp: Fix alpha kernel build problem
X-Git-Tag: upstream/2.30~6052
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=85bae5a160e288fa85eab8a5d1b0b227ab20798a;p=external%2Fglibc.git

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 c68ea67..07f478a 100644
--- 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 9c1c5e3..080ef0e 100644
--- 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)				\