3 files changed, 30 insertions, 25 deletions
diff --git a/gdb/config/i386/i386v42mp.mh b/gdb/config/i386/i386v42mp.mh
index 969b257..6db1035 100644
--- a/gdb/config/i386/i386v42mp.mh
+++ b/gdb/config/i386/i386v42mp.mh
@@ -9,5 +9,5 @@ XM_CLIBS= -lsocket -lnsl
 # appropriate for i386v42mp
 NAT_FILE= nm-i386v42mp.h
 NATDEPFILES= corelow.o core-regset.o solib.o fork-child.o i386v4-nat.o \
-	procfs.o proc_api.o proc_events.o proc_flags.o proc_why.o
+	procfs.o proc_api.o proc_events.o proc_flags.o proc_why.o uw-thread.o
 
diff --git a/gdb/config/i386/tm-i386sol2.h b/gdb/config/i386/tm-i386sol2.h
index f35912f..5de68cc 100644
--- a/gdb/config/i386/tm-i386sol2.h
+++ b/gdb/config/i386/tm-i386sol2.h
@@ -46,18 +46,4 @@ extern char *sunpro_static_transform_name PARAMS ((char *));
 #define PIDGET(pid) ((pid) & 0xffff)
 #define TIDGET(pid) (((pid) >> 16) & 0xffff)
 
-/* Macro to extract carry from given regset.  */
-#define PS_FLAG_CARRY 0x1	/* Carry bit in PS */
-#define PROCFS_GET_CARRY(regset) ((regset)[EFL] & PS_FLAG_CARRY)
-
-#ifdef HAVE_THREAD_DB_LIB
-
-extern char *solaris_pid_to_str PARAMS ((int pid));
-
-#else
-
-extern char *procfs_pid_to_str PARAMS ((int pid));
-
-#endif
-
 #endif /* ifndef TM_I386SOL2_H */
diff --git a/gdb/config/i386/tm-i386v42mp.h b/gdb/config/i386/tm-i386v42mp.h
index 29c4ba0..40d1c12 100644
--- a/gdb/config/i386/tm-i386v42mp.h
+++ b/gdb/config/i386/tm-i386v42mp.h
@@ -26,20 +26,39 @@
 
 #include "i386/tm-i386v4.h"
 
-/* procfs on this architecture has multiple fds (ctl, as, map, status)
-   including a control fd */
+/* define to select for other sysv4.2mp weirdness (see procfs.c) */
 
-#ifndef HAVE_MULTIPLE_PROC_FDS
-#define HAVE_MULTIPLE_PROC_FDS
-#endif
+#define UNIXWARE
 
-/* procfs on this architecture communicates with read/write instead
-   of ioctl */
+/* The following macros extract process and lwp/thread ids from a
+   composite id.
 
-#define PROCFS_USE_READ_WRITE
+   For consistency with UnixWare core files, allocate bits 0-15 for
+   process ids and bits 16 and up for lwp ids.  Reserve bit 31 for
+   negative return values to indicate exceptions, and use bit 30 as a
+   flag to indicate a user-mode thread, leaving 14 bits for lwp
+   ids. */
 
-/* define to select for other sysv4.2mp weirdness */
+/* Number of bits in composite id allocated to process number. */
+#define PIDBITS 16
 
-#define UNIXWARE
+/* Return the process id stored in composite PID. */
+#define PIDGET(PID)             (((PID) & ((1 << PIDBITS) - 1)))
+
+/* Return the thread or lwp id stored in composite PID. */
+#define TIDGET(PID)             (((PID) & 0x3fffffff) >> PIDBITS)
+#define LIDGET(PID)             TIDGET(PID)
+
+/* Construct a composite id from lwp LID and the process portion of
+   composite PID. */
+#define MERGEPID(PID, LID)      (PIDGET(PID) | ((LID) << PIDBITS))
+#define MKLID(PID, LID)         MERGEPID(PID, LID)
+
+/* Construct a composite id from thread TID and the process portion of
+   composite PID. */
+#define MKTID(PID, TID)         (MERGEPID(PID, TID) | 0x40000000)
+
+/* Return whether PID contains a user-space thread id. */
+#define ISTID(PID)              ((PID) & 0x40000000)
 
 #endif /* ifndef TM_I386V42MP_H */