diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2013-08-24 10:06:51 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2013-08-24 10:06:51 +0000 |
| commit | 7e7299d1978b7b84800b2ff81bac3acd7b5b1aee (patch) | |
| tree | 4aadcf7bae3a4065b9fa55a80d7e60e9d69e01a9 /contrib/llvm/tools/lldb/source/Plugins/Instruction | |
| parent | 7cb5a0d8638c2034ac1302db2beb93954be758c5 (diff) | |
| download | src-7e7299d1978b7b84800b2ff81bac3acd7b5b1aee.tar.gz src-7e7299d1978b7b84800b2ff81bac3acd7b5b1aee.zip | |
Revert lldb changes due to post-3.3 clang and llvm API changes
Revisions:
svn git
183929 99447a6
183862 15c1774
source/Host/common/FileSpec.cpp
184954 007e7bc
184948 4dc3761
source/Expression/ClangExpressionParser.cpp
182099 b31044e
181387 779e6ac
include/lldb/Expression/IRExecutionUnit.h
source/Expression/IRExecutionUnit.cpp
184177 0b2934b
182650 f2dcf35
181703 7bef4e2
source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp
182683 0d91b80
source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp
Sponsored by: DARPA, AFRL
Notes
Notes:
svn path=/head/; revision=254768
Diffstat (limited to 'contrib/llvm/tools/lldb/source/Plugins/Instruction')
| -rw-r--r-- | contrib/llvm/tools/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp b/contrib/llvm/tools/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp index 2dd04dd8733d..52a7fb0e8ee1 100644 --- a/contrib/llvm/tools/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp +++ b/contrib/llvm/tools/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp @@ -25,7 +25,7 @@ #include "Utility/ARM_DWARF_Registers.h" #include "llvm/Support/MathExtras.h" // for SignExtend32 template function - // and countTrailingZeros function + // and CountTrailingZeros_32 function using namespace lldb; using namespace lldb_private; @@ -47,7 +47,7 @@ using namespace lldb_private; static uint32_t CountITSize (uint32_t ITMask) { // First count the trailing zeros of the IT mask. - uint32_t TZ = llvm::countTrailingZeros(ITMask); + uint32_t TZ = llvm::CountTrailingZeros_32(ITMask); if (TZ > 3) { #ifdef LLDB_CONFIGURATION_DEBUG |