diff --git a/lld/ELF/Filesystem.cpp b/lld/ELF/Filesystem.cpp --- a/lld/ELF/Filesystem.cpp +++ b/lld/ELF/Filesystem.cpp @@ -59,8 +59,27 @@ sys::fs::remove(Path); // close and therefore remove TempPath in background. - if (!EC) - std::thread([=] { ::close(FD); }).detach(); + if (EC) + return; + + std::mutex M; + std::condition_variable CV; + bool Started = false; + std::thread([&, FD] { + { + std::lock_guard L(M); + Started = true; + CV.notify_all(); + } + ::close(FD); + }).detach(); + std::unique_lock L(M); + // Wait the thread to start. std::thread will touch function local variables + // installing atexing handlers. We want to make it happen before libc started + // to call handlers. + // Additionally GLIBC before 2.27 had race between __internal_atexit and + // __run_exit_handlers. + CV.wait(L, [&] { return Started; }); #endif }