OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

Revert "[dsymutil] Rewrite thumb triple names in user visible messages." 

This reverts commit r245960.

Multiple bots are failing on the new test. It seemd like llvm-dsymutil exits with an error. Investigating.

llvm-svn: 245964
This commit is contained in:
Frederic Riss 2015-08-25 18:43:11 +00:00
parent 68961bba06
commit 85d65a185d
5 changed files with 2 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
llvm/test/tools/dsymutil/ARM/empty-map.test
View File

@ -5,4 +5,4 @@
triple: 'thumbv7-apple-darwin'
...
# CHECK: warning: no debug symbols in executable (-arch armv7)
# CHECK: warning: no debug symbols in executable (-arch thumbv7)

21
llvm/test/tools/dsymutil/ARM/fat-arch-name.test
View File

@ -1,21 +0,0 @@
# REQUIRES: object-emission
# RUN: llvm-dsymutil %p/../Inputs/fat-test.arm.dylib -o %t.dSYM -verbose 2>&1 | FileCheck %s
# We detect thumb triples from the binaries, because those are the only ones
# that are guaranteed to be able to generate a Target instance (for example
# we would detect armv7m-apple-darwin as non-thumb triple, but you can't
# instantiate a Target from that). In the user-visible architecture names, and
# in the lipo invocation, we need to rewrite the thumb arch names to the arm
# ones.
# CHECK: warning: no debug symbols in executable (-arch armv7)
# CHECK: warning: no debug symbols in executable (-arch armv7s)
# CHECK: warning: no debug symbols in executable (-arch arm64)
# CHECK: Running lipo
# CHECK-NEXT: lipo -create
# CHECK-SAME: -segalign armv7
# CHECK-SAME: -segalign armv7s
# CHECK-SAME: -segalign arm64

7
llvm/tools/dsymutil/MachOUtils.cpp
View File

@ -17,12 +17,6 @@ namespace llvm {
namespace dsymutil {
namespace MachOUtils {
std::string getArchName(StringRef Arch) {
if (Arch.startswith("thumb"))
return (llvm::Twine("arm") + Arch.drop_front(5)).str();
return Arch;
}
static bool runLipo(SmallVectorImpl<const char *> &Args) {
auto Path = sys::findProgramByName("lipo");
@ -70,7 +64,6 @@ bool generateUniversalBinary(SmallVectorImpl<ArchAndFilename> &ArchFiles,
// Align segments to match dsymutil-classic alignment
for (auto &Thin : ArchFiles) {
Thin.Arch = getArchName(Thin.Arch);
Args.push_back("-segalign");
Args.push_back(Thin.Arch.c_str());
Args.push_back("20");

2
llvm/tools/dsymutil/MachOUtils.h
View File

@ -24,8 +24,6 @@ struct ArchAndFilename {
bool generateUniversalBinary(SmallVectorImpl<ArchAndFilename> &ArchFiles,
StringRef OutputFileName, const LinkOptions &);
std::string getArchName(StringRef Arch);
}
}
}

3
llvm/tools/dsymutil/dsymutil.cpp
View File

@ -301,8 +301,7 @@ int main(int argc, char **argv) {
if (Map->begin() == Map->end())
llvm::errs() << "warning: no debug symbols in executable (-arch "
<< MachOUtils::getArchName(Map->getTriple().getArchName())
<< ")\n";
<< Map->getTriple().getArchName() << ")\n";
std::string OutputFile = getOutputFileName(InputFile, NeedsTempFiles);
if (OutputFile.empty() || !linkDwarf(OutputFile, *Map, Options))