diff options
| author | Duncan Sands <baldrick@free.fr> | 2009-03-11 08:08:06 +0000 |
|---|---|---|
| committer | Duncan Sands <baldrick@free.fr> | 2009-03-11 08:08:06 +0000 |
| commit | 5f4ee1fc5d00ae55c30fa2ce450c69be4c6d6e63 (patch) | |
| tree | 524f8864fae13a926989fb2edb5d72e0dc180dbe /lib/Bitcode | |
| parent | 841c6a4345082e9a1252cc39bcce7f1423a76ded (diff) | |
| download | external_llvm-5f4ee1fc5d00ae55c30fa2ce450c69be4c6d6e63.zip external_llvm-5f4ee1fc5d00ae55c30fa2ce450c69be4c6d6e63.tar.gz external_llvm-5f4ee1fc5d00ae55c30fa2ce450c69be4c6d6e63.tar.bz2 | |
Remove the one-definition-rule version of extern_weak
linkage: this linkage type only applies to declarations,
but ODR is only relevant to globals with definitions.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@66650 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Bitcode')
| -rw-r--r-- | lib/Bitcode/Reader/BitcodeReader.cpp | 3 | ||||
| -rw-r--r-- | lib/Bitcode/Writer/BitcodeWriter.cpp | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/lib/Bitcode/Reader/BitcodeReader.cpp b/lib/Bitcode/Reader/BitcodeReader.cpp index 0fe6fc6..abf1db2 100644 --- a/lib/Bitcode/Reader/BitcodeReader.cpp +++ b/lib/Bitcode/Reader/BitcodeReader.cpp @@ -65,12 +65,11 @@ static GlobalValue::LinkageTypes GetDecodedLinkage(unsigned Val) { case 4: return GlobalValue::LinkOnceAnyLinkage; case 5: return GlobalValue::DLLImportLinkage; case 6: return GlobalValue::DLLExportLinkage; - case 7: return GlobalValue::ExternalWeakAnyLinkage; + case 7: return GlobalValue::ExternalWeakLinkage; case 8: return GlobalValue::CommonAnyLinkage; case 9: return GlobalValue::PrivateLinkage; case 10: return GlobalValue::WeakODRLinkage; case 11: return GlobalValue::LinkOnceODRLinkage; - case 12: return GlobalValue::ExternalWeakODRLinkage; case 13: return GlobalValue::CommonODRLinkage; } } diff --git a/lib/Bitcode/Writer/BitcodeWriter.cpp b/lib/Bitcode/Writer/BitcodeWriter.cpp index fefffbe..940647f 100644 --- a/lib/Bitcode/Writer/BitcodeWriter.cpp +++ b/lib/Bitcode/Writer/BitcodeWriter.cpp @@ -282,12 +282,11 @@ static unsigned getEncodedLinkage(const GlobalValue *GV) { case GlobalValue::LinkOnceAnyLinkage: return 4; case GlobalValue::DLLImportLinkage: return 5; case GlobalValue::DLLExportLinkage: return 6; - case GlobalValue::ExternalWeakAnyLinkage: return 7; + case GlobalValue::ExternalWeakLinkage: return 7; case GlobalValue::CommonAnyLinkage: return 8; case GlobalValue::PrivateLinkage: return 9; case GlobalValue::WeakODRLinkage: return 10; case GlobalValue::LinkOnceODRLinkage: return 11; - case GlobalValue::ExternalWeakODRLinkage: return 12; case GlobalValue::CommonODRLinkage: return 13; } } |