diff options
| author | Stephen Hines <srhines@google.com> | 2012-09-05 22:28:56 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-05 22:28:57 -0700 |
| commit | 529e07e9dece7df93e06932630b483c184933eb8 (patch) | |
| tree | 7b021b0222b98c0cdc2c7d74e8442921fbf3fcae | |
| parent | b13b85e31ac978254cb1ed7653f149f8a3eef460 (diff) | |
| parent | 376dc03c6bb42050ddd8a56d1a3e3c6f5d6f6e1d (diff) | |
| download | android_frameworks_compile_slang-529e07e9dece7df93e06932630b483c184933eb8.tar.gz android_frameworks_compile_slang-529e07e9dece7df93e06932630b483c184933eb8.tar.bz2 android_frameworks_compile_slang-529e07e9dece7df93e06932630b483c184933eb8.zip | |
Merge "Fix up slang for LLVM upstream merge to r162314." into jb-mr1-dev
| -rw-r--r-- | Android.mk | 28 | ||||
| -rw-r--r-- | BitWriter_2_9/BitcodeWriter.cpp | 4 | ||||
| -rw-r--r-- | BitWriter_2_9_func/BitcodeWriter.cpp | 4 |
3 files changed, 23 insertions, 13 deletions
@@ -36,6 +36,16 @@ endif local_cflags_for_slang += -DRS_VERSION=$(RS_VERSION) static_libraries_needed_by_slang := \ + libclangParse \ + libclangSema \ + libclangAnalysis \ + libclangCodeGen \ + libclangAST \ + libclangLex \ + libclangEdit \ + libclangFrontend \ + libclangBasic \ + libclangSerialization \ libLLVMLinker \ libLLVMipo \ libLLVMBitWriter \ @@ -43,14 +53,21 @@ static_libraries_needed_by_slang := \ libLLVMBitWriter_2_9_func \ libLLVMBitReader \ libLLVMARMCodeGen \ + libLLVMARMAsmParser \ libLLVMARMAsmPrinter \ libLLVMARMInfo \ libLLVMARMDesc \ libLLVMX86CodeGen \ libLLVMX86Info \ libLLVMX86Desc \ + libLLVMX86AsmParser \ libLLVMX86AsmPrinter \ libLLVMX86Utils \ + libLLVMMipsCodeGen \ + libLLVMMipsInfo \ + libLLVMMipsDesc \ + libLLVMMipsAsmParser \ + libLLVMMipsAsmPrinter \ libLLVMAsmPrinter \ libLLVMSelectionDAG \ libLLVMCodeGen \ @@ -64,15 +81,8 @@ static_libraries_needed_by_slang := \ libLLVMMC \ libLLVMMCParser \ libLLVMCore \ - libclangParse \ - libclangSema \ - libclangAnalysis \ - libclangCodeGen \ - libclangAST \ - libclangLex \ - libclangEdit \ - libclangFrontend \ - libclangBasic \ + libLLVMArchive \ + libLLVMAsmParser \ libLLVMSupport \ libLLVMVectorize diff --git a/BitWriter_2_9/BitcodeWriter.cpp b/BitWriter_2_9/BitcodeWriter.cpp index 7d44020..4cfba10 100644 --- a/BitWriter_2_9/BitcodeWriter.cpp +++ b/BitWriter_2_9/BitcodeWriter.cpp @@ -399,7 +399,6 @@ static void WriteTypeTable(const llvm_2_9::ValueEnumerator &VE, static unsigned getEncodedLinkage(const GlobalValue *GV) { switch (GV->getLinkage()) { - default: llvm_unreachable("Invalid linkage!"); case GlobalValue::ExternalLinkage: return 0; case GlobalValue::WeakAnyLinkage: return 1; case GlobalValue::AppendingLinkage: return 2; @@ -415,8 +414,9 @@ static unsigned getEncodedLinkage(const GlobalValue *GV) { case GlobalValue::AvailableExternallyLinkage: return 12; case GlobalValue::LinkerPrivateLinkage: return 13; case GlobalValue::LinkerPrivateWeakLinkage: return 14; - case GlobalValue::LinkerPrivateWeakDefAutoLinkage: return 15; + case GlobalValue::LinkOnceODRAutoHideLinkage: return 15; } + llvm_unreachable("Invalid linkage"); } static unsigned getEncodedVisibility(const GlobalValue *GV) { diff --git a/BitWriter_2_9_func/BitcodeWriter.cpp b/BitWriter_2_9_func/BitcodeWriter.cpp index d2aa71f..a8a0750 100644 --- a/BitWriter_2_9_func/BitcodeWriter.cpp +++ b/BitWriter_2_9_func/BitcodeWriter.cpp @@ -352,7 +352,6 @@ static void WriteTypeTable(const llvm_2_9_func::ValueEnumerator &VE, static unsigned getEncodedLinkage(const GlobalValue *GV) { switch (GV->getLinkage()) { - default: llvm_unreachable("Invalid linkage!"); case GlobalValue::ExternalLinkage: return 0; case GlobalValue::WeakAnyLinkage: return 1; case GlobalValue::AppendingLinkage: return 2; @@ -368,8 +367,9 @@ static unsigned getEncodedLinkage(const GlobalValue *GV) { case GlobalValue::AvailableExternallyLinkage: return 12; case GlobalValue::LinkerPrivateLinkage: return 13; case GlobalValue::LinkerPrivateWeakLinkage: return 14; - case GlobalValue::LinkerPrivateWeakDefAutoLinkage: return 15; + case GlobalValue::LinkOnceODRAutoHideLinkage: return 15; } + llvm_unreachable("Invalid linkage"); } static unsigned getEncodedVisibility(const GlobalValue *GV) { |