1 files changed, 20 insertions, 2 deletions
diff --git a/gcc/testsuite/gcc.dg/pragma-darwin.c b/gcc/testsuite/gcc.dg/pragma-darwin.c
index da70c8918a0..7d5d22bb667 100644
--- a/gcc/testsuite/gcc.dg/pragma-darwin.c
+++ b/gcc/testsuite/gcc.dg/pragma-darwin.c
@@ -14,20 +14,30 @@ 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'" } */
+/* APPLE LOCAL 64-bit mainline */
+#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" } */
 
+/* APPLE LOCAL 64-bit mainline */
+#ifndef __LP64__
 #pragma options align=mac68k
 struct s1 { short f1; int f2; };
+/* APPLE LOCAL 64-bit mainline */
+#endif
 #pragma options align=power
 struct s2 { short f1; int f2; };
+/* APPLE LOCAL 64-bit mainline */
+#ifndef __LP64__
 #pragma options align=mac68k
 struct s3 { short f1; int f2; };
+/* APPLE LOCAL 64-bit mainline */
+#endif
 #pragma options align=reset
 struct s4 { short f1; int f2; };
 
-#pragma options align=mac68k foo /* { dg-warning "junk at end of '#pragma options'" } */
+/* APPLE LOCAL 64-bit mainline */
+#pragma options align=natural foo /* { dg-warning "junk at end of '#pragma options'" } */
 
 /* Segment pragmas don't do anything anymore.  */
 
@@ -39,12 +49,20 @@ main ()
   int x, z;  /* { dg-warning "unused variable" } */
   #pragma unused (x, y)
 
+/* APPLE LOCAL 64-bit mainline */
+#ifndef __LP64__
   if (sizeof (struct s1) != 6)
     abort ();
+/* APPLE LOCAL 64-bit mainline */
+#endif
   if (sizeof (struct s2) != 8)
     abort ();
+/* APPLE LOCAL 64-bit mainline */
+#ifndef __LP64__
   if (sizeof (struct s3) != 6)
     abort ();
+/* APPLE LOCAL 64-bit mainline */
+#endif
   if (sizeof (struct s4) != 8)
     abort ();
   return 0;