RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2025-05-13 10:56:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[dsymutil] Fix -arch option for thumb variants.

Browse Source 
r267249 removed the dual ARM/Thumb interface from MachOObjectFile,
simplifying llvm-dsymutil's code. This unfortunately also regressed
llvm-dsymutil's ability to select thumb slices, because the simplified
code was also dealing with the discrepency between the slice arch
(eg. armv7m) and the triple arch name (eg. thumbv7m).

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@268894 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Frederic Riss 2016-05-09 06:01:12 +00:00
parent 3c29a695f2
commit c0fdf88ac7
4 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/tools/dsymutil/ARM/thumb.c Normal file
View File

@ -0,0 +1,13 @@
// RUN: llvm-dsymutil -f -oso-prepend-path=%p/.. %p/../Inputs/thumb.armv7m -o - | llvm-dwarfdump - | FileCheck %s
// RUN: llvm-dsymutil -arch armv7m -f -oso-prepend-path=%p/.. %p/../Inputs/thumb.armv7m -o - | llvm-dwarfdump - | FileCheck %s
/* Compile with:
clang -c thumb.c -arch armv7m -g
clang thumb.o -o thumb.armv7m -arch armv7m -nostdlib -static -Wl,-e,_start
*/
void start() {
}
CHECK: DW_AT_name{{.*}}"thumb.c"
CHECK: DW_AT_name{{.*}}"start"

BIN
test/tools/dsymutil/Inputs/thumb.armv7m Executable file
View File

Binary file not shown.

BIN
test/tools/dsymutil/Inputs/thumb.o Normal file
View File

Binary file not shown.

6
tools/dsymutil/MachODebugMapParser.cpp
View File

@ -294,7 +294,11 @@ static bool shouldLinkArch(SmallVectorImpl<StringRef> &Archs, StringRef Arch) {
std::find(Archs.begin(), Archs.end(), "arm") != Archs.end()) std::find(Archs.begin(), Archs.end(), "arm") != Archs.end())
return true; return true;
return std::find(Archs.begin(), Archs.end(), Arch) != Archs.end(); SmallString<16> ArchName = Arch;
if (Arch.startswith("thumb"))
ArchName = ("arm" + Arch.substr(5)).str();
return std::find(Archs.begin(), Archs.end(), ArchName) != Archs.end();
} }
bool MachODebugMapParser::dumpStab() { bool MachODebugMapParser::dumpStab() {