Date: Thu, 3 Aug 2006 04:56:09 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 103096 for review Message-ID: <200608030456.k734u92k065946@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=103096 Change 103096 by jb@jb_freebsd2 on 2006/08/03 04:55:47 Work-in-progress pending the availability of libbsdelf. Affected files ... .. //depot/projects/dtrace/src/gnu/lib/libdwarf/Makefile#3 edit .. //depot/projects/dtrace/src/gnu/lib/libdwarf/config.h#5 edit Differences ... ==== //depot/projects/dtrace/src/gnu/lib/libdwarf/Makefile#3 (text+ko) ==== @@ -20,12 +20,18 @@ OPENSOLARIS_SYS_DISTDIR=${.CURDIR}/../../../sys/contrib/opensolaris CFLAGS+= -I${.CURDIR} \ - -I${DWARF_DISTDIR} \ - -I${.CURDIR}/../../../sys \ + -I${DWARF_DISTDIR} + +.if ${MACHINE_ARCH} != "i386" +CFLAGS+= -I/usr/local/include +.else +CFLAGS+= -I${.CURDIR}/../../../sys \ -I${.CURDIR}/../../../sys/contrib \ -I${OPENSOLARIS_USR_DISTDIR}/head \ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common + CFLAGS+= -D_SOLARIS_C_SOURCE +.endif .PATH: ${DWARF_DISTDIR} ==== //depot/projects/dtrace/src/gnu/lib/libdwarf/config.h#5 (text+ko) ==== @@ -1,83 +1,19 @@ /* config.h. Generated by configure. */ /* config.h.in. Generated from configure.in by autoheader. */ -/* - Copyright (C) 2000,2003,2004 Silicon Graphics, Inc. All Rights Reserved. +/* Define to 1 if you have the <alloca.h> header file. */ +/* #undef HAVE_ALLOCA_H */ - This program is free software; you can redistribute it and/or modify it - under the terms of version 2.1 of the GNU Lesser General Public License - as published by the Free Software Foundation. +/* Define 1 if want producer to build with 32/64bit section offsets per dwarf3 + */ +#define HAVE_DWARF2_99_EXTENSION 1 - This program is distributed in the hope that it would be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +/* Define to 1 if the elf64_getehdr function is in libelf.a. */ +#define HAVE_ELF64_GETEHDR 1 - Further, this software is distributed without any warranty that it is - free of the rightful claim of any third person regarding infringement - or the like. Any license provided herein, whether implied or - otherwise, applies only to this software file. Patent licenses, if - any, provided herein do not apply to combinations of this program with - other software, or any other product whatsoever. - - You should have received a copy of the GNU Lesser General Public - License along with this program; if not, write the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, - USA. - - Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pky, - Mountain View, CA 94043, or: - - http://www.sgi.com - - For further information regarding this notice, see: - - http://oss.sgi.com/projects/GenInfo/NoticeExplan - -*/ - - - -/* Define to 1 if the elf64_getshdr function is in libelf.a */ -/* #undef HAVE_ELF64_GETSHDR */ - -/* Define to 1 if the elf64_getehdr function is in libelf.a */ -/* #undef HAVE_ELF64_GETEHDR */ -#if defined(__sparc64__) +/* Define to 1 if the elf64_getshdr function is in libelf.a. */ #define HAVE_ELF64_GETSHDR 1 -#define HAVE_ELF64_GETEHDR 1 -#endif - -/* see if __uint32_t is predefined in the compiler */ -/* #undef HAVE___UINT32_T */ -/* see if __uint64_t is predefined in the compiler */ -/* #undef HAVE___UINT64_T */ - -/* Define 1 if sys/types.h defines __uint32_t */ -#define HAVE___UINT32_T_IN_SYS_TYPES_H 1 - -/* Define 1 if sys/types.h defines __uint64_t */ -#define HAVE___UINT64_T_IN_SYS_TYPES_H 1 - -/* Define 1 if R_IA_64_DIR32LSB is defined (might be enum value) */ -/* #undef HAVE_R_IA_64_DIR32LSB */ - -/* Define 1 if sys/ia64/elf.h exists*/ -/* #undef HAVE_SYS_IA64_ELF_H */ - -/* Define 1 if want to build with 32/64bit section offsets for ia64 */ -/* per the dwarf2 committee proposal adopted Dec 1999 */ -/* #undef HAVE_DWARF2_99_EXTENSION */ - -/* Define 1 if want only 32bit section offsets per pure dwarf2.0.0 spec */ -/* Only one of HAVE_OLD_DWARF2_32BIT_OFFSET or HAVE_DWARF2_99_EXTENSION */ -/* may be defined */ -/* #undef HAVE_OLD_DWARF2_32BIT_OFFSET */ - - -/* Define to 1 if you have the <alloca.h> header file. */ -/* #undef HAVE_ALLOCA_H */ - /* Define to 1 if you have the <elfaccess.h> header file. */ /* #undef HAVE_ELFACCESS_H */ @@ -88,16 +24,24 @@ #define HAVE_INTTYPES_H 1 /* Define to 1 if you have the <libelf.h> header file. */ +#ifdef __i386__ #define HAVE_LIBELF_H 1 +#endif /* Define to 1 if you have the <libelf/libelf.h> header file. */ -/* #undef HAVE_LIBELF_LIBELF_H */ +#ifdef __sparc64__ +#define HAVE_LIBELF_LIBELF_H 1 +#endif /* Define to 1 if you have the <memory.h> header file. */ #define HAVE_MEMORY_H 1 -/* Define to 1 if you have the <sgidefs.h> header file. */ -/* #undef HAVE_SGIDEFS_H */ +/* Define 1 if want producer to build with only 32bit section offsets per + strict dwarf2 */ +/* #undef HAVE_OLD_DWARF2_32BIT_OFFSET */ + +/* Define 1 if R_IA_64_DIR32LSB is defined (might be enum value). */ +/* #undef HAVE_R_IA_64_DIR32LSB */ /* Define to 1 if you have the <stdint.h> header file. */ #define HAVE_STDINT_H 1 @@ -123,6 +67,24 @@ /* Define to 1 if you have the <unistd.h> header file. */ #define HAVE_UNISTD_H 1 +/* See if __uint32_t is predefined in the compiler. */ +/* #undef HAVE___UINT32_T */ + +/* Define 1 if __uint32_t is in sgidefs.h. */ +/* #undef HAVE___UINT32_T_IN_SGIDEFS_H */ + +/* Define 1 if sys/types.h defines __uint32_t. */ +#define HAVE___UINT32_T_IN_SYS_TYPES_H 1 + +/* See if __uint64_t is predefined in the compiler. */ +/* #undef HAVE___UINT64_T */ + +/* Define 1 if __uint64_t is in sgidefs.h. */ +/* #undef HAVE___UINT64_T_IN_SGIDEFS_H */ + +/* Define 1 if sys/types.h defines __uint64_t. */ +#define HAVE___UINT64_T_IN_SYS_TYPES_H 1 + /* Define to the address where bug reports for this package should be sent. */ #define PACKAGE_BUGREPORT "" @@ -143,7 +105,6 @@ /* Define to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel and VAX). */ -/* #undef WORDS_BIGENDIAN */ -#if defined(__sparc64__) -#define WORDS_BIGENDIAN +#ifdef __sparc64__ +#define WORDS_BIGENDIAN 1 #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200608030456.k734u92k065946>