commit 306e1f5ed0f276249a5e936a96e98c1306426353
author Stephen Hines <srhines@google.com> Wed Sep 05 22:33:34 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 05 22:33:34 2012 -0700
tree 632f70c6e5550030f044a3f13a8e9eceed39e88c
parent 37f6bbeed27189e2cf5fac72c46871aa174a8fb4
parent a565633ff50bdbb355bf3c1a9fed72a39d4514f7

am a565633f: Merge "Fix up libbcc for LLVM upstream merge to r162314." into jb-mr1-dev

* commit 'a565633ff50bdbb355bf3c1a9fed72a39d4514f7':
  Fix up libbcc for LLVM upstream merge to r162314.

bcinfo/BitReader_2_7/BitcodeReader.cpp

diff --git a/bcinfo/BitReader_2_7/BitcodeReader.cpp b/bcinfo/BitReader_2_7/BitcodeReader.cpp
index dc562b5..299e679 100644
--- a/bcinfo/BitReader_2_7/BitcodeReader.cpp
+++ b/bcinfo/BitReader_2_7/BitcodeReader.cpp
@@ -142,7 +142,7 @@
   case 12: return GlobalValue::AvailableExternallyLinkage;
   case 13: return GlobalValue::LinkerPrivateLinkage;
   case 14: return GlobalValue::LinkerPrivateWeakLinkage;
-  case 15: return GlobalValue::LinkerPrivateWeakDefAutoLinkage;
+  case 15: return GlobalValue::LinkOnceODRAutoHideLinkage;
   }
 }
 

bcinfo/BitReader_3_0/BitcodeReader.cpp

diff --git a/bcinfo/BitReader_3_0/BitcodeReader.cpp b/bcinfo/BitReader_3_0/BitcodeReader.cpp
index 8c6e1e2..de6bf50 100644
--- a/bcinfo/BitReader_3_0/BitcodeReader.cpp
+++ b/bcinfo/BitReader_3_0/BitcodeReader.cpp
@@ -383,7 +383,7 @@
   case 12: return GlobalValue::AvailableExternallyLinkage;
   case 13: return GlobalValue::LinkerPrivateLinkage;
   case 14: return GlobalValue::LinkerPrivateWeakLinkage;
-  case 15: return GlobalValue::LinkerPrivateWeakDefAutoLinkage;
+  case 15: return GlobalValue::LinkOnceODRAutoHideLinkage;
   }
 }