diff options
author | Tamas Berghammer <tberghammer@google.com> | 2015-09-02 13:31:18 +0000 |
---|---|---|
committer | Tamas Berghammer <tberghammer@google.com> | 2015-09-02 13:31:18 +0000 |
commit | c17469bb8829d3296f6ddca550b3b3c76b031ced (patch) | |
tree | 61df09bead8b16bdecd2a318b1d432fa2564e5aa /lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp | |
parent | ff417efa1deb87523fffd8c05e7bda5b5579f5bd (diff) | |
download | bcm5719-llvm-c17469bb8829d3296f6ddca550b3b3c76b031ced.tar.gz bcm5719-llvm-c17469bb8829d3296f6ddca550b3b3c76b031ced.zip |
Only create alternative thumb disassembler if the main one is arm
This fixes a regression caused by r245645 where creating alternative
thumb disassembler was enabled even when the main disassembler is
already thumb.
llvm-svn: 246649
Diffstat (limited to 'lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp')
-rw-r--r-- | lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp index 81603b6a7cd..d527bdc63d1 100644 --- a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp +++ b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp @@ -648,7 +648,7 @@ DisassemblerLLVMC::DisassemblerLLVMC (const ArchSpec &arch, const char *flavor_s } ArchSpec thumb_arch(arch); - if (triple.getArch() == llvm::Triple::arm || triple.getArch() == llvm::Triple::thumb) + if (triple.getArch() == llvm::Triple::arm) { std::string thumb_arch_name (thumb_arch.GetTriple().getArchName().str()); // Replace "arm" with "thumb" so we get all thumb variants correct @@ -751,7 +751,7 @@ DisassemblerLLVMC::DisassemblerLLVMC (const ArchSpec &arch, const char *flavor_s } // For arm CPUs that can execute arm or thumb instructions, also create a thumb instruction disassembler. - if (triple.getArch() == llvm::Triple::arm || triple.getArch() == llvm::Triple::thumb) + if (triple.getArch() == llvm::Triple::arm) { std::string thumb_triple(thumb_arch.GetTriple().getTriple()); m_alternate_disasm_ap.reset(new LLVMCDisassembler(thumb_triple.c_str(), "", "", flavor, *this)); |