From b241ba8eab18119f11a6c95f7e577045e535ad39 Mon Sep 17 00:00:00 2001
From: Andrew Cagney <cagney@redhat.com>
Date: Tue, 29 Feb 2000 13:38:55 +0000
Subject: [PATCH] From Peter Schauer: Define Solaris/x86 MERGEPID.

---
 gdb/ChangeLog                 | 5 +++++
 gdb/config/i386/tm-i386sol2.h | 1 +
 2 files changed, 6 insertions(+)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 451cffa..420316a 100644
--- 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 5de68cc..0967ba5 100644
--- 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 */
-- 
2.7.4