diff options
| -rw-r--r-- | include/clang/Driver/Options.td | 4 | ||||
| -rw-r--r-- | lib/Driver/Driver.cpp | 4 | ||||
| -rw-r--r-- | lib/Driver/ToolChains/Clang.cpp | 4 | ||||
| -rw-r--r-- | lib/Driver/Types.cpp | 2 | ||||
| -rw-r--r-- | lib/Frontend/CompilerInvocation.cpp | 6 | ||||
| -rw-r--r-- | lib/Frontend/InterfaceStubFunctionsConsumer.cpp | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/include/clang/Driver/Options.td b/include/clang/Driver/Options.td index 41110cc1a1..22676b6787 100644 --- a/include/clang/Driver/Options.td +++ b/include/clang/Driver/Options.td @@ -631,12 +631,12 @@ def emit_ast : Flag<["-"], "emit-ast">, HelpText<"Emit Clang AST files for source inputs">; def emit_llvm : Flag<["-"], "emit-llvm">, Flags<[CC1Option]>, Group<Action_Group>, HelpText<"Use the LLVM representation for assembler and object files">; -def emit_iterface_stubs : Flag<["-"], "emit-interface-stubs">, Flags<[CC1Option]>, Group<Action_Group>, +def emit_interface_stubs : Flag<["-"], "emit-interface-stubs">, Flags<[CC1Option]>, Group<Action_Group>, HelpText<"Generate Inteface Stub Files.">; def emit_merged_ifs : Flag<["-"], "emit-merged-ifs">, Flags<[CC1Option]>, Group<Action_Group>, HelpText<"Generate Interface Stub Files, emit merged text not binary.">; -def iterface_stub_version_EQ : JoinedOrSeparate<["-"], "interface-stub-version=">, Flags<[CC1Option]>; +def interface_stub_version_EQ : JoinedOrSeparate<["-"], "interface-stub-version=">, Flags<[CC1Option]>; def exported__symbols__list : Separate<["-"], "exported_symbols_list">; def e : JoinedOrSeparate<["-"], "e">, Group<Link_Group>; def fPIC : Flag<["-"], "fPIC">, Group<f_Group>; diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp index 51c262aa0a..222efd5249 100644 --- a/lib/Driver/Driver.cpp +++ b/lib/Driver/Driver.cpp @@ -291,7 +291,7 @@ phases::ID Driver::getFinalPhase(const DerivedArgList &DAL, FinalPhase = phases::Compile; // clang interface stubs - } else if ((PhaseArg = DAL.getLastArg(options::OPT_emit_iterface_stubs))) { + } else if ((PhaseArg = DAL.getLastArg(options::OPT_emit_interface_stubs))) { FinalPhase = phases::IfsMerge; // -S only runs up to the backend. @@ -3575,7 +3575,7 @@ Action *Driver::ConstructPhaseAction( return C.MakeAction<CompileJobAction>(Input, types::TY_ModuleFile); if (Args.hasArg(options::OPT_verify_pch)) return C.MakeAction<VerifyPCHJobAction>(Input, types::TY_Nothing); - if (Args.hasArg(options::OPT_emit_iterface_stubs)) + if (Args.hasArg(options::OPT_emit_interface_stubs)) return C.MakeAction<CompileJobAction>(Input, types::TY_IFS_CPP); return C.MakeAction<CompileJobAction>(Input, types::TY_LLVM_BC); } diff --git a/lib/Driver/ToolChains/Clang.cpp b/lib/Driver/ToolChains/Clang.cpp index 69ab1791b9..74c698f776 100644 --- a/lib/Driver/ToolChains/Clang.cpp +++ b/lib/Driver/ToolChains/Clang.cpp @@ -3686,8 +3686,8 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, } else if (JA.getType() == types::TY_IFS || JA.getType() == types::TY_IFS_CPP) { StringRef ArgStr = - Args.hasArg(options::OPT_iterface_stub_version_EQ) - ? Args.getLastArgValue(options::OPT_iterface_stub_version_EQ) + Args.hasArg(options::OPT_interface_stub_version_EQ) + ? Args.getLastArgValue(options::OPT_interface_stub_version_EQ) : "experimental-ifs-v1"; CmdArgs.push_back("-emit-interface-stubs"); CmdArgs.push_back( diff --git a/lib/Driver/Types.cpp b/lib/Driver/Types.cpp index 6241fac0c8..a30710645a 100644 --- a/lib/Driver/Types.cpp +++ b/lib/Driver/Types.cpp @@ -321,7 +321,7 @@ void types::getCompilationPhases(const clang::driver::Driver &Driver, [](phases::ID Phase) { return Phase <= phases::Precompile; }); // Treat Interface Stubs like its own compilation mode. - else if (DAL.getLastArg(options::OPT_emit_iterface_stubs)) { + else if (DAL.getLastArg(options::OPT_emit_interface_stubs)) { llvm::SmallVector<phases::ID, phases::MaxNumberOfPhases> IfsModePhaseList; llvm::SmallVector<phases::ID, phases::MaxNumberOfPhases> &PL = PhaseList; phases::ID LastPhase = phases::IfsMerge; diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp index b9f8e77fb3..3c0fc391ea 100644 --- a/lib/Frontend/CompilerInvocation.cpp +++ b/lib/Frontend/CompilerInvocation.cpp @@ -1736,10 +1736,10 @@ static InputKind ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args, Opts.ProgramAction = frontend::GenerateHeaderModule; break; case OPT_emit_pch: Opts.ProgramAction = frontend::GeneratePCH; break; - case OPT_emit_iterface_stubs: { + case OPT_emit_interface_stubs: { StringRef ArgStr = - Args.hasArg(OPT_iterface_stub_version_EQ) - ? Args.getLastArgValue(OPT_iterface_stub_version_EQ) + Args.hasArg(OPT_interface_stub_version_EQ) + ? Args.getLastArgValue(OPT_interface_stub_version_EQ) : "experimental-ifs-v1"; if (ArgStr == "experimental-yaml-elf-v1" || ArgStr == "experimental-tapi-elf-v1") { diff --git a/lib/Frontend/InterfaceStubFunctionsConsumer.cpp b/lib/Frontend/InterfaceStubFunctionsConsumer.cpp index 5e6cc65e02..5ce7a36ac9 100644 --- a/lib/Frontend/InterfaceStubFunctionsConsumer.cpp +++ b/lib/Frontend/InterfaceStubFunctionsConsumer.cpp @@ -271,7 +271,7 @@ public: switch (Symbol.Type) { default: llvm_unreachable( - "clang -emit-iterface-stubs: Unexpected symbol type."); + "clang -emit-interface-stubs: Unexpected symbol type."); case llvm::ELF::STT_NOTYPE: OS << "NoType"; break; |