[llvm-branch-commits] [cfe-branch] r85413 - in /cfe/branches/Apple/Dib: test/Coverage/targets.c test/Frontend/mmacosx-version-min-test.c tools/clang-cc/clang-cc.cpp

[Ted Kremenek]

Author: kremenek
Date: Wed Oct 28 13:34:13 2009
New Revision: 85413

URL: http://llvm.org/viewvc/llvm-project?rev=85413&view=rev
Log:
Merge in r85132.

Removed:
    cfe/branches/Apple/Dib/test/Frontend/mmacosx-version-min-test.c
Modified:
    cfe/branches/Apple/Dib/test/Coverage/targets.c
    cfe/branches/Apple/Dib/tools/clang-cc/clang-cc.cpp

Modified: cfe/branches/Apple/Dib/test/Coverage/targets.c
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/Dib/test/Coverage/targets.c?rev=85413&r1=85412&r2=85413&view=diff

==============================================================================
--- cfe/branches/Apple/Dib/test/Coverage/targets.c (original)
+++ cfe/branches/Apple/Dib/test/Coverage/targets.c Wed Oct 28 13:34:13 2009
@@ -15,4 +15,8 @@
 // RUN: clang-cc -g -triple sparc-unknown-unknown -emit-llvm -o %t %s &&
 // RUN: clang-cc -g -triple sparc-unknown-solaris -emit-llvm -o %t %s &&
 // RUN: clang-cc -g -triple pic16-unknown-unknown -emit-llvm -o %t %s &&
+
+// <rdar://problem/7181838> clang 1.0 fails to compile Python 2.6
+// RUN: clang-cc -g -triple x86_64-apple-darwin9 -emit-llvm -o %t %s -mmacosx-version-min=10.4 &&
+
 // RUN: true

Removed: cfe/branches/Apple/Dib/test/Frontend/mmacosx-version-min-test.c
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/Dib/test/Frontend/mmacosx-version-min-test.c?rev=85412&view=auto

==============================================================================
--- cfe/branches/Apple/Dib/test/Frontend/mmacosx-version-min-test.c (original)
+++ cfe/branches/Apple/Dib/test/Frontend/mmacosx-version-min-test.c (removed)
@@ -1 +0,0 @@
-// RUN: not clang-cc -fsyntax-only -mmacosx-version-min=10.4 -triple=x86_64-apple-darwin %s

Modified: cfe/branches/Apple/Dib/tools/clang-cc/clang-cc.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/Dib/tools/clang-cc/clang-cc.cpp?rev=85413&r1=85412&r2=85413&view=diff

==============================================================================
--- cfe/branches/Apple/Dib/tools/clang-cc/clang-cc.cpp (original)
+++ cfe/branches/Apple/Dib/tools/clang-cc/clang-cc.cpp Wed Oct 28 13:34:13 2009
@@ -903,14 +903,6 @@
             MacOSVersionMin.c_str());
     exit(1);
   }
-  else if (VersionNum <= 4 && 
-           !strncmp(Triple.c_str(), "x86_64", strlen("x86_64"))) {
-    fprintf(stderr, 
-        "-mmacosx-version-min=%s is invalid with -arch x86_64.\n",
-            MacOSVersionMin.c_str());
-    exit(1);
-  }
-
 }
 
 static llvm::cl::opt<std::string>