commit bb5df5c59e6a8bf1b63ec210367c3003479cdf41
author Shih-wei Liao <sliao@google.com> Tue Jul 19 05:15:11 2011 -0700
committer Shih-wei Liao <sliao@google.com> Tue Jul 19 05:15:11 2011 -0700
tree f08dbe26515f7aec1b801a4a795546fc11ee3feb
parent e756554138c1a183063ceac40951f794d688eda7

Apply changes to migrate to upstream API.

Change-Id: I1b131826edb40b12f4fbc816f0b358924eea75dc

Android.mk

diff --git a/Android.mk b/Android.mk
index 37833a7..ea565be 100644
--- a/Android.mk
+++ b/Android.mk
@@ -99,11 +99,13 @@
 ifeq ($(TARGET_ARCH),arm)
   LOCAL_STATIC_LIBRARIES += \
     libLLVMARMCodeGen \
+    libLLVMARMDesc \
     libLLVMARMInfo
 else
   ifeq ($(TARGET_ARCH),x86) # We don't support x86-64 right now
     LOCAL_STATIC_LIBRARIES += \
       libLLVMX86CodeGen \
+      libLLVMX86Desc \
       libLLVMX86Info \
       libLLVMX86Utils \
       libLLVMX86AsmPrinter
@@ -140,7 +142,7 @@
 # and reduces the size of libbcc.so by about 800k.
 # As libLLVMBitReader:libLLVMCore:libLLVMSupport are used by pixelflinger2,
 # use below instead.
-LOCAL_LDFLAGS += -Wl,--exclude-libs=libLLVMARMDisassembler:libLLVMARMAsmPrinter:libLLVMX86Disassembler:libLLVMX86AsmPrinter:libLLVMMCParser:libLLVMARMCodeGen:libLLVMARMInfo:libLLVMSelectionDAG:libLLVMAsmPrinter:libLLVMCodeGen:libLLVMLinker:libLLVMJIT:libLLVMTarget:libLLVMMC:libLLVMScalarOpts:libLLVMInstCombine:libLLVMipo:libLLVMipa:libLLVMTransformUtils:libLLVMAnalysis
+LOCAL_LDFLAGS += -Wl,--exclude-libs=libLLVMARMDisassembler:libLLVMARMAsmPrinter:libLLVMX86Disassembler:libLLVMX86AsmPrinter:libLLVMMCParser:libLLVMARMCodeGen:libLLVMARMDesc:libLLVMARMInfo:libLLVMSelectionDAG:libLLVMAsmPrinter:libLLVMCodeGen:libLLVMLinker:libLLVMJIT:libLLVMTarget:libLLVMMC:libLLVMScalarOpts:libLLVMInstCombine:libLLVMipo:libLLVMipa:libLLVMTransformUtils:libLLVMAnalysis
 
 # Generate build stamp (Build time + Build git revision + Build Semi SHA1)
 include $(LOCAL_PATH)/libbcc-gen-build-stamp.mk
@@ -183,8 +185,10 @@
   libcutils \
   libutils \
   libLLVMARMCodeGen \
+  libLLVMARMDesc \
   libLLVMARMInfo \
   libLLVMX86CodeGen \
+  libLLVMX86Desc \
   libLLVMX86Info \
   libLLVMX86Utils \
   libLLVMX86AsmPrinter \

lib/Disassembler/Disassembler.cpp

diff --git a/lib/Disassembler/Disassembler.cpp b/lib/Disassembler/Disassembler.cpp
index 1ecf726..7ef39cf 100644
--- a/lib/Disassembler/Disassembler.cpp
+++ b/lib/Disassembler/Disassembler.cpp
@@ -108,10 +108,9 @@
   const llvm::MCDisassembler *Disassmbler;
   llvm::MCInstPrinter *IP;
 
-  AsmInfo = Target->createAsmInfo(Compiler::getTargetTriple());
+  AsmInfo = Target->createMCAsmInfo(Compiler::getTargetTriple());
   Disassmbler = Target->createMCDisassembler();
-  IP = Target->createMCInstPrinter(*TM,
-                                   AsmInfo->getAssemblerDialect(),
+  IP = Target->createMCInstPrinter(AsmInfo->getAssemblerDialect(),
                                    *AsmInfo);
 
   const BufferMemoryObject *BufferMObj = new BufferMemoryObject(Func, FuncSize);