aboutsummaryrefslogtreecommitdiff
path: root/libgcc
diff options
context:
space:
mode:
Diffstat (limited to 'libgcc')
-rw-r--r--libgcc/ChangeLog5
-rw-r--r--libgcc/config/arm/fp16.c7
2 files changed, 10 insertions, 2 deletions
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index cc5c2c3..dee1c11 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-09-24 Richard Earnshaw <rearnsha@arm.com>
+
+ PR libgcc/67624
+ * config/arm/fp16.c (__gnu_f2h_internal): Handle infinity correctly.
+
2015-09-24 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* config.host (*-*-solaris2*): Add t-crtstuff-pic to tmake_file.
diff --git a/libgcc/config/arm/fp16.c b/libgcc/config/arm/fp16.c
index 86a6348..8eaae2b 100644
--- a/libgcc/config/arm/fp16.c
+++ b/libgcc/config/arm/fp16.c
@@ -35,9 +35,12 @@ __gnu_f2h_internal(unsigned int a, int ieee)
{
if (!ieee)
return sign;
+ if (mantissa == 0)
+ return sign | 0x7c00; /* Infinity. */
+ /* Remaining cases are NaNs. Convert SNaN to QNaN. */
return sign | 0x7e00 | (mantissa >> 13);
}
-
+
if (aexp == 0 && mantissa == 0)
return sign;
@@ -49,7 +52,7 @@ __gnu_f2h_internal(unsigned int a, int ieee)
{
mask = 0x00ffffff;
if (aexp >= -25)
- mask >>= 25 + aexp;
+ mask >>= 25 + aexp;
}
else
mask = 0x00001fff;