Index: clang/include/clang/Driver/ToolChain.h =================================================================== --- clang/include/clang/Driver/ToolChain.h +++ clang/include/clang/Driver/ToolChain.h @@ -579,7 +579,7 @@ /// This routine is responsible for adding the necessary cc1 arguments to /// include headers from standard system header directories. virtual void - AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, + addClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const; /// Add options that need to be passed to cc1 for this target. Index: clang/lib/Driver/ToolChain.cpp =================================================================== --- clang/lib/Driver/ToolChain.cpp +++ clang/lib/Driver/ToolChain.cpp @@ -752,7 +752,7 @@ return D.SysRoot; } -void ToolChain::AddClangSystemIncludeArgs(const ArgList &DriverArgs, +void ToolChain::addClangSystemIncludeArgs(const ArgList &DriverArgs, ArgStringList &CC1Args) const { // Each toolchain should provide the appropriate include flags. } Index: clang/lib/Driver/ToolChains/AIX.h =================================================================== --- clang/lib/Driver/ToolChains/AIX.h +++ clang/lib/Driver/ToolChains/AIX.h @@ -64,7 +64,7 @@ bool isPICDefaultForced() const override { return true; } void - AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, + addClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const override; void AddCXXStdlibLibArgs(const llvm::opt::ArgList &Args, Index: clang/lib/Driver/ToolChains/AIX.cpp =================================================================== --- clang/lib/Driver/ToolChains/AIX.cpp +++ clang/lib/Driver/ToolChains/AIX.cpp @@ -190,7 +190,7 @@ return "/"; } -void AIX::AddClangSystemIncludeArgs(const ArgList &DriverArgs, +void AIX::addClangSystemIncludeArgs(const ArgList &DriverArgs, ArgStringList &CC1Args) const { // Return if -nostdinc is specified as a driver option. if (DriverArgs.hasArg(options::OPT_nostdinc)) Index: clang/lib/Driver/ToolChains/AMDGPUOpenMP.h =================================================================== --- clang/lib/Driver/ToolChains/AMDGPUOpenMP.h +++ clang/lib/Driver/ToolChains/AMDGPUOpenMP.h @@ -82,7 +82,7 @@ void addClangWarningOptions(llvm::opt::ArgStringList &CC1Args) const override; CXXStdlibType GetCXXStdlibType(const llvm::opt::ArgList &Args) const override; void - AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, + addClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const override; void AddIAMCUIncludeArgs(const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const override; Index: clang/lib/Driver/ToolChains/AMDGPUOpenMP.cpp =================================================================== --- clang/lib/Driver/ToolChains/AMDGPUOpenMP.cpp +++ clang/lib/Driver/ToolChains/AMDGPUOpenMP.cpp @@ -242,9 +242,9 @@ return HostTC.GetCXXStdlibType(Args); } -void AMDGPUOpenMPToolChain::AddClangSystemIncludeArgs( +void AMDGPUOpenMPToolChain::addClangSystemIncludeArgs( const ArgList &DriverArgs, ArgStringList &CC1Args) const { - HostTC.AddClangSystemIncludeArgs(DriverArgs, CC1Args); + HostTC.addClangSystemIncludeArgs(DriverArgs, CC1Args); } void AMDGPUOpenMPToolChain::AddIAMCUIncludeArgs(const ArgList &Args, Index: clang/lib/Driver/ToolChains/BareMetal.h =================================================================== --- clang/lib/Driver/ToolChains/BareMetal.h +++ clang/lib/Driver/ToolChains/BareMetal.h @@ -60,7 +60,7 @@ const char *getDefaultLinker() const override { return "ld.lld"; } std::string getRuntimesDir() const; - void AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, + void addClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const override; void addClangTargetOptions(const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args, Index: clang/lib/Driver/ToolChains/BareMetal.cpp =================================================================== --- clang/lib/Driver/ToolChains/BareMetal.cpp +++ clang/lib/Driver/ToolChains/BareMetal.cpp @@ -185,7 +185,7 @@ return std::string(SysRootDir); } -void BareMetal::AddClangSystemIncludeArgs(const ArgList &DriverArgs, +void BareMetal::addClangSystemIncludeArgs(const ArgList &DriverArgs, ArgStringList &CC1Args) const { if (DriverArgs.hasArg(options::OPT_nostdinc)) return; Index: clang/lib/Driver/ToolChains/Clang.cpp =================================================================== --- clang/lib/Driver/ToolChains/Clang.cpp +++ clang/lib/Driver/ToolChains/Clang.cpp @@ -1399,7 +1399,7 @@ if (!IsIAMCU) forAllAssociatedToolChains(C, JA, getToolChain(), [&Args, &CmdArgs](const ToolChain &TC) { - TC.AddClangSystemIncludeArgs(Args, CmdArgs); + TC.addClangSystemIncludeArgs(Args, CmdArgs); }); else { // For IAMCU add special include arguments. Index: clang/lib/Driver/ToolChains/CrossWindows.h =================================================================== --- clang/lib/Driver/ToolChains/CrossWindows.h +++ clang/lib/Driver/ToolChains/CrossWindows.h @@ -66,7 +66,7 @@ } void - AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, + addClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const override; void AddClangCXXStdlibIncludeArgs( const llvm::opt::ArgList &DriverArgs, Index: clang/lib/Driver/ToolChains/CrossWindows.cpp =================================================================== --- clang/lib/Driver/ToolChains/CrossWindows.cpp +++ clang/lib/Driver/ToolChains/CrossWindows.cpp @@ -232,7 +232,7 @@ } void CrossWindowsToolChain:: -AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, +addClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const { const Driver &D = getDriver(); const std::string &SysRoot = D.SysRoot; Index: clang/lib/Driver/ToolChains/Cuda.h =================================================================== --- clang/lib/Driver/ToolChains/Cuda.h +++ clang/lib/Driver/ToolChains/Cuda.h @@ -170,7 +170,7 @@ void addClangWarningOptions(llvm::opt::ArgStringList &CC1Args) const override; CXXStdlibType GetCXXStdlibType(const llvm::opt::ArgList &Args) const override; void - AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, + addClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const override; void AddClangCXXStdlibIncludeArgs( const llvm::opt::ArgList &Args, Index: clang/lib/Driver/ToolChains/Cuda.cpp =================================================================== --- clang/lib/Driver/ToolChains/Cuda.cpp +++ clang/lib/Driver/ToolChains/Cuda.cpp @@ -876,9 +876,9 @@ return HostTC.GetCXXStdlibType(Args); } -void CudaToolChain::AddClangSystemIncludeArgs(const ArgList &DriverArgs, +void CudaToolChain::addClangSystemIncludeArgs(const ArgList &DriverArgs, ArgStringList &CC1Args) const { - HostTC.AddClangSystemIncludeArgs(DriverArgs, CC1Args); + HostTC.addClangSystemIncludeArgs(DriverArgs, CC1Args); } void CudaToolChain::AddClangCXXStdlibIncludeArgs(const ArgList &Args, Index: clang/lib/Driver/ToolChains/Darwin.h =================================================================== --- clang/lib/Driver/ToolChains/Darwin.h +++ clang/lib/Driver/ToolChains/Darwin.h @@ -538,7 +538,7 @@ const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const override; - void AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, + void addClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const override; void AddCXXStdlibLibArgs(const llvm::opt::ArgList &Args, Index: clang/lib/Driver/ToolChains/Darwin.cpp =================================================================== --- clang/lib/Driver/ToolChains/Darwin.cpp +++ clang/lib/Driver/ToolChains/Darwin.cpp @@ -1974,7 +1974,7 @@ return "/"; } -void DarwinClang::AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, +void DarwinClang::addClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const { const Driver &D = getDriver(); Index: clang/lib/Driver/ToolChains/Fuchsia.h =================================================================== --- clang/lib/Driver/ToolChains/Fuchsia.h +++ clang/lib/Driver/ToolChains/Fuchsia.h @@ -83,7 +83,7 @@ llvm::opt::ArgStringList &CC1Args, Action::OffloadKind DeviceOffloadKind) const override; void - AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, + addClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const override; void AddClangCXXStdlibIncludeArgs(const llvm::opt::ArgList &DriverArgs, Index: clang/lib/Driver/ToolChains/Fuchsia.cpp =================================================================== --- clang/lib/Driver/ToolChains/Fuchsia.cpp +++ clang/lib/Driver/ToolChains/Fuchsia.cpp @@ -320,7 +320,7 @@ CC1Args.push_back("-fno-use-init-array"); } -void Fuchsia::AddClangSystemIncludeArgs(const ArgList &DriverArgs, +void Fuchsia::addClangSystemIncludeArgs(const ArgList &DriverArgs, ArgStringList &CC1Args) const { const Driver &D = getDriver(); Index: clang/lib/Driver/ToolChains/HIP.h =================================================================== --- clang/lib/Driver/ToolChains/HIP.h +++ clang/lib/Driver/ToolChains/HIP.h @@ -74,7 +74,7 @@ void addClangWarningOptions(llvm::opt::ArgStringList &CC1Args) const override; CXXStdlibType GetCXXStdlibType(const llvm::opt::ArgList &Args) const override; void - AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, + addClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const override; void AddClangCXXStdlibIncludeArgs( const llvm::opt::ArgList &Args, Index: clang/lib/Driver/ToolChains/HIP.cpp =================================================================== --- clang/lib/Driver/ToolChains/HIP.cpp +++ clang/lib/Driver/ToolChains/HIP.cpp @@ -314,9 +314,9 @@ return HostTC.GetCXXStdlibType(Args); } -void HIPToolChain::AddClangSystemIncludeArgs(const ArgList &DriverArgs, +void HIPToolChain::addClangSystemIncludeArgs(const ArgList &DriverArgs, ArgStringList &CC1Args) const { - HostTC.AddClangSystemIncludeArgs(DriverArgs, CC1Args); + HostTC.addClangSystemIncludeArgs(DriverArgs, CC1Args); } void HIPToolChain::AddClangCXXStdlibIncludeArgs(const ArgList &Args, Index: clang/lib/Driver/ToolChains/Hexagon.h =================================================================== --- clang/lib/Driver/ToolChains/Hexagon.h +++ clang/lib/Driver/ToolChains/Hexagon.h @@ -75,7 +75,7 @@ llvm::opt::ArgStringList &CC1Args, Action::OffloadKind DeviceOffloadKind) const override; void - AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, + addClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const override; void addLibStdCxxIncludePaths( const llvm::opt::ArgList &DriverArgs, Index: clang/lib/Driver/ToolChains/Hexagon.cpp =================================================================== --- clang/lib/Driver/ToolChains/Hexagon.cpp +++ clang/lib/Driver/ToolChains/Hexagon.cpp @@ -586,7 +586,7 @@ } } -void HexagonToolChain::AddClangSystemIncludeArgs(const ArgList &DriverArgs, +void HexagonToolChain::addClangSystemIncludeArgs(const ArgList &DriverArgs, ArgStringList &CC1Args) const { if (DriverArgs.hasArg(options::OPT_nostdinc) || DriverArgs.hasArg(options::OPT_nostdlibinc)) Index: clang/lib/Driver/ToolChains/Hurd.h =================================================================== --- clang/lib/Driver/ToolChains/Hurd.h +++ clang/lib/Driver/ToolChains/Hurd.h @@ -24,7 +24,7 @@ bool HasNativeLLVMSupport() const override; void - AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, + addClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const override; std::string getDynamicLinker(const llvm::opt::ArgList &Args) const override; Index: clang/lib/Driver/ToolChains/Hurd.cpp =================================================================== --- clang/lib/Driver/ToolChains/Hurd.cpp +++ clang/lib/Driver/ToolChains/Hurd.cpp @@ -132,7 +132,7 @@ llvm_unreachable("unsupported architecture"); } -void Hurd::AddClangSystemIncludeArgs(const ArgList &DriverArgs, +void Hurd::addClangSystemIncludeArgs(const ArgList &DriverArgs, ArgStringList &CC1Args) const { const Driver &D = getDriver(); std::string SysRoot = computeSysRoot(); Index: clang/lib/Driver/ToolChains/Linux.h =================================================================== --- clang/lib/Driver/ToolChains/Linux.h +++ clang/lib/Driver/ToolChains/Linux.h @@ -24,7 +24,7 @@ bool HasNativeLLVMSupport() const override; void - AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, + addClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const override; void addLibStdCxxIncludePaths( const llvm::opt::ArgList &DriverArgs, Index: clang/lib/Driver/ToolChains/Linux.cpp =================================================================== --- clang/lib/Driver/ToolChains/Linux.cpp +++ clang/lib/Driver/ToolChains/Linux.cpp @@ -532,7 +532,7 @@ return "/" + LibDir + "/" + Loader; } -void Linux::AddClangSystemIncludeArgs(const ArgList &DriverArgs, +void Linux::addClangSystemIncludeArgs(const ArgList &DriverArgs, ArgStringList &CC1Args) const { const Driver &D = getDriver(); std::string SysRoot = computeSysRoot(); Index: clang/lib/Driver/ToolChains/MSP430.h =================================================================== --- clang/lib/Driver/ToolChains/MSP430.h +++ clang/lib/Driver/ToolChains/MSP430.h @@ -30,7 +30,7 @@ MSP430ToolChain(const Driver &D, const llvm::Triple &Triple, const llvm::opt::ArgList &Args); void - AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, + addClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const override; void addClangTargetOptions(const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args, Index: clang/lib/Driver/ToolChains/MSP430.cpp =================================================================== --- clang/lib/Driver/ToolChains/MSP430.cpp +++ clang/lib/Driver/ToolChains/MSP430.cpp @@ -145,7 +145,7 @@ return std::string(Dir.str()); } -void MSP430ToolChain::AddClangSystemIncludeArgs(const ArgList &DriverArgs, +void MSP430ToolChain::addClangSystemIncludeArgs(const ArgList &DriverArgs, ArgStringList &CC1Args) const { if (DriverArgs.hasArg(options::OPT_nostdinc) || DriverArgs.hasArg(options::OPT_nostdlibinc)) Index: clang/lib/Driver/ToolChains/MSVC.h =================================================================== --- clang/lib/Driver/ToolChains/MSVC.h +++ clang/lib/Driver/ToolChains/MSVC.h @@ -93,7 +93,7 @@ bool getIsVS2017OrNewer() const { return VSLayout == ToolsetLayout::VS2017OrNewer; } void - AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, + addClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const override; void AddClangCXXStdlibIncludeArgs( const llvm::opt::ArgList &DriverArgs, Index: clang/lib/Driver/ToolChains/MSVC.cpp =================================================================== --- clang/lib/Driver/ToolChains/MSVC.cpp +++ clang/lib/Driver/ToolChains/MSVC.cpp @@ -1227,7 +1227,7 @@ addSystemInclude(DriverArgs, CC1Args, path); } -void MSVCToolChain::AddClangSystemIncludeArgs(const ArgList &DriverArgs, +void MSVCToolChain::addClangSystemIncludeArgs(const ArgList &DriverArgs, ArgStringList &CC1Args) const { if (DriverArgs.hasArg(options::OPT_nostdinc)) return; Index: clang/lib/Driver/ToolChains/MinGW.h =================================================================== --- clang/lib/Driver/ToolChains/MinGW.h +++ clang/lib/Driver/ToolChains/MinGW.h @@ -74,7 +74,7 @@ const llvm::opt::ArgList &Args) const override; void - AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, + addClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const override; void AddClangCXXStdlibIncludeArgs( const llvm::opt::ArgList &DriverArgs, Index: clang/lib/Driver/ToolChains/MinGW.cpp =================================================================== --- clang/lib/Driver/ToolChains/MinGW.cpp +++ clang/lib/Driver/ToolChains/MinGW.cpp @@ -550,7 +550,7 @@ // /usr/include/c++/4.8/backward // /usr/x86_64-w64-mingw32/include -void toolchains::MinGW::AddClangSystemIncludeArgs(const ArgList &DriverArgs, +void toolchains::MinGW::addClangSystemIncludeArgs(const ArgList &DriverArgs, ArgStringList &CC1Args) const { if (DriverArgs.hasArg(options::OPT_nostdinc)) return; Index: clang/lib/Driver/ToolChains/MipsLinux.h =================================================================== --- clang/lib/Driver/ToolChains/MipsLinux.h +++ clang/lib/Driver/ToolChains/MipsLinux.h @@ -25,7 +25,7 @@ const llvm::opt::ArgList &Args); void - AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, + addClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const override; CXXStdlibType GetCXXStdlibType(const llvm::opt::ArgList &Args) const override; Index: clang/lib/Driver/ToolChains/MipsLinux.cpp =================================================================== --- clang/lib/Driver/ToolChains/MipsLinux.cpp +++ clang/lib/Driver/ToolChains/MipsLinux.cpp @@ -38,7 +38,7 @@ getFilePaths().push_back(computeSysRoot() + "/usr/lib" + LibSuffix); } -void MipsLLVMToolChain::AddClangSystemIncludeArgs( +void MipsLLVMToolChain::addClangSystemIncludeArgs( const ArgList &DriverArgs, ArgStringList &CC1Args) const { if (DriverArgs.hasArg(clang::driver::options::OPT_nostdinc)) return; Index: clang/lib/Driver/ToolChains/Myriad.h =================================================================== --- clang/lib/Driver/ToolChains/Myriad.h +++ clang/lib/Driver/ToolChains/Myriad.h @@ -73,7 +73,7 @@ ~MyriadToolChain() override; void - AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, + addClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const override; void addLibCxxIncludePaths( const llvm::opt::ArgList &DriverArgs, Index: clang/lib/Driver/ToolChains/Myriad.cpp =================================================================== --- clang/lib/Driver/ToolChains/Myriad.cpp +++ clang/lib/Driver/ToolChains/Myriad.cpp @@ -238,7 +238,7 @@ MyriadToolChain::~MyriadToolChain() {} -void MyriadToolChain::AddClangSystemIncludeArgs(const ArgList &DriverArgs, +void MyriadToolChain::addClangSystemIncludeArgs(const ArgList &DriverArgs, ArgStringList &CC1Args) const { if (!DriverArgs.hasArg(clang::driver::options::OPT_nostdinc)) addSystemInclude(DriverArgs, CC1Args, getDriver().SysRoot + "/include"); Index: clang/lib/Driver/ToolChains/NaCl.h =================================================================== --- clang/lib/Driver/ToolChains/NaCl.h +++ clang/lib/Driver/ToolChains/NaCl.h @@ -50,7 +50,7 @@ const llvm::opt::ArgList &Args); void - AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, + addClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const override; void addLibCxxIncludePaths( const llvm::opt::ArgList &DriverArgs, Index: clang/lib/Driver/ToolChains/NaCl.cpp =================================================================== --- clang/lib/Driver/ToolChains/NaCl.cpp +++ clang/lib/Driver/ToolChains/NaCl.cpp @@ -253,7 +253,7 @@ NaClArmMacrosPath = GetFilePath("nacl-arm-macros.s"); } -void NaClToolChain::AddClangSystemIncludeArgs(const ArgList &DriverArgs, +void NaClToolChain::addClangSystemIncludeArgs(const ArgList &DriverArgs, ArgStringList &CC1Args) const { const Driver &D = getDriver(); if (DriverArgs.hasArg(clang::driver::options::OPT_nostdinc)) Index: clang/lib/Driver/ToolChains/OpenBSD.h =================================================================== --- clang/lib/Driver/ToolChains/OpenBSD.h +++ clang/lib/Driver/ToolChains/OpenBSD.h @@ -69,7 +69,7 @@ } void - AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, + addClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const override; void addLibCxxIncludePaths(const llvm::opt::ArgList &DriverArgs, Index: clang/lib/Driver/ToolChains/OpenBSD.cpp =================================================================== --- clang/lib/Driver/ToolChains/OpenBSD.cpp +++ clang/lib/Driver/ToolChains/OpenBSD.cpp @@ -251,7 +251,7 @@ getFilePaths().push_back(getDriver().SysRoot + "/usr/lib"); } -void OpenBSD::AddClangSystemIncludeArgs( +void OpenBSD::addClangSystemIncludeArgs( const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const { const Driver &D = getDriver(); Index: clang/lib/Driver/ToolChains/PPCLinux.h =================================================================== --- clang/lib/Driver/ToolChains/PPCLinux.h +++ clang/lib/Driver/ToolChains/PPCLinux.h @@ -22,7 +22,7 @@ : Linux(D, Triple, Args) {} void - AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, + addClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const override; }; Index: clang/lib/Driver/ToolChains/PPCLinux.cpp =================================================================== --- clang/lib/Driver/ToolChains/PPCLinux.cpp +++ clang/lib/Driver/ToolChains/PPCLinux.cpp @@ -14,7 +14,7 @@ using namespace clang::driver::toolchains; using namespace llvm::opt; -void PPCLinuxToolChain::AddClangSystemIncludeArgs(const ArgList &DriverArgs, +void PPCLinuxToolChain::addClangSystemIncludeArgs(const ArgList &DriverArgs, ArgStringList &CC1Args) const { if (!DriverArgs.hasArg(clang::driver::options::OPT_nostdinc) && !DriverArgs.hasArg(options::OPT_nobuiltininc)) { @@ -24,5 +24,5 @@ addSystemInclude(DriverArgs, CC1Args, P); } - Linux::AddClangSystemIncludeArgs(DriverArgs, CC1Args); + Linux::addClangSystemIncludeArgs(DriverArgs, CC1Args); } Index: clang/lib/Driver/ToolChains/RISCVToolchain.h =================================================================== --- clang/lib/Driver/ToolChains/RISCVToolchain.h +++ clang/lib/Driver/ToolChains/RISCVToolchain.h @@ -30,7 +30,7 @@ UnwindLibType GetUnwindLibType(const llvm::opt::ArgList &Args) const override; void - AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, + addClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const override; void addLibStdCxxIncludePaths(const llvm::opt::ArgList &DriverArgs, Index: clang/lib/Driver/ToolChains/RISCVToolchain.cpp =================================================================== --- clang/lib/Driver/ToolChains/RISCVToolchain.cpp +++ clang/lib/Driver/ToolChains/RISCVToolchain.cpp @@ -93,7 +93,7 @@ CC1Args.push_back("-nostdsysteminc"); } -void RISCVToolChain::AddClangSystemIncludeArgs(const ArgList &DriverArgs, +void RISCVToolChain::addClangSystemIncludeArgs(const ArgList &DriverArgs, ArgStringList &CC1Args) const { if (DriverArgs.hasArg(options::OPT_nostdinc)) return; Index: clang/lib/Driver/ToolChains/Solaris.h =================================================================== --- clang/lib/Driver/ToolChains/Solaris.h +++ clang/lib/Driver/ToolChains/Solaris.h @@ -55,7 +55,7 @@ const llvm::opt::ArgList &Args); void - AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, + addClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const override; void Index: clang/lib/Driver/ToolChains/Solaris.cpp =================================================================== --- clang/lib/Driver/ToolChains/Solaris.cpp +++ clang/lib/Driver/ToolChains/Solaris.cpp @@ -220,7 +220,7 @@ Tool *Solaris::buildLinker() const { return new tools::solaris::Linker(*this); } -void Solaris::AddClangSystemIncludeArgs(const ArgList &DriverArgs, +void Solaris::addClangSystemIncludeArgs(const ArgList &DriverArgs, ArgStringList &CC1Args) const { const Driver &D = getDriver(); Index: clang/lib/Driver/ToolChains/VEToolchain.h =================================================================== --- clang/lib/Driver/ToolChains/VEToolchain.h +++ clang/lib/Driver/ToolChains/VEToolchain.h @@ -33,7 +33,7 @@ bool SupportsProfiling() const override; bool hasBlocksRuntime() const override; void - AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, + addClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const override; void addClangTargetOptions(const llvm::opt::ArgList &DriverArgs, Index: clang/lib/Driver/ToolChains/VEToolchain.cpp =================================================================== --- clang/lib/Driver/ToolChains/VEToolchain.cpp +++ clang/lib/Driver/ToolChains/VEToolchain.cpp @@ -61,7 +61,7 @@ bool VEToolChain::hasBlocksRuntime() const { return false; } -void VEToolChain::AddClangSystemIncludeArgs(const ArgList &DriverArgs, +void VEToolChain::addClangSystemIncludeArgs(const ArgList &DriverArgs, ArgStringList &CC1Args) const { if (DriverArgs.hasArg(clang::driver::options::OPT_nostdinc)) return; Index: clang/lib/Driver/ToolChains/WebAssembly.h =================================================================== --- clang/lib/Driver/ToolChains/WebAssembly.h +++ clang/lib/Driver/ToolChains/WebAssembly.h @@ -58,7 +58,7 @@ RuntimeLibType GetDefaultRuntimeLibType() const override; CXXStdlibType GetCXXStdlibType(const llvm::opt::ArgList &Args) const override; void - AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, + addClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const override; void AddClangCXXStdlibIncludeArgs( const llvm::opt::ArgList &DriverArgs, Index: clang/lib/Driver/ToolChains/WebAssembly.cpp =================================================================== --- clang/lib/Driver/ToolChains/WebAssembly.cpp +++ clang/lib/Driver/ToolChains/WebAssembly.cpp @@ -341,7 +341,7 @@ return ToolChain::CST_Libcxx; } -void WebAssembly::AddClangSystemIncludeArgs(const ArgList &DriverArgs, +void WebAssembly::addClangSystemIncludeArgs(const ArgList &DriverArgs, ArgStringList &CC1Args) const { if (DriverArgs.hasArg(clang::driver::options::OPT_nostdinc)) return; Index: clang/lib/Driver/ToolChains/XCore.h =================================================================== --- clang/lib/Driver/ToolChains/XCore.h +++ clang/lib/Driver/ToolChains/XCore.h @@ -63,7 +63,7 @@ bool SupportsProfiling() const override; bool hasBlocksRuntime() const override; void - AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, + addClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const override; void addClangTargetOptions(const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args, Index: clang/lib/Driver/ToolChains/XCore.cpp =================================================================== --- clang/lib/Driver/ToolChains/XCore.cpp +++ clang/lib/Driver/ToolChains/XCore.cpp @@ -110,7 +110,7 @@ bool XCoreToolChain::hasBlocksRuntime() const { return false; } -void XCoreToolChain::AddClangSystemIncludeArgs(const ArgList &DriverArgs, +void XCoreToolChain::addClangSystemIncludeArgs(const ArgList &DriverArgs, ArgStringList &CC1Args) const { if (DriverArgs.hasArg(clang::driver::options::OPT_nostdinc) || DriverArgs.hasArg(options::OPT_nostdlibinc))