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 | 55463f4ec19618207dcf07016ad6aa1def429dc4 (patch) | |
| tree | 0b3bb45fe7076f7ca661939a405b8c49c3a18631 /lib/ExecutionEngine/ExecutionEngine.cpp | |
| parent | 62b811443db32e55b37370b421e0f34454417b47 (diff) | |
| download | llvm-55463f4ec19618207dcf07016ad6aa1def429dc4.tar.gz llvm-55463f4ec19618207dcf07016ad6aa1def429dc4.tar.bz2 llvm-55463f4ec19618207dcf07016ad6aa1def429dc4.tar.xz | |
Revert "Decouple dllexport/dllimport from linkage"
Revert this for now until I fix an issue in Clang with it.
This reverts commit r199204.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@199207 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/ExecutionEngine/ExecutionEngine.cpp')
| -rw-r--r-- | lib/ExecutionEngine/ExecutionEngine.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/ExecutionEngine/ExecutionEngine.cpp b/lib/ExecutionEngine/ExecutionEngine.cpp index 88ec5b3e6a..abc8877ec5 100644 --- a/lib/ExecutionEngine/ExecutionEngine.cpp +++ b/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 |