about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--NEWS2
-rw-r--r--soft-fp/op-common.h1
3 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f0e44d2465..d2a3e349bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-10-17  Joseph Myers  <joseph@codesourcery.com>
+
+	[BZ #16041]
+	* soft-fp/op-common.h (FP_EXTEND): When input is a signaling NaN,
+	make result into a quiet NaN.
+
 2013-10-16  Joseph Myers  <joseph@codesourcery.com>
 
 	* soft-fp/adddf3.c: Fix horizontal whitespace.
diff --git a/NEWS b/NEWS
index ac375f8045..1501f94ea3 100644
--- a/NEWS
+++ b/NEWS
@@ -16,7 +16,7 @@ Version 2.19
   15857, 15859, 15867, 15886, 15887, 15890, 15892, 15893, 15895, 15897,
   15905, 15909, 15919, 15921, 15923, 15939, 15963, 15966, 15988, 16032,
   15905, 15909, 15919, 15921, 15923, 15939, 15963, 15966, 15988, 16032,
-  16034, 16036.
+  16034, 16036, 16041.
 
 * CVE-2012-4412 The strcoll implementation caches indices and rules for
   large collation sequences to optimize multiple passes.  This cache
diff --git a/soft-fp/op-common.h b/soft-fp/op-common.h
index 9a9a8f5256..67cdc33b4c 100644
--- a/soft-fp/op-common.h
+++ b/soft-fp/op-common.h
@@ -1505,6 +1505,7 @@
 		    FP_SET_EXCEPTION (FP_EX_INVALID);			\
 		  _FP_FRAC_SLL_##dwc (D, (_FP_FRACBITS_##dfs		\
 					  - _FP_FRACBITS_##sfs));	\
+		  _FP_SETQNAN (dfs, dwc, D);				\
 		}							\
 	    }								\
 	}								\