[cfe-commits] r66911 - in /cfe/trunk: include/clang/Driver/Types.def lib/Driver/Driver.cpp lib/Driver/Types.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Fri Mar 13 12:46:02 2009
New Revision: 66911

URL: http://llvm.org/viewvc/llvm-project?rev=66911&view=rev
Log:
Driver: Some minor bug fixes.
 - language recognition was recognizing prefixes incorrectly.
 - -x none wasn't working.
 - test for "can lipo" was backwords.
 - missed a '"' in -ccc-print-phases

Modified:
    cfe/trunk/include/clang/Driver/Types.def
    cfe/trunk/lib/Driver/Driver.cpp
    cfe/trunk/lib/Driver/Types.cpp

Modified: cfe/trunk/include/clang/Driver/Types.def
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/Types.def?rev=66911&r1=66910&r2=66911&view=diff

==============================================================================
--- cfe/trunk/include/clang/Driver/Types.def (original)
+++ cfe/trunk/include/clang/Driver/Types.def Fri Mar 13 12:46:02 2009
@@ -74,4 +74,4 @@
 TYPE("object",                   Object,       INVALID,         "o",     "")
 TYPE("treelang",                 Treelang,     INVALID,         0,       "u")
 TYPE("image",                    Image,        INVALID,         "out",   "")
-TYPE("nothing",                  Nothing,      INVALID,         0,       "")
+TYPE("none",                     Nothing,      INVALID,         0,       "u")

Modified: cfe/trunk/lib/Driver/Driver.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Driver.cpp?rev=66911&r1=66910&r2=66911&view=diff

==============================================================================
--- cfe/trunk/lib/Driver/Driver.cpp (original)
+++ cfe/trunk/lib/Driver/Driver.cpp Fri Mar 13 12:46:02 2009
@@ -243,7 +243,7 @@
   
   os << Action::getClassName(A->getKind()) << ", ";
   if (InputAction *IA = dyn_cast<InputAction>(A)) {    
-    os << IA->getInputArg().getValue(Args) << "\"";
+    os << "\"" << IA->getInputArg().getValue(Args) << "\"";
   } else if (BindArchAction *BIA = dyn_cast<BindArchAction>(A)) {
     os << "\"" << BIA->getArchName() << "\", "
        << "{" << PrintActions1(Args, *BIA->begin(), Ids) << "}";
@@ -326,7 +326,7 @@
     // include the arch, which would also fix
     // -save-temps. Compatibility wins for now.
 
-    if (Archs.size() > 1 && types::canLipoType(Act->getType()))
+    if (Archs.size() > 1 && !types::canLipoType(Act->getType()))
       Diag(clang::diag::err_drv_invalid_output_with_multiple_archs)
         << types::getTypeName(Act->getType());
 

Modified: cfe/trunk/lib/Driver/Types.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Types.cpp?rev=66911&r1=66910&r2=66911&view=diff

==============================================================================
--- cfe/trunk/lib/Driver/Types.cpp (original)
+++ cfe/trunk/lib/Driver/Types.cpp Fri Mar 13 12:46:02 2009
@@ -122,7 +122,7 @@
   for (unsigned i=0; i<numTypes; ++i) {
     types::ID Id = (types::ID) (i + 1);
     if (canTypeBeUserSpecified(Id) && 
-        memcmp(Name, getInfo(Id).Name, N) == 0)
+        memcmp(Name, getInfo(Id).Name, N + 1) == 0)
       return Id;
   }