daily update

[deliverable/binutils-gdb.git] / gdb / nto-tdep.c

diff --git a/gdb/nto-tdep.c b/gdb/nto-tdep.c
index 005527cbbb3b0ce88a7c21e786ff21f0290a8785..1db123d72fd17c4f0c880d590e41f442f0b1ff09 100644 (file)
--- a/gdb/nto-tdep.c
+++ b/gdb/nto-tdep.c
@@ -1,6 +1,7 @@
 /* nto-tdep.c - general QNX Neutrino target functionality.
 
-   Copyright (C) 2003, 2004, 2007, 2008, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2007, 2008, 2009, 2010, 2011
+   Free Software Foundation, Inc.
 
    Contributed by QNX Software Systems Ltd.
 
@@ -88,10 +89,12 @@ nto_map_arch_to_cputype (const char *arch)
 int
 nto_find_and_open_solib (char *solib, unsigned o_flags, char **temp_pathname)
 {
-  char *buf, *arch_path, *nto_root, *endian, *base;
+  char *buf, *arch_path, *nto_root, *endian;
+  const char *base;
   const char *arch;
   int ret;
-#define PATH_FMT "%s/lib:%s/usr/lib:%s/usr/photon/lib:%s/usr/photon/dll:%s/lib/dll"
+#define PATH_FMT \
+  "%s/lib:%s/usr/lib:%s/usr/photon/lib:%s/usr/photon/dll:%s/lib/dll"
 
   nto_root = nto_target ();
   if (strcmp (gdbarch_bfd_arch_info (target_gdbarch)->arch_name, "i386") == 0)
@@ -125,13 +128,7 @@ nto_find_and_open_solib (char *solib, unsigned o_flags, char **temp_pathname)
   sprintf (buf, PATH_FMT, arch_path, arch_path, arch_path, arch_path,
           arch_path);
 
-  /* Don't assume basename() isn't destructive.  */
-  base = strrchr (solib, '/');
-  if (!base)
-    base = solib;
-  else
-    base++;                    /* Skip over '/'.  */
-
+  base = lbasename (solib);
   ret = openp (buf, 1, base, o_flags, temp_pathname);
   if (ret < 0 && base != solib)
     {
@@ -341,6 +338,40 @@ nto_elf_osabi_sniffer (bfd *abfd)
   return GDB_OSABI_UNKNOWN;
 }
 
+static const char *nto_thread_state_str[] =
+{
+  "DEAD",              /* 0  0x00 */
+  "RUNNING",   /* 1  0x01 */
+  "READY",     /* 2  0x02 */
+  "STOPPED",   /* 3  0x03 */
+  "SEND",              /* 4  0x04 */
+  "RECEIVE",   /* 5  0x05 */
+  "REPLY",     /* 6  0x06 */
+  "STACK",     /* 7  0x07 */
+  "WAITTHREAD",        /* 8  0x08 */
+  "WAITPAGE",  /* 9  0x09 */
+  "SIGSUSPEND",        /* 10 0x0a */
+  "SIGWAITINFO",       /* 11 0x0b */
+  "NANOSLEEP", /* 12 0x0c */
+  "MUTEX",     /* 13 0x0d */
+  "CONDVAR",   /* 14 0x0e */
+  "JOIN",              /* 15 0x0f */
+  "INTR",              /* 16 0x10 */
+  "SEM",               /* 17 0x11 */
+  "WAITCTX",   /* 18 0x12 */
+  "NET_SEND",  /* 19 0x13 */
+  "NET_REPLY"  /* 20 0x14 */
+};
+
+char *
+nto_extra_thread_info (struct thread_info *ti)
+{
+  if (ti && ti->private
+      && ti->private->state < ARRAY_SIZE (nto_thread_state_str))
+    return (char *)nto_thread_state_str [ti->private->state];
+  return "";
+}
+
 void
 nto_initialize_signals (void)
 {
@@ -378,6 +409,7 @@ When non-zero, nto specific debug info is\n\
 displayed. Different information is displayed\n\
 for different positive values."),
                            NULL,
-                           NULL, /* FIXME: i18n: QNX NTO internal debugging is %s.  */
+                           NULL, /* FIXME: i18n: QNX NTO internal
+                                    debugging is %s.  */
                            &setdebuglist, &showdebuglist);
 }