diff options
| author | Nico Rieck <nico.rieck@gmail.com> | 2014-01-14 12:38:32 +0000 |
|---|---|---|
| committer | Nico Rieck <nico.rieck@gmail.com> | 2014-01-14 12:38:32 +0000 |
| commit | 9d2e0df0493e4085c556abf5c5433ca06f43008d (patch) | |
| tree | 110f2fc9cfeb00483a6923c732a5c9b41d11e7f9 /llvm/lib/ExecutionEngine/ExecutionEngine.cpp | |
| parent | 1794b62f5467d1e795167c4417c82a3d9c05cec2 (diff) | |
| download | llvm-9d2e0df0493e4085c556abf5c5433ca06f43008d.zip llvm-9d2e0df0493e4085c556abf5c5433ca06f43008d.tar.gz llvm-9d2e0df0493e4085c556abf5c5433ca06f43008d.tar.bz2 | |
Revert "Decouple dllexport/dllimport from linkage"
Revert this for now until I fix an issue in Clang with it.
This reverts commit r199204.
llvm-svn: 199207
Diffstat (limited to 'llvm/lib/ExecutionEngine/ExecutionEngine.cpp')
| -rw-r--r-- | llvm/lib/ExecutionEngine/ExecutionEngine.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/llvm/lib/ExecutionEngine/ExecutionEngine.cpp b/llvm/lib/ExecutionEngine/ExecutionEngine.cpp index 88ec5b3..abc8877 100644 --- a/llvm/lib/ExecutionEngine/ExecutionEngine.cpp +++ b/llvm/lib/ExecutionEngine/ExecutionEngine.cpp @@ -1211,7 +1211,9 @@ void ExecutionEngine::emitGlobals() { } // 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 |