diff --git a/openmp/libomptarget/include/PluginManager.h b/openmp/libomptarget/include/PluginManager.h index 0b0974709b525..6af99efa32a0c 100644 --- a/openmp/libomptarget/include/PluginManager.h +++ b/openmp/libomptarget/include/PluginManager.h @@ -150,24 +150,6 @@ struct PluginManager { HostPtrToTableMapTy HostPtrToTableMap; std::mutex TblMapMtx; ///< For HostPtrToTableMap - // Work around for plugins that call dlopen on shared libraries that call - // tgt_register_lib during their initialisation. Stash the pointers in a - // vector until the plugins are all initialised and then register them. - bool delayRegisterLib(__tgt_bin_desc *Desc) { - if (RTLsLoaded) - return false; - DelayedBinDesc.push_back(Desc); - return true; - } - - void registerDelayedLibraries() { - // Only called by libomptarget constructor - RTLsLoaded = true; - for (auto *Desc : DelayedBinDesc) - __tgt_register_lib(Desc); - DelayedBinDesc.clear(); - } - /// Return the number of usable devices. int getNumDevices() { return getExclusiveDevicesAccessor()->size(); } @@ -196,9 +178,6 @@ struct PluginManager { void addRequirements(int64_t Flags) { Requirements.addRequirements(Flags); } private: - bool RTLsLoaded = false; - llvm::SmallVector<__tgt_bin_desc *> DelayedBinDesc; - // List of all plugin adaptors, in use or not. llvm::SmallVector> PluginAdaptors; diff --git a/openmp/libomptarget/src/interface.cpp b/openmp/libomptarget/src/interface.cpp index d92f40ce1d14e..777dc07943aa6 100644 --- a/openmp/libomptarget/src/interface.cpp +++ b/openmp/libomptarget/src/interface.cpp @@ -46,9 +46,6 @@ EXTERN void __tgt_register_requires(int64_t Flags) { /// adds a target shared library to the target execution image EXTERN void __tgt_register_lib(__tgt_bin_desc *Desc) { TIMESCOPE(); - if (PM->delayRegisterLib(Desc)) - return; - PM->registerLib(Desc); } diff --git a/openmp/libomptarget/src/rtl.cpp b/openmp/libomptarget/src/rtl.cpp index 5eb1c553df491..27db7034d8956 100644 --- a/openmp/libomptarget/src/rtl.cpp +++ b/openmp/libomptarget/src/rtl.cpp @@ -51,7 +51,6 @@ __attribute__((constructor(101))) void init() { PM->init(); Profiler::get(); - PM->registerDelayedLibraries(); } __attribute__((destructor(101))) void deinit() { diff --git a/openmp/libomptarget/test/Inputs/empty.c b/openmp/libomptarget/test/Inputs/empty.c new file mode 100644 index 0000000000000..8b137891791fe --- /dev/null +++ b/openmp/libomptarget/test/Inputs/empty.c @@ -0,0 +1 @@ + diff --git a/openmp/libomptarget/test/offloading/bug60119.c b/openmp/libomptarget/test/offloading/bug60119.c new file mode 100644 index 0000000000000..e32f1ccd59881 --- /dev/null +++ b/openmp/libomptarget/test/offloading/bug60119.c @@ -0,0 +1,6 @@ +// RUN: %clang-generic -fPIC -shared %S/../Inputs/empty.c -o %T/liba.so +// RUN: %clang-generic -fPIC -shared %S/../Inputs/empty.c -o %T/libb.so +// RUN: %clang-generic -rpath %T -L %T -l a -l b %s -o %t +// RUN: %t + +int main() {}