From owner-p4-projects@FreeBSD.ORG  Sat Apr 15 00:16:01 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D9C1A16A401; Sat, 15 Apr 2006 00:16:00 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id AEFB316A402
	for <perforce@freebsd.org>; Sat, 15 Apr 2006 00:16:00 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7A6BD43D45
	for <perforce@freebsd.org>; Sat, 15 Apr 2006 00:16:00 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3F0G0mR032456
	for <perforce@freebsd.org>; Sat, 15 Apr 2006 00:16:00 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3F0G0YL032446
	for perforce@freebsd.org; Sat, 15 Apr 2006 00:16:00 GMT
	(envelope-from jb@freebsd.org)
Date: Sat, 15 Apr 2006 00:16:00 GMT
Message-Id: <200604150016.k3F0G0YL032446@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 95294 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 15 Apr 2006 00:16:01 -0000

http://perforce.freebsd.org/chv.cgi?CH=95294

Change 95294 by jb@jb_freebsd2 on 2006/04/15 00:15:29

	More compatibility cruft.

Affected files ...

.. //depot/projects/dtrace/src/contrib/opensolaris/compat/unistd.h#3 edit
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_create.c#3 edit
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/compat/sys/elf.h#3 edit

Differences ...

==== //depot/projects/dtrace/src/contrib/opensolaris/compat/unistd.h#3 (text+ko) ====

@@ -31,6 +31,7 @@
 
 #include <unistd.h>
 
+#define fork1		fork
 #define ftruncate64	ftruncate
 #define lseek64		lseek
 #define pread64		pread

==== //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_create.c#3 (text) ====

@@ -29,6 +29,8 @@
 
 #if	defined(sun)
 #include <sys/sysmacros.h>
+#else
+#define	P2ROUNDUP(x, align)		(-(-(x) & -(align)))
 #endif
 #include <sys/param.h>
 #include <sys/mman.h>

==== //depot/projects/dtrace/src/sys/contrib/opensolaris/compat/sys/elf.h#3 (text+ko) ====

@@ -177,5 +177,17 @@
 } Elf64_Cap;
 #endif
 
+/*
+ * The r_info field is composed of two 32-bit components: the symbol
+ * table index and the relocation type.  The relocation type for SPARC V9
+ * is further decomposed into an 8-bit type identifier and a 24-bit type
+ * dependent data field.  For the existing Elf32 relocation types,
+ * that data field is zero.
+ */
+#define	ELF64_R_TYPE_DATA(info)	(((Elf64_Xword)(info)<<32)>>40)
+#define	ELF64_R_TYPE_ID(info)	(((Elf64_Xword)(info)<<56)>>56)
+#define	ELF64_R_TYPE_INFO(data, type)	\
+		(((Elf64_Xword)(data)<<8)+(Elf64_Xword)(type))
+
 
 #endif	/* _OPENSOLARIS_COMPAT_SYS_ELF_H */