commit bf0c2e88c66d608ba0cb5155f34d49fcedb7635b
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jan 30 19:30:21 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 30 19:30:21 2018 +0000
tree 2edff8a9aa04d32bd53294754a0e026ce44e1cde
parent 45d251322ea3f7b70749d9c41e7ece44f91a7e27
parent 28b516158867c1e9e10efb9f79b94a90f493777a

Merge "Windows LTO: bfd: Search plugin dir for dependencies"

binutils-2.27/ld/plugin.c

diff --git a/binutils-2.27/ld/plugin.c b/binutils-2.27/ld/plugin.c
index 4c161d1..adc8b52 100644
--- a/binutils-2.27/ld/plugin.c
+++ b/binutils-2.27/ld/plugin.c
@@ -184,7 +184,11 @@
 static void *
 dlopen (const char *file, int mode ATTRIBUTE_UNUSED)
 {
-  return LoadLibrary (file);
+  // Use LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR to search the loaded library's
+  // directory to satisfy dependencies.
+  return LoadLibraryEx(file, NULL,
+                       LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR |
+                           LOAD_LIBRARY_SEARCH_DEFAULT_DIRS);
 }
 
 static void *
@@ -200,9 +204,20 @@
   return 0;
 }
 
+static const char *
+dlerror (void)
+{
+  DWORD error = GetLastError();
+  static char error_buf[512];
+  FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, error,
+                MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), error_buf,
+                sizeof(error_buf), NULL);
+  return error_buf;
+}
+
 #endif /* !defined (HAVE_DLFCN_H) && defined (HAVE_WINDOWS_H)  */
 
-#ifndef HAVE_DLFCN_H
+#if !defined (HAVE_DLFCN_H) && !defined (HAVE_WINDOWS_H)
 static const char *
 dlerror (void)
 {