[llvm-commits] CVS: llvm/lib/ExecutionEngine/ExecutionEngine.cpp

[Anton Korobeynikov]

Changes in directory llvm/lib/ExecutionEngine:

ExecutionEngine.cpp updated: 1.84 -> 1.85
---
Log message:

Adding dllimport, dllexport and external weak linkage types.
DLL* linkages got full (I hope) codegeneration support in C & both x86 
assembler backends.
External weak linkage added for future use, we don't provide any 
codegeneration, etc. support for it.


---
Diffs of the changes:  (+3 -1)

 ExecutionEngine.cpp |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)


Index: llvm/lib/ExecutionEngine/ExecutionEngine.cpp
diff -u llvm/lib/ExecutionEngine/ExecutionEngine.cpp:1.84 llvm/lib/ExecutionEngine/ExecutionEngine.cpp:1.85
--- llvm/lib/ExecutionEngine/ExecutionEngine.cpp:1.84	Tue Aug 15 20:24:12 2006
+++ llvm/lib/ExecutionEngine/ExecutionEngine.cpp	Thu Sep 14 13:23:26 2006
@@ -657,7 +657,9 @@
         }
         
         // If the existing global is strong, never replace it.
-        if (GVEntry->hasExternalLinkage())
+        if (GVEntry->hasExternalLinkage() ||
+            GVEntry->hasDLLImportLinkage() ||
+            GVEntry->hasDLLExportLinkage())
           continue;
         
         // Otherwise, we know it's linkonce/weak, replace it if this is a strong