diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d1c975382317..93f5f2e65e5c 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-07  Andrew Pinski  <pinskia@gmail.com>
+
+	* objc.dg/gnu-encoding/struct-layout-encoding-1_generate.c:
+	Xfail some tests for powerpc-darwin and powerpc-aix.
+
 2006-10-07  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c/29380
diff --git a/gcc/testsuite/objc.dg/gnu-encoding/struct-layout-encoding-1_generate.c b/gcc/testsuite/objc.dg/gnu-encoding/struct-layout-encoding-1_generate.c
index 4b5d5c6dae72..fc3770b95ac6 100644
--- a/gcc/testsuite/objc.dg/gnu-encoding/struct-layout-encoding-1_generate.c
+++ b/gcc/testsuite/objc.dg/gnu-encoding/struct-layout-encoding-1_generate.c
@@ -222,11 +222,29 @@ switchfiles (int fields)
       fputs ("failed to create test files\n", stderr);
       exit (1);
     }
+  /* FIXME: these tests should not be xfailed on PowerPC darwin or aix
+     but they are because libobjc uses GCC's headers for trying to find
+     the struct layout but it gets it wrong.  */
+  if (filecnt == 2
+      || filecnt == 3
+      || filecnt == 4
+      || filecnt == 6
+      || filecnt == 7
+      || filecnt == 8
+      || filecnt == 11
+      || filecnt == 12
+      || filecnt == 15
+      || filecnt == 22)
+     {
+      fprintf (outfile, "\
+/* { dg-do run { xfail powerpc*-*-darwin* powerpc*-*-aix* } } */\n\
+/* { dg-options \"-w -I%s -fgnu-runtime\" } */\n", srcdir);
+     }
   /* FIXME: these should not be xfailed but they are because
      of bugs in libobjc and the objc front-end.  25 is because
      vectors are not encoded.  The rest are because or zero sized
      arrays are encoded as pointers.  */
-  if (filecnt >= 25)
+  else if (filecnt >= 25)
     {
       fprintf (outfile, "\
 /* { dg-do run { xfail *-*-* } } */\n\