Index: server.c
===================================================================
RCS file: /cvs/src/src/gdb/gdbserver/server.c,v
retrieving revision 1.102
diff -u -r1.102 server.c
--- server.c	30 Jun 2009 16:35:25 -0000	1.102
+++ server.c	8 Jul 2009 15:43:37 -0000
@@ -929,14 +929,24 @@
       for (dll_ptr = all_dlls.head; dll_ptr != NULL; dll_ptr = dll_ptr->next)
 	{
 	  struct dll_info *dll = (struct dll_info *) dll_ptr;
-	  char *name;
+	  char *name, *lastdir, *q;
 
 	  strcpy (p, "  <library name=\"");
 	  p = p + strlen (p);
 	  name = xml_escape_text (dll->name);
-	  strcpy (p, name);
+
+	  /* Strip directory names */
+	  lastdir = 0;
+	  for (q=name; *q; q++)
+	    if (*q == '\\' || *q == '/')
+	      lastdir = q;
+	  if (lastdir)
+	    strcpy(p, lastdir+1);
+	  else
+	    strcpy (p, name);
 	  free (name);
 	  p = p + strlen (p);
+
 	  strcpy (p, "\"><segment address=\"");
 	  p = p + strlen (p);
 	  sprintf (p, "0x%lx", (long) dll->base_addr);