From owner-p4-projects@FreeBSD.ORG  Fri Apr 14 00:00:07 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 F075716A405; Fri, 14 Apr 2006 00:00:06 +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 CBE3A16A404
	for <perforce@freebsd.org>; Fri, 14 Apr 2006 00:00:06 +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 7510443D45
	for <perforce@freebsd.org>; Fri, 14 Apr 2006 00:00:06 +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 k3E006ZI026443
	for <perforce@freebsd.org>; Fri, 14 Apr 2006 00:00:06 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3E006Dv026437
	for perforce@freebsd.org; Fri, 14 Apr 2006 00:00:06 GMT
	(envelope-from jb@freebsd.org)
Date: Fri, 14 Apr 2006 00:00:06 GMT
Message-Id: <200604140000.k3E006Dv026437@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 95194 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: Fri, 14 Apr 2006 00:00:07 -0000

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

Change 95194 by jb@jb_freebsd2 on 2006/04/13 23:59:51

	This is a hack to handle things that Sun has added to their ELF
	implementation which don't seem to be implemented in any BSD
	licensed headers. Is there a standard somewhere which refers to
	Elf64_Move, Elf64_Cap, Elf64_Lvalue and Elf64_Syminfo?
	
	I'd prefer make sure that the OpenSolaris code uses out ELF and
	link headers.

Affected files ...

.. //depot/projects/dtrace/src/contrib/opensolaris/head/gelf.h#4 edit

Differences ...

==== //depot/projects/dtrace/src/contrib/opensolaris/head/gelf.h#4 (text) ====

@@ -29,13 +29,40 @@
 
 #pragma ident	"@(#)gelf.h	1.14	05/06/08 SMI"
 
-#if !defined(sun)
-#include <opensolaris/compat/sys/types.h>
-#endif
 #include <sys/feature_tests.h>
 
 #include <libelf.h>
+#if defined(sun)
 #include <sys/link.h>
+#else
+#include <opensolaris/compat/sys/types.h>
+#include <sys/elf64.h>
+#include <link.h>
+
+/*
+ * Non Sun ELF implementations don't have these.
+ * Where is the standard that defines them?
+ */
+typedef   unsigned long long      Elf64_Lword;
+typedef struct {
+    Elf64_Lword m_value;    /* symbol value */
+    Elf64_Xword     m_info;     /* size + index */
+    Elf64_Xword m_poffset;  /* symbol offset */
+    Elf64_Half  m_repeat;   /* repeat count */
+    Elf64_Half  m_stride;   /* stride info */
+} Elf64_Move;
+typedef struct {
+    Elf64_Xword c_tag;      /* how to interpret value */
+    union {
+        Elf64_Xword c_val;
+        Elf64_Addr  c_ptr;
+    } c_un;
+} Elf64_Cap;
+typedef struct {
+    Elf64_Half  si_boundto; /* direct bindings - symbol bound to */
+    Elf64_Half  si_flags;   /* per symbol flags */
+} Elf64_Syminfo;
+#endif
 
 /*
  * FreeBSD always supports 64-bit types.