From f1226a2ae370b1412b5e31a8535ad58a9174dd0a Mon Sep 17 00:00:00 2001
From: Joseph Myers <joseph@codesourcery.com>
Date: Fri, 9 Oct 2015 22:23:39 +0000
Subject: Fix llrint, llround missing exceptions for ARM (bug 15470).

Similar to the recent fix for MIPS, ARM is also missing correct
exceptions on overflow from llrint and llround functions because casts
from floating-point types to long long do not result in correct
exceptions on overflow.  This patch enables the fix for this for ARM.

Tested for ARM.

	[BZ #15470]
	* sysdeps/arm/fix-fp-int-convert-overflow.h: New file.
---
 ChangeLog                                 |  3 +++
 NEWS                                      | 20 +++++++++----------
 sysdeps/arm/fix-fp-int-convert-overflow.h | 32 +++++++++++++++++++++++++++++++
 3 files changed, 45 insertions(+), 10 deletions(-)
 create mode 100644 sysdeps/arm/fix-fp-int-convert-overflow.h

diff --git a/ChangeLog b/ChangeLog
index 1e9a477895..3026cd6f43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2015-10-09  Joseph Myers  <joseph@codesourcery.com>
 
+	[BZ #15470]
+	* sysdeps/arm/fix-fp-int-convert-overflow.h: New file.
+
 	[BZ #16399]
 	* sysdeps/generic/fix-fp-int-convert-overflow.h: New file.
 	* sysdeps/ieee754/dbl-64/s_llrint.c: Include <fenv.h>, <limits.h>
diff --git a/NEWS b/NEWS
index 32e4c64c07..512b338492 100644
--- a/NEWS
+++ b/NEWS
@@ -10,16 +10,16 @@ Version 2.23
 * The following bugs are resolved with this release:
 
   887, 2542, 2543, 2558, 2898, 4404, 6803, 10432, 14341, 14912, 15367,
-  15384, 15786, 15918, 16141, 16296, 16347, 16399, 16415, 16517, 16519,
-  16520, 16521, 16620, 16734, 16973, 16985, 17118, 17243, 17244, 17250,
-  17441, 17787, 17886, 17887, 17905, 18084, 18086, 18240, 18265, 18370,
-  18421, 18480, 18525, 18595, 18589, 18610, 18618, 18647, 18661, 18674,
-  18675, 18681, 18724, 18757, 18778, 18781, 18787, 18789, 18790, 18795,
-  18796, 18803, 18820, 18823, 18824, 18825, 18857, 18863, 18870, 18872,
-  18873, 18875, 18887, 18921, 18951, 18952, 18956, 18961, 18966, 18967,
-  18969, 18970, 18977, 18980, 18981, 18985, 19003, 19012, 19016, 19018,
-  19032, 19046, 19049, 19050, 19059, 19071, 19076, 19077, 19078, 19079,
-  19085, 19086, 19088, 19094, 19095.
+  15384, 15470, 15786, 15918, 16141, 16296, 16347, 16399, 16415, 16517,
+  16519, 16520, 16521, 16620, 16734, 16973, 16985, 17118, 17243, 17244,
+  17250, 17441, 17787, 17886, 17887, 17905, 18084, 18086, 18240, 18265,
+  18370, 18421, 18480, 18525, 18595, 18589, 18610, 18618, 18647, 18661,
+  18674, 18675, 18681, 18724, 18757, 18778, 18781, 18787, 18789, 18790,
+  18795, 18796, 18803, 18820, 18823, 18824, 18825, 18857, 18863, 18870,
+  18872, 18873, 18875, 18887, 18921, 18951, 18952, 18956, 18961, 18966,
+  18967, 18969, 18970, 18977, 18980, 18981, 18985, 19003, 19012, 19016,
+  19018, 19032, 19046, 19049, 19050, 19059, 19071, 19076, 19077, 19078,
+  19079, 19085, 19086, 19088, 19094, 19095.
 
 * The obsolete header <regexp.h> has been removed.  Programs that require
   this header must be updated to use <regex.h> instead.
diff --git a/sysdeps/arm/fix-fp-int-convert-overflow.h b/sysdeps/arm/fix-fp-int-convert-overflow.h
new file mode 100644
index 0000000000..3ce720cd0c
--- /dev/null
+++ b/sysdeps/arm/fix-fp-int-convert-overflow.h
@@ -0,0 +1,32 @@
+/* Fix for conversion of floating point to integer overflow.  ARM version.
+   Copyright (C) 2015 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#ifndef FIX_FP_INT_CONVERT_OVERFLOW_H
+#define FIX_FP_INT_CONVERT_OVERFLOW_H	1
+
+/* As of GCC 5, the generic libgcc2.c conversions from floating point
+   to long long may not raise the correct exceptions on overflow (and
+   may raise spurious "inexact" exceptions even in non-overflow cases,
+   see <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=59412>).  */
+#define FIX_FLT_LLONG_CONVERT_OVERFLOW 1
+#define FIX_DBL_LLONG_CONVERT_OVERFLOW 1
+
+#define FIX_FLT_LONG_CONVERT_OVERFLOW 0
+#define FIX_DBL_LONG_CONVERT_OVERFLOW 0
+
+#endif /* fix-fp-int-convert-overflow.h */
-- 
cgit v1.2.3