diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b1543eaa02ae0420a8dc9f598f502167a6bfa46f..3492c4bc33d88f76cc848168dae51efea2d7c288 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2006-04-08  Mike Stump  <mrs@apple.com>
+
+	* gcc.dg/pragma-darwin.c: Improve for ppc64.
+
 2006-04-07  Richard Guenther  <rguenther@suse.de>
 
 	PR tree-optimization/26135
diff --git a/gcc/testsuite/gcc.dg/pragma-darwin.c b/gcc/testsuite/gcc.dg/pragma-darwin.c
index da70c8918a0726ce6540fc3ffc3e2d767084b607..8e96ae558b69d3c00c25e95188865d5a8c73e968 100644
--- a/gcc/testsuite/gcc.dg/pragma-darwin.c
+++ b/gcc/testsuite/gcc.dg/pragma-darwin.c
@@ -14,20 +14,25 @@ extern void abort(void);
 
 #pragma options 23  /* { dg-error "malformed '#pragma options'" } */
 #pragma options align  /* { dg-error "malformed '#pragma options'" } */
-#pragma options align mac68k /* { dg-error "malformed '#pragma options'" } */
+#pragma options align natural /* { dg-error "malformed '#pragma options'" } */
 #pragma options align=45 /* { dg-error "malformed '#pragma options'" } */
 #pragma options align=foo /* { dg-error "malformed '#pragma options align" } */
 
+#ifndef __LP64__
 #pragma options align=mac68k
 struct s1 { short f1; int f2; };
+#endif
 #pragma options align=power
 struct s2 { short f1; int f2; };
+#ifndef __LP64__
 #pragma options align=mac68k
 struct s3 { short f1; int f2; };
+#endif
 #pragma options align=reset
 struct s4 { short f1; int f2; };
 
-#pragma options align=mac68k foo /* { dg-warning "junk at end of '#pragma options'" } */
+#pragma options align=natural foo /* { dg-warning "junk at end of '#pragma options'" } */
+/* { dg-warning "malformed '#pragma options align={mac68k|power|reset}', ignoring" "ignoring" { target *-*-* } 34 } */
 
 /* Segment pragmas don't do anything anymore.  */
 
@@ -36,15 +41,19 @@ struct s4 { short f1; int f2; };
 int
 main ()
 {
-  int x, z;  /* { dg-warning "unused variable" } */
+  int x, z;  /* { dg-warning "unused variable 'z'" } */
   #pragma unused (x, y)
 
+#ifndef __LP64__
   if (sizeof (struct s1) != 6)
     abort ();
+#endif
   if (sizeof (struct s2) != 8)
     abort ();
+#ifndef __LP64__
   if (sizeof (struct s3) != 6)
     abort ();
+#endif
   if (sizeof (struct s4) != 8)
     abort ();
   return 0;