diff --git a/ChangeLog b/ChangeLog
index 60d99fe3a4..2b518f2970 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-20  Joseph Myers  <joseph@codesourcery.com>
+
+	* soft-fp/op-common.h (_FP_FROM_INT): Wrap call to abort in
+	expression inside statement expression.
+
 2015-02-20  Stefan Liebler  <stli@linux.vnet.ibm.com>
 
 	* sysdeps/unix/sysv/linux/s390/lowlevellock.h: Include
diff --git a/soft-fp/op-common.h b/soft-fp/op-common.h
index 342532a4cc..14fd6cdc96 100644
--- a/soft-fp/op-common.h
+++ b/soft-fp/op-common.h
@@ -1815,7 +1815,7 @@
 			 X##_e = (_FP_EXPBIAS_##fs + 2 * _FP_W_TYPE_SIZE - 1 \
 				  - _FP_FROM_INT_lz);			\
 		       })						\
-		     : (abort (), 0)));					\
+		     : ({ abort (); 0; })));				\
 									\
 	  if ((rsize) - 1 + _FP_EXPBIAS_##fs >= _FP_EXPMAX_##fs		\
 	      && X##_e >= _FP_EXPMAX_##fs)				\