From: Eric Christopher Date: Mon, 7 Dec 2015 22:43:05 +0000 (+0000) Subject: 80-col and whitespace fixups. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5cb23a5baa66b11bddb4fa72269e726e8293e2c1;p=clang 80-col and whitespace fixups. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@254958 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp index fe195f3606..c5b8c79f8b 100644 --- a/lib/Driver/ToolChains.cpp +++ b/lib/Driver/ToolChains.cpp @@ -3536,7 +3536,8 @@ static Distro DetectDistro(const Driver &D, llvm::Triple::ArchType Arch) { static std::string getMultiarchTriple(const Driver &D, const llvm::Triple &TargetTriple, StringRef SysRoot) { - llvm::Triple::EnvironmentType TargetEnvironment = TargetTriple.getEnvironment(); + llvm::Triple::EnvironmentType TargetEnvironment = + TargetTriple.getEnvironment(); // For most architectures, just use whatever we have rather than trying to be // clever. @@ -4367,7 +4368,8 @@ MyriadToolChain::MyriadToolChain(const Driver &D, const llvm::Triple &Triple, // choose the myriad installation when targeting a non-myriad sparc install. switch (Triple.getArch()) { default: - D.Diag(diag::err_target_unsupported_arch) << Triple.getArchName() << "myriad"; + D.Diag(diag::err_target_unsupported_arch) << Triple.getArchName() + << "myriad"; case llvm::Triple::sparc: case llvm::Triple::sparcel: case llvm::Triple::shave: @@ -4403,8 +4405,8 @@ void MyriadToolChain::AddClangSystemIncludeArgs(const ArgList &DriverArgs, addSystemInclude(DriverArgs, CC1Args, getDriver().SysRoot + "/include"); } -void MyriadToolChain::AddClangCXXStdlibIncludeArgs(const ArgList &DriverArgs, - ArgStringList &CC1Args) const { +void MyriadToolChain::AddClangCXXStdlibIncludeArgs( + const ArgList &DriverArgs, ArgStringList &CC1Args) const { if (DriverArgs.hasArg(options::OPT_nostdlibinc) || DriverArgs.hasArg(options::OPT_nostdincxx)) return; @@ -4415,8 +4417,9 @@ void MyriadToolChain::AddClangCXXStdlibIncludeArgs(const ArgList &DriverArgs, StringRef TripleStr = GCCInstallation.getTriple().str(); const Multilib &Multilib = GCCInstallation.getMultilib(); - addLibStdCXXIncludePaths(LibDir.str() + "/../" + TripleStr.str() + "/include/c++/" + Version.Text, - "", TripleStr, "", "", Multilib.includeSuffix(), DriverArgs, CC1Args); + addLibStdCXXIncludePaths( + LibDir.str() + "/../" + TripleStr.str() + "/include/c++/" + Version.Text, + "", TripleStr, "", "", Multilib.includeSuffix(), DriverArgs, CC1Args); } // MyriadToolChain handles several triples: @@ -4490,11 +4493,11 @@ PS4CPU::PS4CPU(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) } else { PS4SDKDir = getDriver().Dir; llvm::sys::path::append(PS4SDKDir, "/../../"); - } + } - // By default, the driver won't report a warning if it can't find + // By default, the driver won't report a warning if it can't find // PS4's include or lib directories. This behavior could be changed if - // -Weverything or -Winvalid-or-nonexistent-directory options are passed. + // -Weverything or -Winvalid-or-nonexistent-directory options are passed. // If -isysroot was passed, use that as the SDK base path. std::string PrefixDir; if (const Arg *A = Args.getLastArg(options::OPT_isysroot)) {