summaryrefslogtreecommitdiffstats
path: root/llvm/lib/Linker
diff options
context:
space:
mode:
authorBill Wendling <isanbard@gmail.com>2010-06-29 22:34:52 +0000
committerBill Wendling <isanbard@gmail.com>2010-06-29 22:34:52 +0000
commit363217175037e53c8e0844bf596bdb0b32a372e3 (patch)
treed0fd708d643be64b2d4dac3627c7e08b58e8fea2 /llvm/lib/Linker
parentbe3055160034a23e3afff1ecd3e93327573b2659 (diff)
downloadbcm5719-llvm-363217175037e53c8e0844bf596bdb0b32a372e3.tar.gz
bcm5719-llvm-363217175037e53c8e0844bf596bdb0b32a372e3.zip
Revert r107205 and r107207.
llvm-svn: 107215
Diffstat (limited to 'llvm/lib/Linker')
-rw-r--r--llvm/lib/Linker/LinkModules.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/llvm/lib/Linker/LinkModules.cpp b/llvm/lib/Linker/LinkModules.cpp
index d741245d775..8487c83ce36 100644
--- a/llvm/lib/Linker/LinkModules.cpp
+++ b/llvm/lib/Linker/LinkModules.cpp
@@ -735,9 +735,6 @@ CalculateAliasLinkage(const GlobalValue *SGV, const GlobalValue *DGV) {
else if (SL == GlobalValue::LinkerPrivateLinkage &&
DL == GlobalValue::LinkerPrivateLinkage)
return GlobalValue::LinkerPrivateLinkage;
- else if (SL == GlobalValue::LinkerWeakLinkage &&
- DL == GlobalValue::LinkerWeakLinkage)
- return GlobalValue::LinkerWeakLinkage;
else {
assert (SL == GlobalValue::PrivateLinkage &&
DL == GlobalValue::PrivateLinkage && "Unexpected linkage type");
OpenPOWER on IntegriCloud