Date: Mon, 31 May 2004 11:16:42 -0700 (PDT) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 53882 for review Message-ID: <200405311816.i4VIGgQR095624@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=53882 Change 53882 by marcel@marcel_nfs on 2004/05/31 11:15:59 Revert changes to the bmake stuff of binutils. It was forgotten when the import of binutils was reverted. The only change left is the exclusion of gdb. We build gdb independently of binutils. Affected files ... .. //depot/projects/gdb/gnu/usr.bin/binutils/Makefile.inc0#4 edit .. //depot/projects/gdb/gnu/usr.bin/binutils/libbfd/Makefile#4 edit .. //depot/projects/gdb/gnu/usr.bin/binutils/libbfd/Makefile.i386#3 edit .. //depot/projects/gdb/gnu/usr.bin/binutils/libbfd/bfdver.h#2 delete .. //depot/projects/gdb/gnu/usr.bin/binutils/libiberty/Makefile#4 edit .. //depot/projects/gdb/gnu/usr.bin/binutils/libiberty/config.h#3 edit Differences ... ==== //depot/projects/gdb/gnu/usr.bin/binutils/Makefile.inc0#4 (text+ko) ==== @@ -17,6 +17,7 @@ RELSRC= ${RELTOP}/../../../contrib/binutils SRCDIR= ${.CURDIR}/${RELSRC} +CFLAGS+= -D_GNU_SOURCE CFLAGS+= -I. .if exists(${.CURDIR}/${TARGET_ARCH}) CFLAGS+= -I${.CURDIR}/${TARGET_ARCH} ==== //depot/projects/gdb/gnu/usr.bin/binutils/libbfd/Makefile#4 (text+ko) ==== @@ -9,11 +9,17 @@ coffgen.c corefile.c elf.c elf-eh-frame.c elf-strtab.c format.c \ hash.c ihex.c init.c libbfd.c linker.c merge.c opncls.c reloc.c \ section.c srec.c stab-syms.c stabs.c syms.c targets.c tekhex.c \ - targmatch.h dwarf1.c dwarf2.c -WARNS?=2 + targmatch.h dwarf1.c dwarf2.c config.h +WARNS?= 0 +.if (${TARGET_ARCH} == "alpha" || ${TARGET_ARCH} == "ia64" || \ + ${TARGET_ARCH} == "sparc64") +WARNS?= 2 +.endif CFLAGS+= -I${SRCDIR}/bfd +CFLAGS+= -DBFD_VERSION=\"${VERSION_DATE}\" -DBFD_VERSION_DATE=${VERSION_DATE} +CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\" INTERNALLIB= true -CLEANFILES+= targmatch.h +CLEANFILES+= config.h targmatch.h SELARCH= .if ${TARGET_ARCH} == "amd64" @@ -44,5 +50,12 @@ targmatch.h: targmatch.sed config.bfd sed -f ${.ALLSRC:M*.sed} ${.ALLSRC:M*.bfd} > ${.TARGET} + +config.h: config.h.fbsd +.if ${TARGET_ARCH} == "i386" + sed -e 's,!!TRAD_HEADER!!,"hosts/i386bsd.h",g' ${.ALLSRC} > ${.TARGET} +.else + sed -e 's,!!TRAD_HEADER!!,,g' ${.ALLSRC} > ${.TARGET} +.endif .include <bsd.lib.mk> ==== //depot/projects/gdb/gnu/usr.bin/binutils/libbfd/Makefile.i386#3 (text+ko) ==== @@ -2,7 +2,7 @@ DEFAULT_VECTOR= bfd_elf32_i386_freebsd_vec -SRCS+= cpu-i386.c elf32-i386.c elf32-target.h elf32.c elflink.c +SRCS+= cpu-i386.c elf32-i386-fbsd.c elf32-i386.c elf32-target.h elf32.c elflink.c VECS= ${DEFAULT_VECTOR} bfd_elf32_i386_vec .if ${TARGET_ARCH} == "i386" CFLAGS+= -DDEFAULT_VECTOR=${DEFAULT_VECTOR} ==== //depot/projects/gdb/gnu/usr.bin/binutils/libiberty/Makefile#4 (text+ko) ==== @@ -5,15 +5,12 @@ .PATH: ${SRCDIR}/libiberty LIB= iberty -SRCS= argv.c choose-temp.c concat.c cp-demangle.c cp-demint.c cplus-dem.c \ - dyn-string.c fdmatch.c fibheap.c floatformat.c getpwd.c getruntime.c \ - hashtab.c hex.c lbasename.c lrealpath.c make-temp-file.c md5.c \ - objalloc.c obstack.c partition.c pex-unix.c physmem.c regex.c \ - safe-ctype.c sort.c spaces.c splay-tree.c stpncpy.c strerror.c \ - strsignal.c ternary.c xatexit.c xexit.c xmalloc.c xmemdup.c xstrdup.c \ - xstrerror.c - -WARNS= 1 +SRCS= argv.c choose-temp.c concat.c cp-demangle.c cplus-dem.c \ + dyn-string.c getpwd.c getruntime.c \ + hex.c floatformat.c hashtab.c lbasename.c make-temp-file.c \ + objalloc.c obstack.c safe-ctype.c xatexit.c xexit.c xmalloc.c \ + xstrdup.c xstrerror.c +WARNS?= 1 CFLAGS+= -DHAVE_CONFIG_H INTERNALLIB= true ==== //depot/projects/gdb/gnu/usr.bin/binutils/libiberty/config.h#3 (text+ko) ==== @@ -1,378 +1,257 @@ -/* $FreeBSD$ */ -/* config.h. Generated by configure. */ -/* config.in. Generated from configure.ac by autoheader. */ -/* Define to `unsigned long' if <sys/types.h> doesn't define. */ -/* #undef uintptr_t */ +/* $FreeBSD: src/gnu/usr.bin/binutils/libiberty/config.h,v 1.5 2002/12/02 09:44:59 obrien Exp $ */ + +/* config.h. Generated automatically by configure. */ +/* config.in. Generated automatically from configure.in by autoheader 2.13. */ + +/* Define to empty if the keyword does not work. */ +/* #undef const */ + +/* Define if you have a working `mmap' system call. */ +#define HAVE_MMAP 1 + +/* Define if you have <sys/wait.h> that is POSIX.1 compatible. */ +#define HAVE_SYS_WAIT_H 1 + +/* Define if you have <vfork.h>. */ +/* #undef HAVE_VFORK_H */ + +/* Define as __inline if that's what the C compiler calls it. */ +/* #undef inline */ + +/* Define to `int' if <sys/types.h> doesn't define. */ +/* #undef pid_t */ + +/* Define if you need to in order for stat and other things to work. */ +/* #undef _POSIX_SOURCE */ +/* Define if you have the ANSI C header files. */ +#define STDC_HEADERS 1 -/* 1234 = LIL_ENDIAN, 4321 = BIGENDIAN */ -#define BYTEORDER 1234 +/* Define if you can safely include both <sys/time.h> and <time.h>. */ +#define TIME_WITH_SYS_TIME 1 -/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems. - This function is required for alloca.c support on those systems. */ -/* #undef CRAY_STACKSEG_END */ +/* Define vfork as fork if vfork does not work. */ +/* #undef vfork */ -/* Define to 1 if you have the <alloca.h> header file. */ -/* #undef HAVE_ALLOCA_H */ +/* Define if you have the _doprnt function. */ +/* #undef HAVE__DOPRNT */ -/* Define to 1 if you have the `asprintf' function. */ +/* Define if you have the asprintf function. */ #define HAVE_ASPRINTF 1 -/* Define to 1 if you have the `atexit' function. */ +/* Define if you have the atexit function. */ #define HAVE_ATEXIT 1 -/* Define to 1 if you have the `basename' function. */ +/* Define if you have the basename function. */ #define HAVE_BASENAME 1 -/* Define to 1 if you have the `bcmp' function. */ +/* Define if you have the bcmp function. */ #define HAVE_BCMP 1 -/* Define to 1 if you have the `bcopy' function. */ +/* Define if you have the bcopy function. */ #define HAVE_BCOPY 1 -/* Define to 1 if you have the `bsearch' function. */ +/* Define if you have the bsearch function. */ #define HAVE_BSEARCH 1 -/* Define to 1 if you have the `bzero' function. */ +/* Define if you have the bzero function. */ #define HAVE_BZERO 1 -/* Define to 1 if you have the `calloc' function. */ +/* Define if you have the calloc function. */ #define HAVE_CALLOC 1 -/* Define to 1 if you have the `canonicalize_file_name' function. */ -/* #undef HAVE_CANONICALIZE_FILE_NAME */ - -/* Define to 1 if you have the `clock' function. */ +/* Define if you have the clock function. */ #define HAVE_CLOCK 1 -/* Define to 1 if you have the <fcntl.h> header file. */ -#define HAVE_FCNTL_H 1 - -/* Define to 1 if you have the `ffs' function. */ +/* Define if you have the ffs function. */ #define HAVE_FFS 1 -/* Define to 1 if you have the `fork' function. */ -#define HAVE_FORK 1 - -/* Define to 1 if you have the `getcwd' function. */ +/* Define if you have the getcwd function. */ #define HAVE_GETCWD 1 -/* Define to 1 if you have the `getpagesize' function. */ +/* Define if you have the getpagesize function. */ #define HAVE_GETPAGESIZE 1 -/* Define to 1 if you have the `getrusage' function. */ +/* Define if you have the getrusage function. */ #define HAVE_GETRUSAGE 1 -/* Define to 1 if you have the `getsysinfo' function. */ -/* #undef HAVE_GETSYSINFO */ - -/* Define to 1 if you have the `gettimeofday' function. */ +/* Define if you have the gettimeofday function. */ #define HAVE_GETTIMEOFDAY 1 -/* Define to 1 if you have the `index' function. */ +/* Define if you have the index function. */ #define HAVE_INDEX 1 -/* Define to 1 if you have the `insque' function. */ +/* Define if you have the insque function. */ #define HAVE_INSQUE 1 -/* Define to 1 if you have the <inttypes.h> header file. */ -#define HAVE_INTTYPES_H 1 - -/* Define to 1 if you have the <limits.h> header file. */ -#define HAVE_LIMITS_H 1 - -/* Define to 1 if you have the <machine/hal_sysinfo.h> header file. */ -/* #undef HAVE_MACHINE_HAL_SYSINFO_H */ - -/* Define to 1 if you have the <malloc.h> header file. */ -/* #undef HAVE_MALLOC_H */ - -/* Define to 1 if you have the `memchr' function. */ +/* Define if you have the memchr function. */ #define HAVE_MEMCHR 1 -/* Define to 1 if you have the `memcmp' function. */ +/* Define if you have the memcmp function. */ #define HAVE_MEMCMP 1 -/* Define to 1 if you have the `memcpy' function. */ +/* Define if you have the memcpy function. */ #define HAVE_MEMCPY 1 -/* Define to 1 if you have the `memmove' function. */ +/* Define if you have the memmove function. */ #define HAVE_MEMMOVE 1 -/* Define to 1 if you have the <memory.h> header file. */ -#define HAVE_MEMORY_H 1 - -/* Define to 1 if you have the `mempcpy' function. */ -/* #undef HAVE_MEMPCPY */ - -/* Define to 1 if you have the `memset' function. */ +/* Define if you have the memset function. */ #define HAVE_MEMSET 1 -/* Define to 1 if you have the `mkstemps' function. */ +/* Define if you have the mkstemps function. */ #define HAVE_MKSTEMPS 1 -/* Define to 1 if you have a working `mmap' system call. */ -#define HAVE_MMAP 1 - -/* Define to 1 if you have the `on_exit' function. */ +/* Define if you have the on_exit function. */ /* #undef HAVE_ON_EXIT */ -/* Define to 1 if you have the `psignal' function. */ +/* Define if you have the psignal function. */ #define HAVE_PSIGNAL 1 -/* Define to 1 if you have the `pstat_getdynamic' function. */ -/* #undef HAVE_PSTAT_GETDYNAMIC */ - -/* Define to 1 if you have the `pstat_getstatic' function. */ -/* #undef HAVE_PSTAT_GETSTATIC */ - -/* Define to 1 if you have the `putenv' function. */ +/* Define if you have the putenv function. */ #define HAVE_PUTENV 1 -/* Define to 1 if you have the `random' function. */ +/* Define if you have the random function. */ #define HAVE_RANDOM 1 -/* Define to 1 if you have the `realpath' function. */ -#define HAVE_REALPATH 1 - -/* Define to 1 if you have the `rename' function. */ +/* Define if you have the rename function. */ #define HAVE_RENAME 1 -/* Define to 1 if you have the `rindex' function. */ +/* Define if you have the rindex function. */ #define HAVE_RINDEX 1 -/* Define to 1 if you have the `sbrk' function. */ +/* Define if you have the sbrk function. */ #define HAVE_SBRK 1 -/* Define to 1 if you have the `setenv' function. */ +/* Define if you have the setenv function. */ #define HAVE_SETENV 1 -/* Define to 1 if you have the `sigsetmask' function. */ +/* Define if you have the sigsetmask function. */ #define HAVE_SIGSETMASK 1 -/* Define to 1 if you have the `snprintf' function. */ -#define HAVE_SNPRINTF 1 - -/* Define to 1 if you have the <stdint.h> header file. */ -#define HAVE_STDINT_H 1 - -/* Define to 1 if you have the <stdlib.h> header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the `stpcpy' function. */ -#define HAVE_STPCPY 1 - -/* Define to 1 if you have the `stpncpy' function. */ -/* #undef HAVE_STPNCPY */ - -/* Define to 1 if you have the `strcasecmp' function. */ +/* Define if you have the strcasecmp function. */ #define HAVE_STRCASECMP 1 -/* Define to 1 if you have the `strchr' function. */ +/* Define if you have the strchr function. */ #define HAVE_STRCHR 1 -/* Define to 1 if you have the `strdup' function. */ +/* Define if you have the strdup function. */ #define HAVE_STRDUP 1 -/* Define to 1 if you have the `strerror' function. */ +/* Define if you have the strerror function. */ #define HAVE_STRERROR 1 -/* Define to 1 if you have the <strings.h> header file. */ -#define HAVE_STRINGS_H 1 - -/* Define to 1 if you have the <string.h> header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if you have the `strncasecmp' function. */ +/* Define if you have the strncasecmp function. */ #define HAVE_STRNCASECMP 1 -/* Define to 1 if you have the `strrchr' function. */ +/* Define if you have the strrchr function. */ #define HAVE_STRRCHR 1 -/* Define to 1 if you have the `strsignal' function. */ +/* Define if you have the strsignal function. */ #define HAVE_STRSIGNAL 1 -/* Define to 1 if you have the `strstr' function. */ +/* Define if you have the strstr function. */ #define HAVE_STRSTR 1 -/* Define to 1 if you have the `strtod' function. */ +/* Define if you have the strtod function. */ #define HAVE_STRTOD 1 -/* Define to 1 if you have the `strtol' function. */ +/* Define if you have the strtol function. */ #define HAVE_STRTOL 1 -/* Define to 1 if you have the `strtoul' function. */ +/* Define if you have the strtoul function. */ #define HAVE_STRTOUL 1 -/* Define to 1 if you have the `sysconf' function. */ +/* Define if you have the sysconf function. */ #define HAVE_SYSCONF 1 -/* Define to 1 if you have the `sysctl' function. */ -#define HAVE_SYSCTL 1 - -/* Define to 1 if you have the `sysmp' function. */ -/* #undef HAVE_SYSMP */ - -/* Define if you have the sys_errlist variable. */ -#define HAVE_SYS_ERRLIST 1 - -/* Define to 1 if you have the <sys/file.h> header file. */ -#define HAVE_SYS_FILE_H 1 - -/* Define to 1 if you have the <sys/mman.h> header file. */ -#define HAVE_SYS_MMAN_H 1 - -/* Define if you have the sys_nerr variable. */ -#define HAVE_SYS_NERR 1 - -/* Define to 1 if you have the <sys/param.h> header file. */ -#define HAVE_SYS_PARAM_H 1 - -/* Define to 1 if you have the <sys/pstat.h> header file. */ -/* #undef HAVE_SYS_PSTAT_H */ - -/* Define to 1 if you have the <sys/resource.h> header file. */ -#define HAVE_SYS_RESOURCE_H 1 - -/* Define if you have the sys_siglist variable. */ -#define HAVE_SYS_SIGLIST 1 - -/* Define to 1 if you have the <sys/stat.h> header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the <sys/sysctl.h> header file. */ -#define HAVE_SYS_SYSCTL_H 1 - -/* Define to 1 if you have the <sys/sysinfo.h> header file. */ -/* #undef HAVE_SYS_SYSINFO_H */ - -/* Define to 1 if you have the <sys/sysmp.h> header file. */ -/* #undef HAVE_SYS_SYSMP_H */ - -/* Define to 1 if you have the <sys/systemcfg.h> header file. */ -/* #undef HAVE_SYS_SYSTEMCFG_H */ - -/* Define to 1 if you have the <sys/table.h> header file. */ -/* #undef HAVE_SYS_TABLE_H */ - -/* Define to 1 if you have the <sys/time.h> header file. */ -#define HAVE_SYS_TIME_H 1 - -/* Define to 1 if you have the <sys/types.h> header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */ -#define HAVE_SYS_WAIT_H 1 - -/* Define to 1 if you have the `table' function. */ -/* #undef HAVE_TABLE */ - -/* Define to 1 if you have the `times' function. */ +/* Define if you have the times function. */ #define HAVE_TIMES 1 -/* Define to 1 if you have the <time.h> header file. */ -#define HAVE_TIME_H 1 - -/* Define to 1 if you have the `tmpnam' function. */ +/* Define if you have the tmpnam function. */ #define HAVE_TMPNAM 1 -/* Define if you have the \`uintptr_t' type. */ -#define HAVE_UINTPTR_T 1 - -/* Define to 1 if you have the <unistd.h> header file. */ -#define HAVE_UNISTD_H 1 - -/* Define to 1 if you have the `vasprintf' function. */ +/* Define if you have the vasprintf function. */ #define HAVE_VASPRINTF 1 -/* Define to 1 if you have the `vfork' function. */ -#define HAVE_VFORK 1 - -/* Define to 1 if you have the <vfork.h> header file. */ -/* #undef HAVE_VFORK_H */ - -/* Define to 1 if you have the `vfprintf' function. */ +/* Define if you have the vfprintf function. */ #define HAVE_VFPRINTF 1 -/* Define to 1 if you have the `vprintf' function. */ +/* Define if you have the vprintf function. */ #define HAVE_VPRINTF 1 -/* Define to 1 if you have the `vsnprintf' function. */ -#define HAVE_VSNPRINTF 1 - -/* Define to 1 if you have the `vsprintf' function. */ +/* Define if you have the vsprintf function. */ #define HAVE_VSPRINTF 1 -/* Define to 1 if you have the `waitpid' function. */ +/* Define if you have the waitpid function. */ #define HAVE_WAITPID 1 -/* Define to 1 if `fork' works. */ -#define HAVE_WORKING_FORK 1 +/* Define if you have the <alloca.h> header file. */ +/* #undef HAVE_ALLOCA_H */ -/* Define to 1 if `vfork' works. */ -#define HAVE_WORKING_VFORK 1 +/* Define if you have the <fcntl.h> header file. */ +#define HAVE_FCNTL_H 1 -/* Define to 1 if you have the `_doprnt' function. */ -/* #undef HAVE__DOPRNT */ +/* Define if you have the <limits.h> header file. */ +#define HAVE_LIMITS_H 1 -/* Define if you have the _system_configuration variable. */ -/* #undef HAVE__SYSTEM_CONFIGURATION */ +/* Define if you have the <stdlib.h> header file. */ +#define HAVE_STDLIB_H 1 -/* Define if the host machine stores words of multi-word integers in - big-endian order. */ -/* #undef HOST_WORDS_BIG_ENDIAN */ +/* Define if you have the <string.h> header file. */ +#define HAVE_STRING_H 1 -/* Define if canonicalize_file_name is not declared in system header files. */ -#define NEED_DECLARATION_CANONICALIZE_FILE_NAME 1 +/* Define if you have the <strings.h> header file. */ +#define HAVE_STRINGS_H 1 -/* Define if errno must be declared even when <errno.h> is included. */ -/* #undef NEED_DECLARATION_ERRNO */ +/* Define if you have the <sys/file.h> header file. */ +#define HAVE_SYS_FILE_H 1 -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -/* #undef NO_MINUS_C_MINUS_O */ +/* Define if you have the <sys/mman.h> header file. */ +#define HAVE_SYS_MMAN_H 1 -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "" +/* Define if you have the <sys/param.h> header file. */ +#define HAVE_SYS_PARAM_H 1 -/* Define to the full name of this package. */ -#define PACKAGE_NAME "" +/* Define if you have the <sys/resource.h> header file. */ +#define HAVE_SYS_RESOURCE_H 1 -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "" +/* Define if you have the <sys/stat.h> header file. */ +#define HAVE_SYS_STAT_H 1 -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "" +/* Define if you have the <sys/time.h> header file. */ +#define HAVE_SYS_TIME_H 1 -/* Define to the version of this package. */ -#define PACKAGE_VERSION "" +/* Define if you have the <time.h> header file. */ +#define HAVE_TIME_H 1 -/* Define if you know the direction of stack growth for your system; otherwise - it will be automatically deduced at run-time. STACK_DIRECTION > 0 => grows - toward higher addresses STACK_DIRECTION < 0 => grows toward lower addresses - STACK_DIRECTION = 0 => direction of growth unknown */ -#define STACK_DIRECTION -1 +/* Define if you have the <unistd.h> header file. */ +#define HAVE_UNISTD_H 1 -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 +/* Define if errno must be declared even when <errno.h> is included. */ +/* #undef NEED_DECLARATION_ERRNO */ -/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ -#define TIME_WITH_SYS_TIME 1 +/* Define if you have the `uintptr_t' type. */ +#define HAVE_UINTPTR_T 1 -/* whether byteorder is bigendian */ -/* #undef WORDS_BIGENDIAN */ +/* Define if you have the sys_errlist variable. */ +#define HAVE_SYS_ERRLIST 1 -/* Define to empty if `const' does not conform to ANSI C. */ -/* #undef const */ +/* Define if you have the sys_nerr variable. */ +#define HAVE_SYS_NERR 1 -/* Define as `__inline' if that's what the C compiler calls it, or to nothing - if it is not supported. */ -/* #undef inline */ +/* Define if you have the sys_siglist variable. */ +#define HAVE_SYS_SIGLIST 1 -/* Define to `int' if <sys/types.h> does not define. */ -/* #undef pid_t */ +/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP + systems. This function is required for alloca.c support on those + systems. */ +/* #undef CRAY_STACKSEG_END */ -/* Define to `unsigned long' if <sys/types.h> does not define. */ -/* #undef uintptr_t */ +/* Define if you know the direction of stack growth for your system; + otherwise it will be automatically deduced at run-time. + STACK_DIRECTION > 0 => grows toward higher addresses + STACK_DIRECTION < 0 => grows toward lower addresses + STACK_DIRECTION = 0 => direction of growth unknown */ +#define STACK_DIRECTION -1 -/* Define as `fork' if `vfork' does not work. */ -/* #undef vfork */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200405311816.i4VIGgQR095624>