replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reformat. 

llvm-svn: 211661
This commit is contained in:
NAKAMURA Takumi 2014-06-25 04:34:00 +00:00
parent df9b15905f
commit d3235e0529
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clang/lib/Driver/Tools.cpp
View File

@ -6963,9 +6963,9 @@ static StringRef getLinuxDynamicLinker(const ArgList &Args,
return "/lib/ld-linux-mipsn8.so.1";
return "/lib/ld.so.1";
} else if (ToolChain.getArch() == llvm::Triple::mips64 ||
ToolChain.getArch() == llvm::Triple::mips64el) {
std::string LinkerFile = mips::isNaN2008(Args) ? "ld-linux-mipsn8.so.1"
: "ld.so.1";
ToolChain.getArch() == llvm::Triple::mips64el) {
std::string LinkerFile =
mips::isNaN2008(Args) ? "ld-linux-mipsn8.so.1" : "ld.so.1";
if (mips::hasMipsAbiArg(Args, "n32"))
return "/lib32/" + LinkerFile;
return "/lib64/" + LinkerFile;

19
clang/unittests/Basic/VirtualFileSystemTest.cpp
View File

@ -334,7 +334,7 @@ TEST(VirtualFileSystemTest, OverlayIteration) {
Upper->addRegularFile("/file2");
{
std::vector<std::string> Contents = { "/file2", "/file1" };
std::vector<std::string> Contents = {"/file2", "/file1"};
checkContents(O->dir_begin("/", EC), Contents);
}
@ -344,7 +344,7 @@ TEST(VirtualFileSystemTest, OverlayIteration) {
Upper->addRegularFile("/dir2/foo");
checkContents(O->dir_begin("/dir2", EC), ArrayRef<std::string>("/dir2/foo"));
{
std::vector<std::string> Contents = { "/dir2", "/file2", "/dir1", "/file1" };
std::vector<std::string> Contents = {"/dir2", "/file2", "/dir1", "/file1"};
checkContents(O->dir_begin("/", EC), Contents);
}
}
@ -367,7 +367,7 @@ TEST(VirtualFileSystemTest, ThreeLevelIteration) {
Lower->addRegularFile("/file1");
Upper->addRegularFile("/file3");
{
std::vector<std::string> Contents = { "/file3", "/file2", "/file1" };
std::vector<std::string> Contents = {"/file3", "/file2", "/file1"};
checkContents(O->dir_begin("/", EC), Contents);
}
}
@ -391,8 +391,8 @@ TEST(VirtualFileSystemTest, HiddenInIteration) {
Upper->addRegularFile("/onlyInUp", sys::fs::owner_all);
Upper->addRegularFile("/hiddenByUp", sys::fs::owner_all);
{
std::vector<std::string> Contents = { "/hiddenByUp", "/onlyInUp",
"/hiddenByMid", "/onlyInMid", "/onlyInLow" };
std::vector<std::string> Contents = {
"/hiddenByUp", "/onlyInUp", "/hiddenByMid", "/onlyInMid", "/onlyInLow"};
checkContents(O->dir_begin("/", EC), Contents);
}
@ -817,15 +817,14 @@ TEST_F(VFSFromYAMLTest, DirectoryIteration) {
std::error_code EC;
{
std::vector<std::string> Contents = { "//root/file1", "//root/file2",
"//root/file3", "//root/foo" };
std::vector<std::string> Contents = {"//root/file1", "//root/file2",
"//root/file3", "//root/foo"};
checkContents(O->dir_begin("//root/", EC), Contents);
}
{
std::vector<std::string> Contents = {
"//root/foo/bar/a", "//root/foo/bar/b" };
std::vector<std::string> Contents = {"//root/foo/bar/a",
"//root/foo/bar/b"};
checkContents(O->dir_begin("//root/foo/bar", EC), Contents);
}
}