[llvm-commits] [llvm-gcc-4.2] r82305 - in /llvm-gcc-4.2/trunk/gcc/testsuite: ./ g++.apple/ gcc.apple/ gcc.c-torture/execute/ gcc.dg/ gcc.dg/format/ gcc.dg/vect/ lib/ obj-c++.dg/ objc.dg/

Bob Wilson bob.wilson at apple.com
Fri Sep 18 16:20:24 PDT 2009


Author: bwilson
Date: Fri Sep 18 18:20:23 2009
New Revision: 82305

URL: http://llvm.org/viewvc/llvm-project?rev=82305&view=rev
Log:
Merge a bunch of testsuite changes from Apple's gcc.  These should have been
included in the r76781 merge from Apple's gcc r155791 but were somehow
overlooked.  It looks like the previous merge took new test files but left
out changes to existing testsuite files.

I noticed the omission when Anton added some NEON changes to
gcc/testsuite/lib/target-supports.exp.  This changes some of the functions
that Anton added, but it looks like Apple's version of that file does about
the same thing.

Modified:
    llvm-gcc-4.2/trunk/gcc/testsuite/ChangeLog.apple
    llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/6755006.C
    llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/block-no-trampoline-1.C
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/6020402-1.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/6310728.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/align-test-1.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/align-test-2.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/align-test-3.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/align-test-4.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/align-test-5c.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/arm-ne-zero.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/asm-block-29.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/asm-block-3.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/asm-block-49.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/asm-block-62.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/asm-block-63.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/asm-block-65.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/asm-block-67.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-copy-attrib-err.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-copy-destroy.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-encoding.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/builtin-cast.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/dwarf-files.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/inline-limit-1.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-default-1.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/objc-negtest.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/stack-protect-1.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.c-torture/execute/align-3.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/format/branch-1.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/format/c90-printf-1.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/format/c90-scanf-1.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/format/strfmon-1.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/nonnull-3.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/sibcall-3.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/sibcall-4.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/vect/tree-vect.h
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/vect/vect.exp
    llvm-gcc-4.2/trunk/gcc/testsuite/lib/target-supports.exp
    llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/objc-property-enumtype.mm
    llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/property-synthesize-ivar-6.mm
    llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc-property-enumtype.m

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/ChangeLog.apple
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/ChangeLog.apple?rev=82305&r1=82304&r2=82305&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/ChangeLog.apple (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/ChangeLog.apple Fri Sep 18 18:20:23 2009
@@ -1,3 +1,8 @@
+2009-06-15  Fariborz Jahanian <fjahanian at apple.com>
+
+        Radar 6936421
+	* obj-c++.dg/property-as-initializer.mm: New
+
 2009-05-06  Fariborz Jahanian <fjahanian at apple.com>
 
 	Radar 6083666

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/6755006.C
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.apple/6755006.C?rev=82305&r1=82304&r2=82305&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/6755006.C (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/6755006.C Fri Sep 18 18:20:23 2009
@@ -1,7 +1,8 @@
 // APPLE LOCAL file 6755006
 //#include <cassert>
-// { dg-do run }
-// { dg-options "-Os -m32" }
+/* { dg-do run } */
+/* { dg-options { -m32 -Os } { target powerpc*-*-darwin* i?86-*-darwin* } } */
+/* { dg-options { -Os } { target arm*-*-darwin* } } */
 #include <stdio.h>
 #include <stdlib.h>
 enum foo {

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/block-no-trampoline-1.C
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.apple/block-no-trampoline-1.C?rev=82305&r1=82304&r2=82305&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/block-no-trampoline-1.C (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/block-no-trampoline-1.C Fri Sep 18 18:20:23 2009
@@ -14,6 +14,9 @@
         abort();
 }
 
+extern "C" uint64_t
+dispatch_benchmark(size_t count, void (^block)(void));
+
 class A {
 public:
     void foo();

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/6020402-1.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/6020402-1.c?rev=82305&r1=82304&r2=82305&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/6020402-1.c (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/6020402-1.c Fri Sep 18 18:20:23 2009
@@ -1,3 +1,4 @@
+/* { dg-do compile { target "i?86-*-*" } } */
 /* { dg-options "-m64 -Os" } */
 /* { dg-final { scan-assembler-not " orq\t" } } */
 

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/6310728.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/6310728.c?rev=82305&r1=82304&r2=82305&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/6310728.c (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/6310728.c Fri Sep 18 18:20:23 2009
@@ -1,5 +1,5 @@
 /* APPLE LOCAL file 6310728 */
-/* { dg-do compile } */
+/* { dg-do compile { target "i?86-*-*" } } */
 /* { dg-options { -mfix-and-continue -m64 } } */
 typedef int int32_t;
 typedef int32_t SINT32 ;

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/align-test-1.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/align-test-1.c?rev=82305&r1=82304&r2=82305&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/align-test-1.c (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/align-test-1.c Fri Sep 18 18:20:23 2009
@@ -1,6 +1,6 @@
 /* APPLE LOCAL file Macintosh alignment */
 
-/* { dg-do run } */
+/* { dg-do run { target { powerpc*-*-darwin* i?86*-*-darwin* } } } */
 /* { dg-options "-Wno-long-long" } */
 
 /*

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/align-test-2.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/align-test-2.c?rev=82305&r1=82304&r2=82305&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/align-test-2.c (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/align-test-2.c Fri Sep 18 18:20:23 2009
@@ -1,6 +1,6 @@
 /* APPLE LOCAL file Macintosh alignment */
 
-/* { dg-do run } */
+/* { dg-do run { target { powerpc*-*-darwin* i?86*-*-darwin* } } } */
 /* { dg-options "-Wno-long-long" } */
 
 /*

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/align-test-3.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/align-test-3.c?rev=82305&r1=82304&r2=82305&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/align-test-3.c (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/align-test-3.c Fri Sep 18 18:20:23 2009
@@ -1,6 +1,6 @@
 /* APPLE LOCAL file Macintosh alignment */
 
-/* { dg-do run } */
+/* { dg-do run { target { powerpc*-*-darwin* i?86*-*-darwin* } } } */
 /* { dg-options "-Wno-long-long" } */
 
 /*

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/align-test-4.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/align-test-4.c?rev=82305&r1=82304&r2=82305&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/align-test-4.c (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/align-test-4.c Fri Sep 18 18:20:23 2009
@@ -1,6 +1,6 @@
 /* APPLE LOCAL file Macintosh alignment */
 
-/* { dg-do run } */
+/* { dg-do run { target { powerpc*-*-darwin* i?86*-*-darwin* } } } */
 /* { dg-options "-Wno-long-long" } */
 
 /*

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/align-test-5c.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/align-test-5c.c?rev=82305&r1=82304&r2=82305&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/align-test-5c.c (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/align-test-5c.c Fri Sep 18 18:20:23 2009
@@ -1,7 +1,7 @@
 /* APPLE LOCAL file Macintosh alignment */
 /* align-test-5*.c are all the same code but with different options.  */
 
-/* { dg-do run } */
+/* { dg-do run { target { powerpc*-*-darwin* i?86*-*-darwin* } } } */
 /* { dg-options "-malign-mac68k -DSIZE=10" } */
 
 /* { dg-skip-if "" { powerpc*-*-darwin* } { "-m64" } { "" } } */

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/arm-ne-zero.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/arm-ne-zero.c?rev=82305&r1=82304&r2=82305&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/arm-ne-zero.c (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/arm-ne-zero.c Fri Sep 18 18:20:23 2009
@@ -3,7 +3,7 @@
    redundant move instruction.  */
 
 /* { dg-do compile { target arm*-*-darwin* } } */
-/* { dg-options "-Os" } */
+/* { dg-options "-Os -marm" } */
 /* { dg-skip-if "Not valid with -mthumb" { *-*-* } { "-mthumb" } { "" } } */
 
 int test_plus     (int a, int b) { return (a + b) != 0; }

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/asm-block-29.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/asm-block-29.c?rev=82305&r1=82304&r2=82305&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/asm-block-29.c (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/asm-block-29.c Fri Sep 18 18:20:23 2009
@@ -1,5 +1,5 @@
 /* APPLE LOCAL file CW asm blocks */
-/* { dg-do assemble { target *-*-darwin* } } */
+/* { dg-do assemble { target powerpc*-*-darwin* i?86*-*-darwin* } } */
 /* { dg-options { -fasm-blocks -msse3 } } */
 /* Radar 4298005 */
 

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/asm-block-3.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/asm-block-3.c?rev=82305&r1=82304&r2=82305&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/asm-block-3.c (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/asm-block-3.c Fri Sep 18 18:20:23 2009
@@ -1,7 +1,7 @@
 /* APPLE LOCAL file CW asm blocks */
 /* Test single line asms */
 
-/* { dg-do compile } */
+/* { dg-do compile { target powerpc*-*-darwin* i?86*-*-darwin* } } */
 /* { dg-options "-fasm-blocks" } */
 
 void

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/asm-block-49.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/asm-block-49.c?rev=82305&r1=82304&r2=82305&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/asm-block-49.c (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/asm-block-49.c Fri Sep 18 18:20:23 2009
@@ -1,5 +1,5 @@
 /* APPLE LOCAL file CW asm blocks */
-/* { dg-do assemble { target *-*-darwin* } } */
+/* { dg-do assemble { target powerpc*-*-darwin* i?86*-*-darwin* } } */
 /* { dg-options { -fasm-blocks } } */
 /* Radar 4477426 4466768 */
 

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/asm-block-62.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/asm-block-62.c?rev=82305&r1=82304&r2=82305&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/asm-block-62.c (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/asm-block-62.c Fri Sep 18 18:20:23 2009
@@ -1,5 +1,5 @@
 /* APPLE LOCAL file CW asm blocks */
-/* { dg-do compile { target *-*-darwin* } } */
+/* { dg-do compile { target powerpc*-*-darwin* i?86*-*-darwin* } } */
 /* { dg-options { -fasm-blocks } } */
 /* Radar 4197305 */
 

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/asm-block-63.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/asm-block-63.c?rev=82305&r1=82304&r2=82305&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/asm-block-63.c (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/asm-block-63.c Fri Sep 18 18:20:23 2009
@@ -1,5 +1,5 @@
 /* APPLE LOCAL file CW asm blocks */
-/* { dg-do compile { target *-*-darwin* } } */
+/* { dg-do compile { target powerpc*-*-darwin* i?86*-*-darwin* } } */
 /* { dg-options { -fasm-blocks } } */
 /* Radar 4766972 */
 

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/asm-block-65.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/asm-block-65.c?rev=82305&r1=82304&r2=82305&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/asm-block-65.c (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/asm-block-65.c Fri Sep 18 18:20:23 2009
@@ -1,4 +1,4 @@
-/* { dg-do compile { target *-*-darwin* } } */
+/* { dg-do compile { target powerpc*-*-darwin* i?86*-*-darwin* } } */
 /* { dg-options { -fasm-blocks } } */
 /* Radar 5474682 */
 

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/asm-block-67.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/asm-block-67.c?rev=82305&r1=82304&r2=82305&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/asm-block-67.c (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/asm-block-67.c Fri Sep 18 18:20:23 2009
@@ -1,4 +1,4 @@
-/* { dg-do compile } */ 
+/* { dg-do compile { target powerpc*-*-darwin* i?86*-*-darwin* } } */
 /* { dg-options "-fasm-blocks" } */
 
 int i = 1st;	/* { dg-error "invalid suffix \"st\" on integer constant" } */

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-copy-attrib-err.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-copy-attrib-err.c?rev=82305&r1=82304&r2=82305&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-copy-attrib-err.c (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-copy-attrib-err.c Fri Sep 18 18:20:23 2009
@@ -1,6 +1,7 @@
 /* APPLE LOCAL file radar 6379842 - blocks */
 /* { dg-do compile } */
-/* { dg-options "-ObjC -fblocks -m64 -fobjc-gc-only" } */
+/* { dg-options "-ObjC -fblocks -m64 -fobjc-gc-only" { target powerpc*-*-darwin* i?86*-*-darwin* } } */
+/* { dg-options "-ObjC -fblocks -fobjc-gc-only"  {target arm*-*-darwin* } } */
 
 @interface Thing  {}
 

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-copy-destroy.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-copy-destroy.c?rev=82305&r1=82304&r2=82305&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-copy-destroy.c (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-copy-destroy.c Fri Sep 18 18:20:23 2009
@@ -1,7 +1,8 @@
 /* APPLE LOCAL file 5782740 - blocks */
 /* Test generation of copy/destroy helper function. */
 /* { dg-do compile } */
-/* { dg-options "-mmacosx-version-min=10.5 -ObjC -fblocks" { target *-*-darwin* } } */
+/* { dg-options "-mmacosx-version-min=10.5 -ObjC -fblocks" { target powerpc*-*-darwin* i?86*-*-darwin* } } */
+/* { dg-options "-iphoneos-version-min=4.0 -ObjC -fblocks" { target arm*-*-darwin* } } */
 
 #import <Cocoa/Cocoa.h>
 

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-encoding.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-encoding.c?rev=82305&r1=82304&r2=82305&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-encoding.c (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-encoding.c Fri Sep 18 18:20:23 2009
@@ -1,7 +1,8 @@
 /* APPLE LOCAL file radar 5849129 */
 /* Test for encoding of a block pointer as '@'. */
 /* { dg-do compile } */
-/* { dg-options "-mmacosx-version-min=10.5 -ObjC" { target *-*-darwin* } } */
+/* { dg-options "-mmacosx-version-min=10.5 -ObjC" { target powerpc*-*-darwin* i?86*-*-darwin* } } */
+/* { dg-options "-iphoneos-version-min=4.0 -ObjC" { target arm*-*-darwin* } } */
 
 #import <Foundation/Foundation.h>
 

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/builtin-cast.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/builtin-cast.c?rev=82305&r1=82304&r2=82305&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/builtin-cast.c (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/builtin-cast.c Fri Sep 18 18:20:23 2009
@@ -1,5 +1,5 @@
 /* APPLE LOCAL file radar 4629695 */
-/* { dg-do compile } */
+/* { dg-do compile { target i?86*-*-darwin* } } */
 /* { dg-options "-m64" } */
 /* { dg-final { scan-assembler "_memcmp" } } */
 extern void abort (void);

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/dwarf-files.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/dwarf-files.c?rev=82305&r1=82304&r2=82305&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/dwarf-files.c (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/dwarf-files.c Fri Sep 18 18:20:23 2009
@@ -1,6 +1,6 @@
 /* APPLE LOCAL file  */
 /* Radar 5645155 */
-/* { dg-do compile } */
+/* { dg-do compile { target i?86-*-darwin* } } */
 /* { dg-options "-c -g -fasm-blocks" } */
 /* { dg-final { scan-assembler-times "dwarf-files.c" 2 } } */
 asm(".globl _x\n"

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/inline-limit-1.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/inline-limit-1.c?rev=82305&r1=82304&r2=82305&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/inline-limit-1.c (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/inline-limit-1.c Fri Sep 18 18:20:23 2009
@@ -1,5 +1,5 @@
 /* APPLE LOCAL file 4209014 4210936 */
-/* { dg-do compile } */
+/* { dg-do compile { target { powerpc*-*-darwin* i?86*-*-darwin* } } } */
 /* { dg-options "-Os" } */
 /* Call to inlinex25 should be inlined.  */
 /* { dg-final { scan-assembler-not "(\tbl|\tcall)\[ 	\]*_?inlinex25" } } */

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-default-1.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-default-1.c?rev=82305&r1=82304&r2=82305&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-default-1.c (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-default-1.c Fri Sep 18 18:20:23 2009
@@ -6,7 +6,7 @@
 /* { dg-do compile { target arm*-*-darwin* } } */
 /* { dg-skip-if "Not valid with -mmacosx-version-min" { *-*-darwin* } { "-mmacosx-version-min=*" } { "" } } */
 
-#if (__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ != 20000)
+#if (__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ != 30000)
 #error TEST FAILS
 #endif
 

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/objc-negtest.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/objc-negtest.c?rev=82305&r1=82304&r2=82305&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/objc-negtest.c (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/objc-negtest.c Fri Sep 18 18:20:23 2009
@@ -1,4 +1,5 @@
 /* APPLE LOCAL begin radar 4122328 */
+/* { dg-do compile { target i?86-*-darwin*i powerpc*-*-darwin* } } */
 /* { dg-options "-fasm-blocks" } */
 @class NSString; /* { dg-error "expected identifier or '\\(' before '@' token" } */
 

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/stack-protect-1.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/stack-protect-1.c?rev=82305&r1=82304&r2=82305&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/stack-protect-1.c (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/stack-protect-1.c Fri Sep 18 18:20:23 2009
@@ -1,5 +1,5 @@
 /* APPLE LOCAL file stack-protector default 5095227 */
-/* { dg-do compile } */
+/* { dg-do compile { target i?86-*-darwin*i powerpc*-*-darwin* } } */
 /* Verify that -fstack-protector is on by default and that it at least
    appears to work.  */
 extern void f2(char *);

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.c-torture/execute/align-3.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.c-torture/execute/align-3.c?rev=82305&r1=82304&r2=82305&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.c-torture/execute/align-3.c (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.c-torture/execute/align-3.c Fri Sep 18 18:20:23 2009
@@ -7,7 +7,12 @@
 
 int main()
 {
+  /* ARM thumb functions set the low bit of the address. */
+#if defined(__arm__) && defined(__thumb__)
+  if (((long)func & 0xFF) != 1)
+#else
   if (((long)func & 0xFF) != 0)
+#endif
     abort ();
   if (__alignof__(func) != 256)
     abort ();

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/format/branch-1.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/format/branch-1.c?rev=82305&r1=82304&r2=82305&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/format/branch-1.c (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/format/branch-1.c Fri Sep 18 18:20:23 2009
@@ -22,6 +22,6 @@
   printf ((nfoo > 1) ? "%ld foos" : ((nfoo > 0) ? "%d foo" : "%d foos"), nfoo); /* { dg-warning "long int" "wrong type" } */
   printf ((nfoo > 1) ? "%d foos" : ((nfoo > 0) ? "%ld foo" : "%d foos"), nfoo); /* { dg-warning "long int" "wrong type" } */
   /* Extra arguments to NULL should be complained about.  */
-  printf (NULL, "foo"); /* { dg-warning "too many" "NULL extra args" } */
-  /* { dg-warning "null" "null format arg" { target *-*-* } 25 } */
+  /* APPLE LOCAL 6821124 string arg is not non-null */
+  /* removed lines */
 }

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/format/c90-printf-1.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/format/c90-printf-1.c?rev=82305&r1=82304&r2=82305&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/format/c90-printf-1.c (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/format/c90-printf-1.c Fri Sep 18 18:20:23 2009
@@ -227,11 +227,12 @@
   printf ("\0"); /* { dg-warning "embedded" "warning for embedded NUL" } */
   printf ("%d\0", i); /* { dg-warning "embedded" "warning for embedded NUL" } */
   printf ("%d\0%d", i, i); /* { dg-warning "embedded|too many" "warning for embedded NUL" } */
-  printf (NULL); /* { dg-warning "null" "null format string warning" } */
+  /* APPLE LOCAL 6821124 string arg is not non-null */
+  /* removed line */
   printf ("%"); /* { dg-warning "trailing" "trailing % warning" } */
   printf ("%++d", i); /* { dg-warning "repeated" "repeated flag warning" } */
   printf ("%n", cn); /* { dg-warning "constant" "%n with const" } */
   printf ((const char *)L"foo"); /* { dg-warning "wide" "wide string" } */
-  printf ("%n", (int *)0); /* { dg-warning "null" "%n with NULL" } */
-  printf ("%s", (char *)0); /* { dg-warning "null" "%s with NULL" } */
+  /* APPLE LOCAL 6821124 begin string arg is not non-null */
+  /* removed lines */
 }

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/format/c90-scanf-1.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/format/c90-scanf-1.c?rev=82305&r1=82304&r2=82305&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/format/c90-scanf-1.c (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/format/c90-scanf-1.c Fri Sep 18 18:20:23 2009
@@ -113,7 +113,8 @@
   scanf ("\0"); /* { dg-warning "embedded" "warning for embedded NUL" } */
   scanf ("%d\0", ip); /* { dg-warning "embedded" "warning for embedded NUL" } */
   scanf ("%d\0%d", ip, ip); /* { dg-warning "embedded|too many" "warning for embedded NUL" } */
-  scanf (NULL); /* { dg-warning "null" "null format string warning" } */
+  /* APPLE LOCAL 6821124 string arg is not non-null */
+  /* removed line */
   scanf ("%"); /* { dg-warning "trailing" "trailing % warning" } */
   scanf ("%d", (int *)0); /* { dg-warning "null" "writing into NULL" } */
 }

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/format/strfmon-1.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/format/strfmon-1.c?rev=82305&r1=82304&r2=82305&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/format/strfmon-1.c (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/format/strfmon-1.c Fri Sep 18 18:20:23 2009
@@ -56,7 +56,8 @@
   /* Miscellaneous bogus formats.  */
   strfmon (s, m, "%n%n", d); /* { dg-warning "arguments" "too few args" } */
   strfmon (s, m, ""); /* { dg-warning "zero-length" "empty" } */
-  strfmon (s, m, NULL); /* { dg-warning "null" "null format string" } */
+  /* APPLE LOCAL 6821124 string arg is not non-null */
+  /* removed line */
   strfmon (s, m, "%"); /* { dg-warning "trailing" "tailing %" } */
   strfmon (s, m, "%n\0", d); /* { dg-warning "embedded" "embedded NUL" } */
   strfmon (s, m, "%^^n", d); /* { dg-warning "repeated" "repeated flag" } */

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/nonnull-3.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/nonnull-3.c?rev=82305&r1=82304&r2=82305&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/nonnull-3.c (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/nonnull-3.c Fri Sep 18 18:20:23 2009
@@ -66,16 +66,12 @@
   __builtin_nansf (NULL);  /* { dg-warning "null" "null pointer check" } */
   __builtin_nansl (NULL);  /* { dg-warning "null" "null pointer check" } */
 
-  __builtin_puts (NULL);  /* { dg-warning "null" "null pointer check" } */
+  /* APPLE LOCAL begin 6821124 puts string arg is not non-null */
   __builtin_fputc (*s, NULL);  /* { dg-warning "null" "null pointer check" } */
-  __builtin_fputs (s, NULL);  /* { dg-warning "null" "null pointer check" } */
-  __builtin_fputs (NULL, p);  /* { dg-warning "null" "null pointer check" } */
   __builtin_fwrite (s, 16, 16, NULL);  /* { dg-warning "null" "null pointer check" } */
   __builtin_fwrite (NULL, 16, 16, p);  /* { dg-warning "null" "null pointer check" } */
-  __builtin_puts_unlocked (NULL);  /* { dg-warning "null" "null pointer check" } */
   __builtin_fputc_unlocked (*s, NULL);  /* { dg-warning "null" "null pointer check" } */
-  __builtin_fputs_unlocked (s, NULL);  /* { dg-warning "null" "null pointer check" } */
-  __builtin_fputs_unlocked (NULL, p);  /* { dg-warning "null" "null pointer check" } */
+  /* APPLE LOCAL end 6821124 puts string arg is not non-null */
   __builtin_fwrite_unlocked (s, 16, 16, NULL);  /* { dg-warning "null" "null pointer check" } */
   __builtin_fwrite_unlocked (NULL, 16, 16, p);  /* { dg-warning "null" "null pointer check" } */
 

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/sibcall-3.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/sibcall-3.c?rev=82305&r1=82304&r2=82305&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/sibcall-3.c (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/sibcall-3.c Fri Sep 18 18:20:23 2009
@@ -9,6 +9,8 @@
 /* { dg-options "-O2 -foptimize-sibling-calls" } */
 /* APPLE LOCAL ARM 5798689 sibcalls not implemented for Thumb mode */
 /* { dg-skip-if "" { arm-*-darwin* } { "-mthumb" } { "" } } */
+/* APPLE LOCAL v7 merge. thumb mode is default for Darwin v7a */
+/* { dg-skip-if "" { arm-*-darwin* } { "-march=armv7a" } { "" } } */
 
 /* The option -foptimize-sibling-calls is the default, but serves as
    marker.  This test is xfailed on targets without sibcall patterns

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/sibcall-4.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/sibcall-4.c?rev=82305&r1=82304&r2=82305&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/sibcall-4.c (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/sibcall-4.c Fri Sep 18 18:20:23 2009
@@ -9,6 +9,8 @@
 /* { dg-options "-O2 -foptimize-sibling-calls" } */
 /* APPLE LOCAL ARM 5798689 sibcalls not implemented for Thumb mode */
 /* { dg-skip-if "" { arm-*-darwin* } { "-mthumb" } { "" } } */
+/* APPLE LOCAL v7 merge. thumb mode is default for Darwin v7a */
+/* { dg-skip-if "" { arm-*-darwin* } { "-march=armv7a" } { "" } } */
 
 /* The option -foptimize-sibling-calls is the default, but serves as
    marker.  This test is xfailed on targets without sibcall patterns

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/vect/tree-vect.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/vect/tree-vect.h?rev=82305&r1=82304&r2=82305&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/vect/tree-vect.h (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/vect/tree-vect.h Fri Sep 18 18:20:23 2009
@@ -21,6 +21,20 @@
   asm volatile (".byte 0xf2,0x0f,0x10,0xc0");
 #elif defined(__sparc__)
   asm volatile (".word\t0x81b007c0");
+/* APPLE LOCAL begin v7 merge */
+#elif defined(__arm__)
+  {
+    /* On some processors without NEON support, this instruction may
+       be a no-op, on others it may trap, so check that it executes
+       correctly.  */
+    long long a = 0, b = 1;
+    asm ("vorr %P0, %P1, %P2"
+	 : "=w" (a)
+	 : "0" (a), "w" (b));
+    if (a != 1)
+      exit (0);
+  }
 #endif
+/* APPLE LOCAL end v7 merge */
   signal (SIGILL, SIG_DFL);
 }

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/vect/vect.exp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/vect/vect.exp?rev=82305&r1=82304&r2=82305&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/vect/vect.exp (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.dg/vect/vect.exp Fri Sep 18 18:20:23 2009
@@ -73,6 +73,15 @@
     }
 } elseif [istarget "ia64-*-*"] {
     set dg-do-what-default run
+# APPLE LOCAL begin v7 merge
+} elseif [is-effective-target arm_neon_ok] {
+    lappend DEFAULT_VECTCFLAGS "-mfpu=neon" "-mfloat-abi=softfp"
+    if [is-effective-target arm_neon_hw] {
+	set dg-do-what-default run
+    } else {
+	set dg-do-what-default compile
+    }
+# APPLE LOCAL end v7 merge
 } else {
     return
 }

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/lib/target-supports.exp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/lib/target-supports.exp?rev=82305&r1=82304&r2=82305&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/lib/target-supports.exp (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/lib/target-supports.exp Fri Sep 18 18:20:23 2009
@@ -1263,13 +1263,16 @@
 	verbose "check_effective_target_vect_int: using cached result" 2
     } else {
 	set et_vect_int_saved 0
+# APPLE LOCAL begin v7 merge
 	if { [istarget i?86-*-*]
 	      || [istarget powerpc*-*-*]
 	      || [istarget spu-*-*]
 	      || [istarget x86_64-*-*]
 	      || [istarget sparc*-*-*]
 	      || [istarget alpha*-*-*]
-	      || [istarget ia64-*-*] } {
+	      || [istarget ia64-*-*] 
+	      || [check_effective_target_arm32] } {
+# APPLE LOCAL end v7 merge
 	   set et_vect_int_saved 1
 	}
     }
@@ -1303,7 +1306,8 @@
 	verbose "check-effective_target_arm32: using cached result" 2
     } else {
 	set et_arm32_saved 0
-	if { [istarget arm-*-*]
+# APPLE LOCAL v7 merge
+	if { [istarget arm*-*-*]
 	      || [istarget strongarm*-*-*]
 	      || [istarget xscale-*-*] } {
 	    if ![string match "*-mthumb *" $compiler_flags] {
@@ -1319,31 +1323,44 @@
 # -mfloat-abi=softfp.  Some multilibs may be incompatible with these
 # options.
 
+# APPLE LOCAL begin check for FP needs to be sensitive to thumb vs thumb2
 proc check_effective_target_arm_vfp_ok { } {
-    if { [check_effective_target_arm32] } {
-	return [check_no_compiler_messages arm_vfp_ok object {
-	    int dummy;
-	} "-mfpu=vfp -mfloat-abi=softfp"]
-    } else {
-	return 0
-    }
+    global compiler_flags
+    global TOOL_OPTIONS
+    set compiler_flags ""
+    # If running a subset of the test suite, $TOOL_OPTIONS may not exist.
+    catch {append compiler_flags " $TOOL_OPTIONS "}
+    return [check_no_messages_and_pattern arm_vfp_ok \
+		"ARM_VFP_OK" assembly " 
+		   #if __VFP_FP__ && (!__thumb__ || __thumb2__)
+		   #define ARM_VFP_OK 1
+		   #endif 
+		" "$compiler_flags -mfpu=vfp -mfloat-abi=softfp -E -Wp,-dD,-dM"]
 }
 
-# LLVM LOCAL begin
 # Return 1 if this is an ARM target supporting -mfpu=neon
 # -mfloat-abi=softfp.  Some multilibs may be incompatible with these
 # options.
 
 proc check_effective_target_arm_neon_ok { } {
-    if { [check_effective_target_arm32] } {
-        return [check_no_compiler_messages arm_neon_ok object {
-            int dummy;
-        } "-mfpu=neon -mfloat-abi=softfp"]
-    } else {
-        return 0
+    global compiler_flags
+    global TOOL_OPTIONS
+    set compiler_flags ""
+    if { [istarget arm*-*-*] } {
+      # If running a subset of the test suite, $TOOL_OPTIONS may not exist.
+      catch {append compiler_flags " $TOOL_OPTIONS "}
+      return [check_no_messages_and_pattern arm_neon_ok \
+		  "ARM_NEON_OK" assembly " 
+		     #if __ARM_NEON__ && (!__thumb__ || __thumb2__)
+		     #define ARM_NEON_OK 1
+		     #endif 
+		  " "$compiler_flags -mfpu=neon -mfloat-abi=softfp -E -Wp,-dD,-dM"]
     }
+  return 0;
 }
+# APPLE LOCAL end check for FP needs to be sensitive to thumb vs thumb2
 
+# APPLE LOCAL begin v7 merge
 # Return 1 if the target supports executing NEON instructions, 0
 # otherwise.  Cache the result.
 
@@ -1352,52 +1369,51 @@
     global tool
 
     if [info exists arm_neon_hw_available_saved] {
-        verbose "check_arm_neon_hw_available  returning saved $arm_neon_hw_available_saved" 2
+	verbose "check_arm_neon_hw_available  returning saved $arm_neon_hw_available_saved" 2
     } else {
-        set arm_neon_hw_available_saved 0
+	set arm_neon_hw_available_saved 0
 
-        # Set up, compile, and execute a test program containing NEON
-        # instructions.  Include the current process ID in the file
-        # names to prevent conflicts with invocations for multiple
-        # testsuites.
-        set src neon[pid].c
-        set exe neon[pid].x
-
-        set f [open $src "w"]
-        puts $f "int main() {"
-        puts $f "  long long a = 0, b = 1;"
-        puts $f "  asm (\"vorr %P0, %P1, %P2\""
-        puts $f "       : \"=w\" (a)"
-        puts $f "       : \"0\" (a), \"w\" (b));"
-        puts $f "  return (a != 1);"
-        puts $f "}"
-        close $f
-
-        set opts "additional_flags=-mfpu=neon additional_flags=-mfloat-abi=softfp"
-
-        verbose "check_arm_neon_hw_available  compiling testfile $src" 2
-        set lines [${tool}_target_compile $src $exe executable "$opts"]
-        file delete $src
-
-        if [string match "" $lines] then {
-            # No error message, compilation succeeded.
-            set result [${tool}_load "./$exe" "" ""]
-            set status [lindex $result 0]
-            remote_file build delete $exe
-            verbose "check_arm_neon_hw_available testfile status is <$status>" 2
-
-            if { $status == "pass" } then {
-                set arm_neon_hw_available_saved 1
-            }
-        } else {
-            verbose "check_arm_neon_hw_available testfile compilation failed" 2
-        }
+	# Set up, compile, and execute a test program containing NEON
+	# instructions.  Include the current process ID in the file
+	# names to prevent conflicts with invocations for multiple
+	# testsuites.
+	set src neon[pid].c
+	set exe neon[pid].x
+
+	set f [open $src "w"]
+	puts $f "int main() {"
+	puts $f "  long long a = 0, b = 1;"
+	puts $f "  asm (\"vorr %P0, %P1, %P2\""
+	puts $f "       : \"=w\" (a)"
+	puts $f "       : \"0\" (a), \"w\" (b));"
+	puts $f "  return (a != 1);"
+	puts $f "}"
+	close $f
+
+	set opts "additional_flags=-mfpu=neon additional_flags=-mfloat-abi=softfp"
+
+	verbose "check_arm_neon_hw_available  compiling testfile $src" 2
+	set lines [${tool}_target_compile $src $exe executable "$opts"]
+	file delete $src
+
+	if [string match "" $lines] then {
+	    # No error message, compilation succeeded.
+	    set result [${tool}_load "./$exe" "" ""]
+	    set status [lindex $result 0]
+	    remote_file build delete $exe
+	    verbose "check_arm_neon_hw_available testfile status is <$status>" 2
+
+	    if { $status == "pass" } then {
+		set arm_neon_hw_available_saved 1
+	    }
+	} else {
+	    verbose "check_arm_neon_hw_availalble testfile compilation failed" 2
+	}
     }
 
     return $arm_neon_hw_available_saved
 }
-# LLVM LOCAL end
-
+# APPLE LOCAL end v7 merge
 # Return 1 if this is a PowerPC target with floating-point registers.
 
 proc check_effective_target_powerpc_fprs { } {
@@ -1473,10 +1489,13 @@
 	verbose "check_effective_target_vect_shift: using cached result" 2
     } else {
 	set et_vect_shift_saved 0
+# APPLE LOCAL begin v7 merge
 	if { [istarget powerpc*-*-*]
 	     || [istarget ia64-*-*]
 	     || [istarget i?86-*-*]
-	     || [istarget x86_64-*-*] } {
+	     || [istarget x86_64-*-*]
+	     || [check_effective_target_arm32] } {
+# APPLE LOCAL end v7 merge
 	   set et_vect_shift_saved 1
 	}
     }
@@ -1490,10 +1509,13 @@
 # This can change for different subtargets so do not cache the result.
 
 proc check_effective_target_vect_long { } {
+# APPLE LOCAL begin v7 merge
     if { [istarget i?86-*-*]
 	 || ([istarget powerpc*-*-*] && [check_effective_target_ilp32])
 	 || [istarget x86_64-*-*]
+	 || [check_effective_target_arm32]
 	 || ([istarget sparc*-*-*] && [check_effective_target_ilp32]) } {
+# APPLE LOCAL end v7 merge
 	set answer 1
     } else {
 	set answer 0
@@ -1514,12 +1536,15 @@
 	verbose "check_effective_target_vect_float: using cached result" 2
     } else {
 	set et_vect_float_saved 0
+# APPLE LOCAL begin v7 merge
 	if { [istarget i?86-*-*]
 	      || [istarget powerpc*-*-*]
 	      || [istarget spu-*-*]
 	      || [istarget mipsisa64*-*-*]
 	      || [istarget x86_64-*-*]
-	      || [istarget ia64-*-*] } {
+	      || [istarget ia64-*-*]
+	      || [check_effective_target_arm32] } {
+# APPLE LOCAL end v7 merge
 	   set et_vect_float_saved 1
 	}
     }
@@ -1809,9 +1834,12 @@
 	verbose "check_effective_target_vect_no_align: using cached result" 2
     } else {
 	set et_vect_no_align_saved 0
+# APPLE LOCAL begin v7 merge
 	if { [istarget mipsisa64*-*-*]
 	     || [istarget sparc*-*-*]
-	     || [istarget ia64-*-*] } {
+	     || [istarget ia64-*-*]
+	     || [check_effective_target_arm32] } {
+# APPLE LOCAL end v7 merge
 	    set et_vect_no_align_saved 1
 	}
     }
@@ -1912,9 +1940,12 @@
 	verbose "check_effective_target_vect_int_mult: using cached result" 2
     } else {
 	set et_vect_int_mult_saved 0
+# APPLE LOCAL begin v7 merge
 	if { [istarget powerpc*-*-*]
 	     || [istarget i?86-*-*]
-	     || [istarget x86_64-*-*] } {
+	     || [istarget x86_64-*-*]
+	     || [check_effective_target_arm32] } {
+# APPLE LOCAL end v7 merge
 	   set et_vect_int_mult_saved 1
 	}
     }

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/objc-property-enumtype.mm
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/obj-c%2B%2B.dg/objc-property-enumtype.mm?rev=82305&r1=82304&r2=82305&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/objc-property-enumtype.mm (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/objc-property-enumtype.mm Fri Sep 18 18:20:23 2009
@@ -2,7 +2,9 @@
 /* Test that property of enum types don't cause error
    when setter call is generated. */
 /* { dg-do run { target *-*-darwin* } } */ 
-/* { dg-options "-framework Foundation -Werror" } */
+/* { dg-options "-framework Foundation -Werror" { target arm*-*-darwin* } } */
+/* { dg-options "-mmacosx-version-min=10.5 -framework Foundation -Werror" { target i?86-*-darwin* } } */
+/* { dg-options "-mmacosx-version-min=10.5 -framework Foundation -Werror" { target powerpc*-*-darwin* } } */
 
 #import <Foundation/Foundation.h>
 

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/property-synthesize-ivar-6.mm
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/obj-c%2B%2B.dg/property-synthesize-ivar-6.mm?rev=82305&r1=82304&r2=82305&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/property-synthesize-ivar-6.mm (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/property-synthesize-ivar-6.mm Fri Sep 18 18:20:23 2009
@@ -20,7 +20,7 @@
 @end
 
 @implementation Test6
- at synthesize prop;  /* { dg-error "property \\'prop\\' attempting to use ivar \\'prop\\' in super class \\'Test6\\'" } */
+ at synthesize prop;  /* { dg-error "property \\'prop\\' attempting to use ivar \\'prop\\' declared in super class of \\'Test6\\'" } */
 @end
 
 #endif

Modified: llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc-property-enumtype.m
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc-property-enumtype.m?rev=82305&r1=82304&r2=82305&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc-property-enumtype.m (original)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc-property-enumtype.m Fri Sep 18 18:20:23 2009
@@ -2,7 +2,9 @@
 /* Test that property of enum types don't cause error
    when setter call is generated. */
 /* { dg-do run { target *-*-darwin* } } */ 
-/* { dg-options "-framework Foundation -Werror" } */
+/* { dg-options "-framework Foundation -Werror" { target arm*-*-darwin* } } */
+/* { dg-options "-mmacosx-version-min=10.5 -framework Foundation -Werror" { target i?86-*-darwin* } } */
+/* { dg-options "-mmacosx-version-min=10.5 -framework Foundation -Werror" { target powerpc*-*-darwin* } } */
 
 #import <Foundation/Foundation.h>
 





More information about the llvm-commits mailing list