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/Target | |
| parent | 841c6a4345082e9a1252cc39bcce7f1423a76ded (diff) | |
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/Target')
| -rw-r--r-- | lib/Target/CppBackend/CPPBackend.cpp | 6 | ||||
| -rw-r--r-- | lib/Target/XCore/XCoreAsmPrinter.cpp | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/lib/Target/CppBackend/CPPBackend.cpp b/lib/Target/CppBackend/CPPBackend.cpp index 48cf4959e0..52646f0ce3 100644 --- a/lib/Target/CppBackend/CPPBackend.cpp +++ b/lib/Target/CppBackend/CPPBackend.cpp @@ -310,10 +310,8 @@ namespace { Out << "GlobalValue::DLLImportLinkage"; break; case GlobalValue::DLLExportLinkage: Out << "GlobalValue::DLLExportLinkage"; break; - case GlobalValue::ExternalWeakAnyLinkage: - Out << "GlobalValue::ExternalWeakAnyLinkage"; break; - case GlobalValue::ExternalWeakODRLinkage: - Out << "GlobalValue::ExternalWeakODRLinkage"; break; + case GlobalValue::ExternalWeakLinkage: + Out << "GlobalValue::ExternalWeakLinkage"; break; case GlobalValue::GhostLinkage: Out << "GlobalValue::GhostLinkage"; break; case GlobalValue::CommonAnyLinkage: diff --git a/lib/Target/XCore/XCoreAsmPrinter.cpp b/lib/Target/XCore/XCoreAsmPrinter.cpp index 6026e126d1..67121a7b94 100644 --- a/lib/Target/XCore/XCoreAsmPrinter.cpp +++ b/lib/Target/XCore/XCoreAsmPrinter.cpp @@ -438,8 +438,7 @@ bool XCoreAsmPrinter::doInitialization(Module &M) { switch (I->getLinkage()) { default: assert(0 && "Unexpected linkage"); - case Function::ExternalWeakAnyLinkage: - case Function::ExternalWeakODRLinkage: + case Function::ExternalWeakLinkage: ExtWeakSymbols.insert(I); // fallthrough case Function::ExternalLinkage: |