Skip to content

Commit

Permalink
Revert "Fix GSYM tests to run the yaml files and fix test failures on…
Browse files Browse the repository at this point in the history
… some machines."

This reverts commit d334ce0.
  • Loading branch information
clayborg committed Feb 29, 2020
1 parent 1a52d3d commit 5d11e7f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
1 change: 0 additions & 1 deletion llvm/test/tools/llvm-gsymutil/lit.local.cfg

This file was deleted.

9 changes: 3 additions & 6 deletions llvm/tools/llvm-gsym/llvm-gsymutil.cpp
Expand Up @@ -179,8 +179,7 @@ static bool filterArch(MachOObjectFile &Obj) {
if (ArchFilters.empty())
return true;

Triple ObjTriple(Obj.getArchTriple());
StringRef ObjArch = ObjTriple.getArchName();
StringRef ObjArch = Obj.getArchTriple().getArchName();

for (auto Arch : ArchFilters) {
// Match name.
Expand Down Expand Up @@ -351,8 +350,7 @@ static llvm::Error handleBuffer(StringRef Filename, MemoryBufferRef Buffer,
error(Filename, errorToErrorCode(BinOrErr.takeError()));

if (auto *Obj = dyn_cast<ObjectFile>(BinOrErr->get())) {
Triple ObjTriple(Obj->makeTriple());
auto ArchName = ObjTriple.getArchName();
auto ArchName = Obj->makeTriple().getArchName();
outs() << "Output file (" << ArchName << "): " << OutFile << "\n";
if (auto Err = handleObjectFile(*Obj, OutFile.c_str()))
return Err;
Expand All @@ -376,8 +374,7 @@ static llvm::Error handleBuffer(StringRef Filename, MemoryBufferRef Buffer,

// Now handle each architecture we need to convert.
for (auto &Obj: FilterObjs) {
Triple ObjTriple(Obj->getArchTriple());
auto ArchName = ObjTriple.getArchName();
auto ArchName = Obj->getArchTriple().getArchName();
std::string ArchOutFile(OutFile);
// If we are only handling a single architecture, then we will use the
// normal output file. If we are handling multiple architectures append
Expand Down

0 comments on commit 5d11e7f

Please sign in to comment.