summaryrefslogtreecommitdiffstats
path: root/lldb/scripts
diff options
context:
space:
mode:
authorSean Callanan <scallanan@apple.com>2012-07-26 01:15:27 +0000
committerSean Callanan <scallanan@apple.com>2012-07-26 01:15:27 +0000
commit96088b75ad00212a71d55e12ea95c1d323235dbc (patch)
treee59a8657f4edde2857a454008f05e85db74fdf6e /lldb/scripts
parent83f1495fcb73329ba390e9a42e127c1a5481bd7b (diff)
downloadbcm5719-llvm-96088b75ad00212a71d55e12ea95c1d323235dbc.tar.gz
bcm5719-llvm-96088b75ad00212a71d55e12ea95c1d323235dbc.zip
Integrated a fix to LLVM's disassembler that
corrected the offsets for x86_64 conditional branch instructions. <rdar://problem/11502148> llvm-svn: 160769
Diffstat (limited to 'lldb/scripts')
-rw-r--r--lldb/scripts/llvm.amalgamated.diff2
1 files changed, 1 insertions, 1 deletions
diff --git a/lldb/scripts/llvm.amalgamated.diff b/lldb/scripts/llvm.amalgamated.diff
index 03c6a7a858b..2853e649482 100644
--- a/lldb/scripts/llvm.amalgamated.diff
+++ b/lldb/scripts/llvm.amalgamated.diff
@@ -492,7 +492,7 @@ Index: lib/Target/X86/Disassembler/X86Disassembler.cpp
if (type == TYPE_RELv) {
+ isBranch = true;
+ pcrel = insn.startLocation +
-+ insn.displacementOffset + insn.displacementSize;
++ insn.immediateOffset + insn.immediateSize;
switch (insn.displacementSize) {
default:
break;
OpenPOWER on IntegriCloud