diff options
| author | Derek Schuff <dschuff@chromium.org> | 2012-08-21 17:32:13 -0700 |
|---|---|---|
| committer | Derek Schuff <dschuff@chromium.org> | 2012-08-21 17:32:13 -0700 |
| commit | 66f271497ed92ebb05c66f54616e512606a2e314 (patch) | |
| tree | 96d54cd64804ab7c9f2f52f680c3301aa789ce1d /lib/Bitcode/Writer/BitcodeWriter.cpp | |
| parent | b62e9abf7dd9e39c95327914ce9dfe216386824a (diff) | |
| parent | bc363931085587bac42a40653962a3e5acd1ffce (diff) | |
Merge up to r162331, git commit bc363931085587bac42a40653962a3e5acd1ffce
Diffstat (limited to 'lib/Bitcode/Writer/BitcodeWriter.cpp')
| -rw-r--r-- | lib/Bitcode/Writer/BitcodeWriter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Bitcode/Writer/BitcodeWriter.cpp b/lib/Bitcode/Writer/BitcodeWriter.cpp index 5b1725f550..1d2dfc3437 100644 --- a/lib/Bitcode/Writer/BitcodeWriter.cpp +++ b/lib/Bitcode/Writer/BitcodeWriter.cpp @@ -365,7 +365,7 @@ 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"); } |