diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index 86cf4147998fa44337a9c6cf5769ae4ab07615e4..02102dda6c52fd8f32944cc99616eb90c30e68ac 100644
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,3 +1,9 @@
+2009-12-26  Anthony Green  <green@redhat.com>
+
+	* testsuite/libffi.call/cls_longdouble_va.c: Mark as xfail for
+	avr32*-*-*.
+	* testsuite/libffi.call/cls_double_va.c: Ditto.
+
 2009-12-26  Andreas Tobler  <a.tobler@schweiz.org>
 
 	* testsuite/libffi.call/ffitest.h: Conditionally include stdint.h
diff --git a/libffi/testsuite/libffi.call/cls_double_va.c b/libffi/testsuite/libffi.call/cls_double_va.c
index cc10125225b3be93f87e6ca28841990f6afe629d..0695874b3cea08ae0e5ea7547d61a868017f4164 100644
--- a/libffi/testsuite/libffi.call/cls_double_va.c
+++ b/libffi/testsuite/libffi.call/cls_double_va.c
@@ -5,6 +5,7 @@
    Originator:	Blake Chaffin 6/6/2007	 */
 
 /* { dg-do run { xfail strongarm*-*-* xscale*-*-* } } */
+/* { dg-output "" { xfail avr32*-*-* } } */
 #include "ffitest.h"
 
 static void
diff --git a/libffi/testsuite/libffi.call/cls_longdouble_va.c b/libffi/testsuite/libffi.call/cls_longdouble_va.c
index 6c17dc462fd306605a92f43dbf49a51f81db7665..38564cb086ba8f943e1795159d2ccbccee0b7f66 100644
--- a/libffi/testsuite/libffi.call/cls_longdouble_va.c
+++ b/libffi/testsuite/libffi.call/cls_longdouble_va.c
@@ -5,7 +5,7 @@
    Originator:	Blake Chaffin 6/6/2007	 */
 
 /* { dg-do run { xfail strongarm*-*-* xscale*-*-* } } */
-/* { dg-output "" { xfail x86_64-*-mingw* } } */
+/* { dg-output "" { xfail avr32*-*-* x86_64-*-mingw* } } */
 #include "ffitest.h"
 
 static void