[llvm-commits] [llvm] r57707 - /llvm/branches/release_24/lib/Linker/LinkModules.cpp

[Tanya Lattner]

Author: tbrethou
Date: Fri Oct 17 13:05:18 2008
New Revision: 57707

URL: http://llvm.org/viewvc/llvm-project?rev=57707&view=rev
Log:
Merge from mainline.
Properly handle linking of strong alias with weak function, this fixes
      PR2883

Modified:
    llvm/branches/release_24/lib/Linker/LinkModules.cpp

Modified: llvm/branches/release_24/lib/Linker/LinkModules.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_24/lib/Linker/LinkModules.cpp?rev=57707&r1=57706&r2=57707&view=diff

==============================================================================
--- llvm/branches/release_24/lib/Linker/LinkModules.cpp (original)
+++ llvm/branches/release_24/lib/Linker/LinkModules.cpp Fri Oct 17 13:05:18 2008
@@ -984,7 +984,7 @@
       // The only valid mappings are:
       // - SF is external declaration, which is effectively a no-op.
       // - SF is weak, when we just need to throw SF out.
-      if (!SF->isDeclaration())
+      if (!SF->isDeclaration() && !SF->mayBeOverridden())
         return Error(Err, "Function-Alias Collision on '" + SF->getName() +
                      "': symbol multiple defined");
     }