* win32-low.c (win32_add_one_solib): If the dll name is

	"ntdll.dll", prepend the system directory to the dll path.

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 077442a..542e9a9 100644 (file)
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-26  Pedro Alves  <pedro@codesourcery.com>
+
+       * win32-low.c (win32_add_one_solib): If the dll name is
+       "ntdll.dll", prepend the system directory to the dll path.
+
 2009-11-17  Daniel Jacobowitz  <dan@codesourcery.com>
 
        * m68k-tdep.c (m68k_gdbarch_init): Reuse previous initialization.

diff --git a/gdb/gdbserver/win32-low.c b/gdb/gdbserver/win32-low.c
index bcf16b2..ff46b2d 100644 (file)
--- a/gdb/gdbserver/win32-low.c
+++ b/gdb/gdbserver/win32-low.c
@@ -906,6 +906,14 @@ win32_add_one_solib (const char *name, CORE_ADDR load_addr)
 #endif
     }
 
+#ifndef _WIN32_WCE
+  if (strcasecmp (buf, "ntdll.dll") == 0)
+    {
+      GetSystemDirectoryA (buf, sizeof (buf));
+      strcat (buf, "\\ntdll.dll");
+    }
+#endif
+
 #ifdef __CYGWIN__
   cygwin_conv_to_posix_path (buf, buf2);
 #else