diff --git a/libatomic/ChangeLog b/libatomic/ChangeLog
index 4d75846be14..921c1205eae 100644
--- a/libatomic/ChangeLog
+++ b/libatomic/ChangeLog
@@ -1,3 +1,7 @@
+2013-07-18  Uros Bizjak  <ubizjak@gmail.com>
+
+	* configure.tgt (alpha*): Add -mfp-trap-mode=sui to XCFLAGS.
+
 2014-06-17  Kai Tietz  <ktietz@redhat.com>
 
 	* Makefile.am (libatomic_la_LDFLAGS): Add lt_host_flags.
diff --git a/libatomic/configure.tgt b/libatomic/configure.tgt
index c53b8ce95b6..d3e01f90331 100644
--- a/libatomic/configure.tgt
+++ b/libatomic/configure.tgt
@@ -27,7 +27,11 @@
 # work out any special compilation flags as necessary.
 
 case "${target_cpu}" in
-  alpha*)		ARCH=alpha ;;
+  alpha*)
+	# fenv.c needs this option to generate inexact exceptions.
+	XCFLAGS="${XCFLAGS} -mfp-trap-mode=sui"
+	ARCH=alpha
+	;;
   rs6000 | powerpc*)	ARCH=powerpc ;;
   sh*)			ARCH=sh ;;