Date: Thu, 27 Mar 2008 04:29:13 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 138704 for review Message-ID: <200803270429.m2R4TDSO041153@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200803270429.m2R4TDSO041153>