diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8fad2257455b2b8e4ff19c0a787b9eb842055d07..40a36c0df5a199932d276a5db2980f71b0276ec1 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2013-06-20  Uros Bizjak  <ubizjak@gmail.com>
+
+	PR target/57655
+	* config/i386/i386.c (construct_container): Report error if
+	long double is used with disabled x87 float returns.
+
 2013-06-20  Jan Hubicka  <jh@suse.cz>
 
 	* lto-cgraph.c (input_symtab): Do not set cgraph state.
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 0060b793807ec4377ce2af1af5c0af589731eb01..d134604eee3f14868027ab05a9c22ee63f54cd10 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -6498,7 +6498,7 @@ construct_container (enum machine_mode mode, enum machine_mode orig_mode,
 
   /* Likewise, error if the ABI requires us to return values in the
      x87 registers and the user specified -mno-80387.  */
-  if (!TARGET_80387 && in_return)
+  if (!TARGET_FLOAT_RETURNS_IN_80387 && in_return)
     for (i = 0; i < n; i++)
       if (regclass[i] == X86_64_X87_CLASS
 	  || regclass[i] == X86_64_X87UP_CLASS
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 94ebf89f03aa27669dff65144550ffc4ad809d35..c606a6ecf3d9617b01cb3e4ebd79ba1fcfaebd52 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-20  Uros Bizjak  <ubizjak@gmail.com>
+
+	PR target/57655
+	* gcc.target/i386/pr57655.c: New test.
+
 2013-06-20  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* ada/acats/tests/gcc: Delete.
diff --git a/gcc/testsuite/gcc.target/i386/pr57655.c b/gcc/testsuite/gcc.target/i386/pr57655.c
new file mode 100644
index 0000000000000000000000000000000000000000..586d3386222351f3dea479886c20735e6664d821
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/pr57655.c
@@ -0,0 +1,10 @@
+/* { dg-do compile } */
+/* { dg-options "-mavx -mvzeroupper -mno-fp-ret-in-387" }
+
+/* { dg-error "x87 register return with x87 disabled" "" { target { ! ia32 } } 8 } */
+
+long double
+foo (long double x)
+{
+  return __builtin_ilogbl (x);
+}