Driver: Fix a number of option definition mismatches (flags instead of
separate, or vice versa).
Also, fix initialization of LinkingOutput variable.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@67757 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp
index 94b33ff..6202702 100644
--- a/lib/Driver/Driver.cpp
+++ b/lib/Driver/Driver.cpp
@@ -547,7 +547,7 @@
// Reject -Z* at the top level, these options should never have been
// exposed by gcc.
- if (Arg *A = Args.getLastArg(options::OPT_Z))
+ if (Arg *A = Args.getLastArg(options::OPT_Z_Joined))
Diag(clang::diag::err_drv_use_of_Z_option) << A->getAsString(Args);
// Construct the actions to perform.
@@ -693,7 +693,7 @@
// FIXME: This is a hack; find a cleaner way to integrate this
// into the process.
const char *LinkingOutput = 0;
- if (isa<LinkJobAction>(A)) {
+ if (isa<LipoJobAction>(A)) {
if (FinalOutput)
LinkingOutput = FinalOutput->getValue(C.getArgs());
else