Commit e3afe595 authored by Greg Clayton's avatar Greg Clayton
Browse files

Revert "Fix GSYM tests to run the yaml files and fix test failures on some machines." 

This reverts commit 57688350.

Need to conditionalize for ARM targets, this is failing on machines that don't have ARM targets.
parent 57688350

llvm/lib/DebugInfo/GSYM/GsymCreator.cpp

+1 −7
Original line number Diff line number Diff line
@@ -29,13 +29,7 @@ uint32_t GsymCreator::insertFile(StringRef Path, 
                                 llvm::sys::path::Style Style) {

  llvm::StringRef directory = llvm::sys::path::parent_path(Path, Style);

  llvm::StringRef filename = llvm::sys::path::filename(Path, Style);

  // We must insert the strings first, then call the FileEntry constructor.

  // If we inline the insertString() function call into the constructor, the

  // call order is undefined due to parameter lists not having any ordering

  // requirements.

  const uint32_t Dir = insertString(directory);

  const uint32_t Base = insertString(filename);

  FileEntry FE(Dir, Base);

  FileEntry FE(insertString(directory), insertString(filename));



  std::lock_guard<std::recursive_mutex> Guard(Mutex);

  const auto NextIndex = Files.size();

llvm/test/tools/llvm-gsymutil/lit.local.cfg

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
config.suffixes = ['.test', '.yaml']

llvm/tools/llvm-gsym/llvm-gsymutil.cpp

+3 −6
Original line number Diff line number Diff line
@@ -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.
@@ -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;
@@ -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