diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 9147014a21a..d0effacaa22 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-20  Janne Blomqvist  <jb@gcc.gnu.org>
+        Uros Bizjak  <ubizjak@gmail.com>
+
+        PR libfortran/48977
+        * configure.host: Swap order of glibc and x86 tests.
+
 2011-05-20  Janne Blomqvist  <jb@gcc.gnu.org>
 
         * config/fpu-387.h (set_fpu): Use renamed inexact macro.
@@ -186,7 +192,7 @@
 	* io/write_float.def (output_float_FMT_G): Use current rounding mode
 	to set the rounding parameters. (output_float): Skip rounding
 	if value is zero.
-	
+
 2011-04-16  Janne Blomqvist  <jb@gcc.gnu.org>
 
 	* intrinsics/date_and_time.c (date_and_time): Remove sprintf CPP
diff --git a/libgfortran/configure.host b/libgfortran/configure.host
index eb68c934c39..92b6433b968 100644
--- a/libgfortran/configure.host
+++ b/libgfortran/configure.host
@@ -20,17 +20,17 @@
 # DEFAULTS
 fpu_host='fpu-generic'
 
-# HOST-SPECIFIC OVERRIDES
+if test "x${have_feenableexcept}" = "xyes"; then
+  fpu_host='fpu-glibc'
+fi
+
+# x86 asm should be used instead of glibc, since glibc doesn't support
+# the x86 denormal exception.
 case "${host_cpu}" in
   i?86 | x86_64)
     fpu_host='fpu-387' ;;
 esac
 
-# CONFIGURATION-SPECIFIC OVERRIDES
-if test "x${have_feenableexcept}" = "xyes"; then
-  fpu_host='fpu-glibc'
-fi
-
 if test "x${have_fpsetmask}" = "xyes"; then
   fpu_host='fpu-sysv'
 fi