Apply changes to migrate to LLVM upstream Oct 20th 2011.
- StructType::isAnonymous is renamed to StructType::isLiteral.
- PassManagerBuilder has been moved from
llvm/Support/PassManagerBuilder.h to
llvm/Transforms/IPO/PassManagerBuilder.h
- Include llvm/Transforms/IPO.h for llvm::createInternalizePass.
- clang::DiagClient has be renamed to clang::DiagnosticConsumer.
Besides, we have to implement one additional pure virtual method
'clone' for create a clone of slang::DiagnosticBuffer.
- llvm::Linker::LinkModules comes with one additional parameter.
Passing llvm::Linker::DestroySource should be equivalent to
the old code we were using.
- slang::Slang is now derived from clang::ModuleLoader and implemented
loadModule pure virtual method (though we will always return NULL.)
- clang::Preprocessor is taking one additional parameter for
clang::ModuleLoader.
- clang::Diagnostic has been changed. A lot of the method has been
moved to clang::DiagnosticsEngine, and we can no longer 'Report' a
diagnostic from clang::Diagnostic. We have to use
clang::DiagnosticEngine instead.
- llvm::setCodeModel has been removed.
Change-Id: I1f2a4cbeaf61a8ed1d0d635a5a0e1baa90d99d07
diff --git a/Android.mk b/Android.mk
index fce3637..e2d7bc8 100644
--- a/Android.mk
+++ b/Android.mk
@@ -36,41 +36,41 @@
local_cflags_for_slang += -DRS_VERSION=$(RS_VERSION)
static_libraries_needed_by_slang := \
- libLLVMLinker \
- libLLVMipo \
- libLLVMBitWriter \
- libLLVMBitWriter_2_9 \
- libLLVMBitReader \
- libLLVMARMCodeGen \
- libLLVMARMAsmPrinter \
- libLLVMARMInfo \
- libLLVMARMDesc \
- libLLVMX86CodeGen \
- libLLVMX86AsmPrinter \
- libLLVMX86Info \
- libLLVMX86Desc \
- libLLVMX86Utils \
- libLLVMAsmPrinter \
- libLLVMSelectionDAG \
- libLLVMCodeGen \
- libLLVMScalarOpts \
- libLLVMInstCombine \
- libLLVMTransformUtils \
- libLLVMInstrumentation \
- libLLVMipa \
- libLLVMAnalysis \
- libLLVMTarget \
- libLLVMMC \
- libLLVMMCParser \
- libLLVMCore \
- libclangParse \
- libclangSema \
- libclangAnalysis \
- libclangAST \
- libclangLex \
- libclangFrontend \
- libclangCodeGen \
- libclangBasic \
+ libLLVMLinker \
+ libLLVMipo \
+ libLLVMBitWriter \
+ libLLVMBitWriter_2_9 \
+ libLLVMBitReader \
+ libLLVMARMCodeGen \
+ libLLVMARMAsmPrinter \
+ libLLVMARMInfo \
+ libLLVMARMDesc \
+ libLLVMX86CodeGen \
+ libLLVMX86Info \
+ libLLVMX86Desc \
+ libLLVMX86AsmPrinter \
+ libLLVMX86Utils \
+ libLLVMAsmPrinter \
+ libLLVMSelectionDAG \
+ libLLVMCodeGen \
+ libLLVMScalarOpts \
+ libLLVMInstCombine \
+ libLLVMTransformUtils \
+ libLLVMInstrumentation \
+ libLLVMipa \
+ libLLVMAnalysis \
+ libLLVMTarget \
+ libLLVMMC \
+ libLLVMMCParser \
+ libLLVMCore \
+ libclangParse \
+ libclangSema \
+ libclangAnalysis \
+ libclangCodeGen \
+ libclangAST \
+ libclangLex \
+ libclangFrontend \
+ libclangBasic \
libLLVMSupport
# Static library libslang for host
@@ -243,7 +243,7 @@
LOCAL_GENERATED_SOURCES += $(intermediates)/RSCCOptions.inc
$(intermediates)/RSCCOptions.inc: $(LOCAL_PATH)/RSCCOptions.td $(CLANG_ROOT_PATH)/include/clang/Driver/OptParser.td $(TBLGEN)
@echo "Building Renderscript compiler (llvm-rs-cc) Option tables with tblgen"
- $(call transform-host-td-to-out,opt-parser-defs)
+ $(call transform-host-clang-td-to-out,opt-parser-defs)
include frameworks/compile/slang/RSSpec.mk
include $(CLANG_HOST_BUILD_MK)