From owner-p4-projects@FreeBSD.ORG Thu Mar 27 04:29:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CC517106566C; Thu, 27 Mar 2008 04:29:13 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8C1DC106564A for ; Thu, 27 Mar 2008 04:29:13 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7ECE98FC18 for ; Thu, 27 Mar 2008 04:29:13 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2R4TDLj041155 for ; Thu, 27 Mar 2008 04:29:13 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2R4TDSO041153 for perforce@freebsd.org; Thu, 27 Mar 2008 04:29:13 GMT (envelope-from jb@freebsd.org) Date: Thu, 27 Mar 2008 04:29:13 GMT Message-Id: <200803270429.m2R4TDSO041153@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 138704 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Mar 2008 04:29:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=138704 Change 138704 by jb@jb_freebsd1 on 2008/03/27 04:28:56 IFopensolaris Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/dtrace.1#1 branch .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/include/debug.h#13 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/messages/sgs.ident#7 integrate Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/include/debug.h#13 (text) ==== @@ -696,11 +696,11 @@ extern void Dbg_file_output(Ofl_desc *); extern void Dbg_file_preload(Lm_list *, const char *); extern void Dbg_file_prot(Rt_map *, int); -extern void Dbg_file_rejected(Lm_list *, Rej_desc *); +extern void Dbg_file_rejected(Lm_list *, Rej_desc *, Half mach); extern void Dbg_file_reuse(Lm_list *, const char *, const char *); extern void Dbg_file_skip(Lm_list *, const char *, const char *); -extern void Dbg_got_display(Ofl_desc *, Off, int); +extern void Dbg_got_display(Ofl_desc *, Off, int, Word, size_t); extern void Dbg_libs_audit(Lm_list *, const char *, const char *); extern void Dbg_libs_find(Lm_list *, const char *); @@ -973,8 +973,8 @@ extern void Elf_ehdr(Lm_list *, Ehdr *, Shdr *); -extern void Elf_got_entry(Lm_list *, Sword, Addr, Xword, Half, Word, void *, - const char *); +extern void Elf_got_entry(Lm_list *, Sword, Addr, Xword, Half, + uchar_t, uchar_t, Word, void *, const char *); extern void Elf_got_title(Lm_list *); extern void Elf_phdr(Lm_list *, Half, Phdr *); ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/messages/sgs.ident#7 (text) ==== @@ -1,5 +1,5 @@ # -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # CDDL HEADER START @@ -50,7 +50,6 @@ MSG_ID_CRLE 23 SUNW_OST_SGS /* sgs/crle */ MSG_ID_ELFDUMP 24 SUNW_OST_SGS /* sgs/elfdump */ MSG_ID_MOE 25 SUNW_OST_SGS /* sgs/moe */ - MSG_ID_ELFEDIT 26 SUNW_OST_SGS /* sgs/elfedit */ MSG_ID_ELFEDIT_CAP 27 SUNW_OST_SGS /* cap: */ MSG_ID_ELFEDIT_DYN 27 SUNW_OST_SGS /* dyn: */ @@ -60,3 +59,4 @@ MSG_ID_ELFEDIT_STR 27 SUNW_OST_SGS /* str: */ MSG_ID_ELFEDIT_SYM 27 SUNW_OST_SGS /* sym: */ MSG_ID_ELFEDIT_SYMINFO 27 SUNW_OST_SGS /* syminfo: */ +MSG_ID_ELFWRAP 28 SUNW_OST_SGS /* sgs/elfwrap */