aboutsummaryrefslogtreecommitdiff
path: root/llvm/lib/ExecutionEngine
diff options
context:
space:
mode:
Diffstat (limited to 'llvm/lib/ExecutionEngine')
-rw-r--r--llvm/lib/ExecutionEngine/Orc/COFFPlatform.cpp1
-rw-r--r--llvm/lib/ExecutionEngine/Orc/LLJIT.cpp13
2 files changed, 6 insertions, 8 deletions
diff --git a/llvm/lib/ExecutionEngine/Orc/COFFPlatform.cpp b/llvm/lib/ExecutionEngine/Orc/COFFPlatform.cpp
index d3c5761..b8d71c5 100644
--- a/llvm/lib/ExecutionEngine/Orc/COFFPlatform.cpp
+++ b/llvm/lib/ExecutionEngine/Orc/COFFPlatform.cpp
@@ -361,6 +361,7 @@ COFFPlatform::standardRuntimeUtilityAliases() {
{"__orc_rt_run_program", "__orc_rt_coff_run_program"},
{"__orc_rt_jit_dlerror", "__orc_rt_coff_jit_dlerror"},
{"__orc_rt_jit_dlopen", "__orc_rt_coff_jit_dlopen"},
+ {"__orc_rt_jit_dlupdate", "__orc_rt_coff_jit_dlupdate"},
{"__orc_rt_jit_dlclose", "__orc_rt_coff_jit_dlclose"},
{"__orc_rt_jit_dlsym", "__orc_rt_coff_jit_dlsym"},
{"__orc_rt_log_error", "__orc_rt_log_error_to_stderr"}};
diff --git a/llvm/lib/ExecutionEngine/Orc/LLJIT.cpp b/llvm/lib/ExecutionEngine/Orc/LLJIT.cpp
index 67bb7dd..7487526 100644
--- a/llvm/lib/ExecutionEngine/Orc/LLJIT.cpp
+++ b/llvm/lib/ExecutionEngine/Orc/LLJIT.cpp
@@ -617,14 +617,11 @@ Error ORCPlatformSupport::initialize(orc::JITDylib &JD) {
[](const JITDylibSearchOrder &SO) { return SO; });
StringRef WrapperToCall = "__orc_rt_jit_dlopen_wrapper";
bool dlupdate = false;
- const Triple &TT = ES.getTargetTriple();
- if (TT.isOSBinFormatMachO() || TT.isOSBinFormatELF()) {
- if (InitializedDylib.contains(&JD)) {
- WrapperToCall = "__orc_rt_jit_dlupdate_wrapper";
- dlupdate = true;
- } else
- InitializedDylib.insert(&JD);
- }
+ if (InitializedDylib.contains(&JD)) {
+ WrapperToCall = "__orc_rt_jit_dlupdate_wrapper";
+ dlupdate = true;
+ } else
+ InitializedDylib.insert(&JD);
if (auto WrapperAddr =
ES.lookup(MainSearchOrder, J.mangleAndIntern(WrapperToCall))) {