Date: Sat, 15 Apr 2006 00:16:00 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 95294 for review Message-ID: <200604150016.k3F0G0YL032446@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200604150016.k3F0G0YL032446>