From Peter Schauer: Define Solaris/x86 MERGEPID.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 451cffa4462319ea8154e520740dc7c49f6dbb03..420316a4f33f27b7f485c848f67fb8ddd3fe3830 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar  1 00:34:55 2000  Andrew Cagney  <cagney@b1.cygnus.com>
+
+       From 2000-02-26 Peter Schauer <pes@regent.e-technik.tu-muenchen.de>:
+       * config/i386/tm-i386sol2.h (MERGEPID): Define.
+
 Wed Mar  1 00:06:19 2000  Andrew Cagney  <cagney@b1.cygnus.com>
 
        From 1999-08-13 J.T. Conklin <jtc@redback.com>:

diff --git a/gdb/config/i386/tm-i386sol2.h b/gdb/config/i386/tm-i386sol2.h
index 5de68cc84864c62e082afea4903c484bdbcc3341..0967ba53aed4ad5270a6df726afe05f4abdee51d 100644 (file)
--- a/gdb/config/i386/tm-i386sol2.h
+++ b/gdb/config/i386/tm-i386sol2.h
@@ -45,5 +45,6 @@ extern char *sunpro_static_transform_name PARAMS ((char *));
 /* Macros to extract process id and thread id from a composite pid/tid */
 #define PIDGET(pid) ((pid) & 0xffff)
 #define TIDGET(pid) (((pid) >> 16) & 0xffff)
+#define MERGEPID(pid, tid) (((tid) << 16) | (pid))
 
 #endif /* ifndef TM_I386SOL2_H */