aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2014-04-29 19:17:19 -0400
committerRalf Baechle <ralf@linux-mips.org>2014-05-23 09:12:37 -0400
commitaef3fb76aa1390ef864db888d06d8fcd5510df2d (patch)
tree578bee5fd283d8b427eba892ef2af8aca3accf98 /arch/mips
parent76fbfc318de2eb0eb4823095ece020f999a17c63 (diff)
MIPS: math-emu: Nuke alternative names for IEEE-754 rounding modes.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/math-emu/dp_sqrt.c2
-rw-r--r--arch/mips/math-emu/ieee754.h4
-rw-r--r--arch/mips/math-emu/sp_sqrt.c2
3 files changed, 2 insertions, 6 deletions
diff --git a/arch/mips/math-emu/dp_sqrt.c b/arch/mips/math-emu/dp_sqrt.c
index 109878a57f12..0384c094b1aa 100644
--- a/arch/mips/math-emu/dp_sqrt.c
+++ b/arch/mips/math-emu/dp_sqrt.c
@@ -139,7 +139,7 @@ union ieee754dp ieee754dp_sqrt(union ieee754dp x)
139 oldcsr.sx |= IEEE754_INEXACT; 139 oldcsr.sx |= IEEE754_INEXACT;
140 140
141 switch (oldcsr.rm) { 141 switch (oldcsr.rm) {
142 case IEEE754_RP: 142 case IEEE754_RU:
143 y.bits += 1; 143 y.bits += 1;
144 /* drop through */ 144 /* drop through */
145 case IEEE754_RN: 145 case IEEE754_RN:
diff --git a/arch/mips/math-emu/ieee754.h b/arch/mips/math-emu/ieee754.h
index fb2fb6b89273..2fa939c612f6 100644
--- a/arch/mips/math-emu/ieee754.h
+++ b/arch/mips/math-emu/ieee754.h
@@ -133,10 +133,6 @@ enum {
133#define IEEE754_RD 2 /* round toward -Infinity */ 133#define IEEE754_RD 2 /* round toward -Infinity */
134#define IEEE754_RU 3 /* round toward +Infinity */ 134#define IEEE754_RU 3 /* round toward +Infinity */
135 135
136/* other naming */
137#define IEEE754_RM IEEE754_RD
138#define IEEE754_RP IEEE754_RU
139
140/* "normal" comparisons 136/* "normal" comparisons
141*/ 137*/
142static inline int ieee754sp_eq(union ieee754sp x, union ieee754sp y) 138static inline int ieee754sp_eq(union ieee754sp x, union ieee754sp y)
diff --git a/arch/mips/math-emu/sp_sqrt.c b/arch/mips/math-emu/sp_sqrt.c
index 33b3e0001e9e..94f5befa1d70 100644
--- a/arch/mips/math-emu/sp_sqrt.c
+++ b/arch/mips/math-emu/sp_sqrt.c
@@ -100,7 +100,7 @@ union ieee754sp ieee754sp_sqrt(union ieee754sp x)
100 if (ix != 0) { 100 if (ix != 0) {
101 ieee754_setcx(IEEE754_INEXACT); 101 ieee754_setcx(IEEE754_INEXACT);
102 switch (ieee754_csr.rm) { 102 switch (ieee754_csr.rm) {
103 case IEEE754_RP: 103 case IEEE754_RU:
104 q += 2; 104 q += 2;
105 break; 105 break;
106 case IEEE754_RN: 106 case IEEE754_RN: