diff options
| -rw-r--r-- | include/clang/Driver/Types.def | 2 | ||||
| -rw-r--r-- | lib/Driver/Driver.cpp | 4 | ||||
| -rw-r--r-- | lib/Driver/Types.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/clang/Driver/Types.def b/include/clang/Driver/Types.def index 27b5526261..7b1789f0d8 100644 --- a/include/clang/Driver/Types.def +++ b/include/clang/Driver/Types.def @@ -74,4 +74,4 @@ TYPE("precompiled-header", PCH, INVALID, "gch", "A") 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") diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp index fcfa9adca4..b48d01c699 100644 --- a/lib/Driver/Driver.cpp +++ b/lib/Driver/Driver.cpp @@ -243,7 +243,7 @@ static unsigned PrintActions1(const ArgList &Args, 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 @@ void Driver::BuildUniversalActions(ArgList &Args, ActionList &Actions) { // 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()); diff --git a/lib/Driver/Types.cpp b/lib/Driver/Types.cpp index 96d76dd4d6..cef5c811b7 100644 --- a/lib/Driver/Types.cpp +++ b/lib/Driver/Types.cpp @@ -122,7 +122,7 @@ types::ID types::lookupTypeForTypeSpecifier(const char *Name) { 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; } |