Index: lld/trunk/COFF/LTO.cpp =================================================================== --- lld/trunk/COFF/LTO.cpp +++ lld/trunk/COFF/LTO.cpp @@ -43,7 +43,7 @@ static std::unique_ptr createLTO() { lto::Config C; - C.Options = InitTargetOptionsFromCodeGenFlags(); + C.Options = initTargetOptionsFromCodeGenFlags(); // Always emit a section per function/datum with LTO. LLVM LTO should get most // of the benefit of linker GC, but there are still opportunities for ICF. @@ -60,8 +60,8 @@ C.DisableVerify = true; C.DiagHandler = diagnosticHandler; C.OptLevel = Config->LTOO; - C.CPU = GetCPUStr(); - C.MAttrs = GetMAttrs(); + C.CPU = getCPUStr(); + C.MAttrs = getMAttrs(); C.CGOptLevel = args::getCGOptLevel(Config->LTOO); if (Config->SaveTemps) Index: lld/trunk/Common/TargetOptionsCommandFlags.cpp =================================================================== --- lld/trunk/Common/TargetOptionsCommandFlags.cpp +++ lld/trunk/Common/TargetOptionsCommandFlags.cpp @@ -19,16 +19,17 @@ #include "llvm/Target/TargetOptions.h" // Define an externally visible version of -// InitTargetOptionsFromCodeGenFlags, so that its functionality can be +// initTargetOptionsFromCodeGenFlags, so that its functionality can be // used without having to include llvm/CodeGen/CommandFlags.inc, which // would lead to multiple definitions of the command line flags. -llvm::TargetOptions lld::InitTargetOptionsFromCodeGenFlags() { +llvm::TargetOptions lld::initTargetOptionsFromCodeGenFlags() { return ::InitTargetOptionsFromCodeGenFlags(); } -llvm::Optional lld::GetCodeModelFromCMModel() { +llvm::Optional lld::getCodeModelFromCMModel() { return getCodeModel(); } -std::string lld::GetCPUStr() { return ::getCPUStr(); } -std::vector lld::GetMAttrs() { return ::MAttrs; } +std::string lld::getCPUStr() { return ::getCPUStr(); } + +std::vector lld::getMAttrs() { return ::MAttrs; } Index: lld/trunk/ELF/LTO.cpp =================================================================== --- lld/trunk/ELF/LTO.cpp +++ lld/trunk/ELF/LTO.cpp @@ -68,7 +68,7 @@ lto::Config C; // LLD supports the new relocations and address-significance tables. - C.Options = InitTargetOptionsFromCodeGenFlags(); + C.Options = initTargetOptionsFromCodeGenFlags(); C.Options.RelaxELFRelocations = true; C.Options.EmitAddrsig = true; @@ -83,12 +83,12 @@ else C.RelocModel = Reloc::Static; - C.CodeModel = GetCodeModelFromCMModel(); + C.CodeModel = getCodeModelFromCMModel(); C.DisableVerify = Config->DisableVerify; C.DiagHandler = diagnosticHandler; C.OptLevel = Config->LTOO; - C.CPU = GetCPUStr(); - C.MAttrs = GetMAttrs(); + C.CPU = getCPUStr(); + C.MAttrs = getMAttrs(); C.CGOptLevel = args::getCGOptLevel(Config->LTOO); // Set up a custom pipeline if we've been asked to. Index: lld/trunk/include/lld/Common/TargetOptionsCommandFlags.h =================================================================== --- lld/trunk/include/lld/Common/TargetOptionsCommandFlags.h +++ lld/trunk/include/lld/Common/TargetOptionsCommandFlags.h @@ -15,8 +15,8 @@ #include "llvm/Target/TargetOptions.h" namespace lld { -llvm::TargetOptions InitTargetOptionsFromCodeGenFlags(); -llvm::Optional GetCodeModelFromCMModel(); -std::string GetCPUStr(); -std::vector GetMAttrs(); +llvm::TargetOptions initTargetOptionsFromCodeGenFlags(); +llvm::Optional getCodeModelFromCMModel(); +std::string getCPUStr(); +std::vector getMAttrs(); } Index: lld/trunk/wasm/LTO.cpp =================================================================== --- lld/trunk/wasm/LTO.cpp +++ lld/trunk/wasm/LTO.cpp @@ -41,7 +41,7 @@ static std::unique_ptr createLTO() { lto::Config C; - C.Options = InitTargetOptionsFromCodeGenFlags(); + C.Options = initTargetOptionsFromCodeGenFlags(); // Always emit a section per function/data with LTO. C.Options.FunctionSections = true; @@ -53,7 +53,7 @@ C.DisableVerify = Config->DisableVerify; C.DiagHandler = diagnosticHandler; C.OptLevel = Config->LTOO; - C.MAttrs = GetMAttrs(); + C.MAttrs = getMAttrs(); C.CGOptLevel = args::getCGOptLevel(Config->LTOO); if (Config->Relocatable)