From 888441cc7a61f37e01f6ee576499baf90a622786 Mon Sep 17 00:00:00 2001 From: John Marino Date: Fri, 6 Dec 2013 15:08:44 +0100 Subject: [PATCH] binutils 2.24: Complete replacement of binutils 2.21 * Binutils 2.22 is still default, pending package build test * The world breakage cause by previous commit (intended) is fixed * To use binutils2.24, WORLD_BINUTILS and BINUTILSVER env vars need to be set --- Makefile_upgrade.inc | 1 + etc/defaults/make.conf | 2 +- etc/mtree/BSD.usr.dist | 4 +- gnu/usr.bin/binutils224/Makefile.inc | 2 +- gnu/usr.bin/binutils224/Makefile.inc0 | 2 +- gnu/usr.bin/binutils224/Makefile.inc1 | 2 +- gnu/usr.bin/binutils224/as/config.h | 59 +++++++++++++++++--- gnu/usr.bin/binutils224/gold/Makefile | 7 ++- gnu/usr.bin/binutils224/gprof/Makefile | 1 + gnu/usr.bin/binutils224/gprof/gconfig.h | 9 +-- gnu/usr.bin/binutils224/gprof/gprof.1 | 2 +- gnu/usr.bin/binutils224/ld/Makefile.i386 | 1 + gnu/usr.bin/binutils224/ld/Makefile.x86_64 | 19 +++++-- gnu/usr.bin/binutils224/ld/config.h | 30 ++++++++-- gnu/usr.bin/binutils224/libbfd/Makefile | 3 +- gnu/usr.bin/binutils224/libbfd/config.h | 32 ++++++++--- gnu/usr.bin/binutils224/libbinutils/config.h | 36 +++++++++++- gnu/usr.bin/binutils224/libgold/Makefile | 3 + gnu/usr.bin/binutils224/libgold/config.h | 48 ++++++++++++++-- gnu/usr.bin/binutils224/libiberty/Makefile | 3 + gnu/usr.bin/binutils224/libiberty/config.h | 17 ++++-- gnu/usr.bin/binutils224/libopcodes/config.h | 12 +++- gnu/usr.bin/binutils224/objdump/Makefile | 1 + share/man/man5/make.conf.5 | 8 +-- 24 files changed, 250 insertions(+), 54 deletions(-) diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc index 31e2cf8ef9..5ec52738c3 100644 --- a/Makefile_upgrade.inc +++ b/Makefile_upgrade.inc @@ -1732,6 +1732,7 @@ TO_REMOVE+=/usr/share/man/man1/size220.1.gz TO_REMOVE+=/usr/share/man/man1/strings220.1.gz TO_REMOVE+=/usr/share/man/man1/strip220.1.gz TO_REMOVE+=/usr/libexec/binutils220 +TO_REMOVE+=/usr/libexec/binutils221 TO_REMOVE+=/usr/share/zoneinfo/Europe/Tiraspol TO_REMOVE+=/usr/include/netatalk TO_REMOVE+=/usr/include/netproto/atalk diff --git a/etc/defaults/make.conf b/etc/defaults/make.conf index 149d546aeb..db5ef607b4 100644 --- a/etc/defaults/make.conf +++ b/etc/defaults/make.conf @@ -101,7 +101,7 @@ THREAD_LIB?= thread_xu #NO_NS_CACHING= true # # To avoid building various parts of the base system: -#NO_BINUTILS221=true # do not build binutils-2.21 +#NO_ALTBINUTILS=true # do not build the alternative set of binutils #NO_CRYPT= true # do not build crypto code #NO_CVS= true # do not build CVS #NO_GAMES= true # do not enter the games subdirectory diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index 71606d3665..f32166ac20 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -68,13 +68,13 @@ .. .. libexec - binutils221 + binutils222 ldscripts .. elf .. .. - binutils222 + binutils224 ldscripts .. elf diff --git a/gnu/usr.bin/binutils224/Makefile.inc b/gnu/usr.bin/binutils224/Makefile.inc index 09fc6b14bb..dfdb506157 100644 --- a/gnu/usr.bin/binutils224/Makefile.inc +++ b/gnu/usr.bin/binutils224/Makefile.inc @@ -1 +1 @@ -BINDIR?= /usr/libexec/binutils221/elf +BINDIR?= /usr/libexec/binutils224/elf diff --git a/gnu/usr.bin/binutils224/Makefile.inc0 b/gnu/usr.bin/binutils224/Makefile.inc0 index 894dd16613..1c780d8555 100644 --- a/gnu/usr.bin/binutils224/Makefile.inc0 +++ b/gnu/usr.bin/binutils224/Makefile.inc0 @@ -10,7 +10,7 @@ BINUTIL_ARCH= ${TARGET_ARCH} # added to it as we descend into subdirectories. RELTOP:= .. -RELSRC= ${RELTOP}/../../../contrib/binutils-2.21 +RELSRC= ${RELTOP}/../../../contrib/binutils-2.24 SRCDIR= ${.CURDIR}/${RELSRC} CFLAGS+= -I. diff --git a/gnu/usr.bin/binutils224/Makefile.inc1 b/gnu/usr.bin/binutils224/Makefile.inc1 index b8e73787c8..2c4be36fd0 100644 --- a/gnu/usr.bin/binutils224/Makefile.inc1 +++ b/gnu/usr.bin/binutils224/Makefile.inc1 @@ -1,2 +1,2 @@ -BUVERSION= binutils221 +BUVERSION= binutils224 .include "../Makefile.buo" diff --git a/gnu/usr.bin/binutils224/as/config.h b/gnu/usr.bin/binutils224/as/config.h index 7e3c335ce1..cfb6565fc1 100644 --- a/gnu/usr.bin/binutils224/as/config.h +++ b/gnu/usr.bin/binutils224/as/config.h @@ -1,6 +1,13 @@ /* config.h. Generated from config.in by configure. */ /* config.in. Generated from configure.in by autoheader. */ +/* Check that config.h is #included before system headers + (this works only for glibc, but that should be enough). */ +#if defined(__GLIBC__) && !defined(__FreeBSD_kernel__) && !defined(__CONFIG_H__) +# error config.h must be #included before system headers +#endif +#define __CONFIG_H__ 1 + /* Define if building universal (internal helper macro) */ /* #undef AC_APPLE_UNIVERSAL_BUILD */ @@ -22,7 +29,7 @@ /* #undef C_ALLOCA */ /* Default architecture. */ -/* #define DEFAULT_ARCH "i386" */ +/* #define DEFAULT_ARCH "x86_64" */ /* Default CRIS architecture. */ /* #undef DEFAULT_CRIS_ARCH */ @@ -34,7 +41,7 @@ /* #define EMULATIONS &i386elf, */ /* Define if you want run-time sanity checks. */ -#define ENABLE_CHECKING 1 +/* #undef ENABLE_CHECKING */ /* Define to 1 if translation of program messages to the user's native language is requested. */ @@ -47,12 +54,36 @@ */ /* #undef HAVE_ALLOCA_H */ +/* Define to 1 if you have the declaration of `free', and to 0 if you don't. + */ +#define HAVE_DECL_FREE 1 + +/* Define to 1 if you have the declaration of `getenv', and to 0 if you don't. + */ +#define HAVE_DECL_GETENV 1 + /* Is the prototype for getopt in in the expected format? */ #define HAVE_DECL_GETOPT 1 +/* Define to 1 if you have the declaration of `malloc', and to 0 if you don't. + */ +#define HAVE_DECL_MALLOC 1 + /* Define to 1 if you have the declaration of `mempcpy', and to 0 if you don't. */ -#define HAVE_DECL_MEMPCPY 0 +#define HAVE_DECL_MEMPCPY 1 + +/* Define to 1 if you have the declaration of `realloc', and to 0 if you + don't. */ +#define HAVE_DECL_REALLOC 1 + +/* Define to 1 if you have the declaration of `stpcpy', and to 0 if you don't. + */ +#define HAVE_DECL_STPCPY 1 + +/* Define to 1 if you have the declaration of `strstr', and to 0 if you don't. + */ +#define HAVE_DECL_STRSTR 1 /* Define to 1 if you have the declaration of `vsnprintf', and to 0 if you don't. */ @@ -67,9 +98,15 @@ /* Define to 1 if you have the header file. */ #define HAVE_INTTYPES_H 1 +/* Define if your file defines LC_MESSAGES. */ +#define HAVE_LC_MESSAGES 1 + /* Define to 1 if you have the header file. */ #define HAVE_LIMITS_H 1 +/* Define to 1 if you have the header file. */ +#define HAVE_LOCALE_H 1 + /* Define to 1 if you have the header file. */ #define HAVE_MEMORY_H 1 @@ -79,6 +116,9 @@ /* Define to 1 if you have the `sbrk' function. */ #define HAVE_SBRK 1 +/* Define to 1 if you have the `setlocale' function. */ +#define HAVE_SETLOCALE 1 + /* Define to 1 if you have the header file. */ #define HAVE_STDINT_H 1 @@ -220,20 +260,23 @@ /* Using strict COFF? */ /* #undef STRICTCOFF */ +/* Define if you can safely include both and . */ +#define STRING_WITH_STRINGS 1 + /* Target alias. */ -/* #define TARGET_ALIAS "i386-unknown-dragonfly2.9" */ +/* #define TARGET_ALIAS "x86_64-unknown-dragonfly3.7" */ /* Define as 1 if big endian. */ /* #undef TARGET_BYTES_BIG_ENDIAN */ /* Canonical target. */ -/* #define TARGET_CANONICAL "i386-unknown-dragonfly2.9" */ +/* #define TARGET_CANONICAL "x86_64-unknown-dragonfly3.7" */ /* Target CPU. */ -/* #define TARGET_CPU "i386" */ +/* #define TARGET_CPU "x86_64" */ /* Target OS. */ -/* #define TARGET_OS "dragonfly2.9" */ +/* #define TARGET_OS "dragonfly3.7" */ /* Define if default target is PowerPC Solaris. */ /* #undef TARGET_SOLARIS_COMMENT */ @@ -279,7 +322,7 @@ /* #undef USING_CGEN */ /* Version number of package */ -#define VERSION "2.21.1" +#define VERSION "2.24" /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ diff --git a/gnu/usr.bin/binutils224/gold/Makefile b/gnu/usr.bin/binutils224/gold/Makefile index 92435b0a36..389fe2bb8c 100644 --- a/gnu/usr.bin/binutils224/gold/Makefile +++ b/gnu/usr.bin/binutils224/gold/Makefile @@ -10,8 +10,12 @@ SRCS+= main.cc \ sparc.cc \ powerpc.cc \ arm.cc \ - arm-reloc-property.cc + arm-reloc-property.cc \ + tilegx.cc + +# standalone programs: # incremental-dump.cc +# dwp.cc WARNS= 1 CFLAGS= -DHAVE_CONFIG_H @@ -21,6 +25,7 @@ CFLAGS+= -DGOLD_DEFAULT_MACHINE=${GOLD_DEFAULT_MACHINE} CFLAGS+= -DGOLD_DEFAULT_SIZE=${GOLD_DEFAULT_SIZE} CFLAGS+= -DBINDIR="\"${TOOLS_PREFIX}${BINDIR}\"" CFLAGS+= -DTOOLBINDIR="\"${TOOLS_PREFIX}${BINDIR}\"" +CFLAGS+= -DTOOLLIBDIR="\"${TOOLS_PREFIX}${LIBDIR}\"" CFLAGS+= -I. -I${.CURDIR} CFLAGS+= -I${SRCDIR}/include -I${SRCDIR}/elfcpp CFLAGS+= -I${.CURDIR}/../libgold diff --git a/gnu/usr.bin/binutils224/gprof/Makefile b/gnu/usr.bin/binutils224/gprof/Makefile index 1130154497..a70bf3ff0d 100644 --- a/gnu/usr.bin/binutils224/gprof/Makefile +++ b/gnu/usr.bin/binutils224/gprof/Makefile @@ -25,6 +25,7 @@ SRCS= basic_blocks.c \ tahoe.c \ sparc.c \ mips.c \ + aarch64.c \ flat_bl.c \ bsd_callg_bl.c \ fsf_callg_bl.c diff --git a/gnu/usr.bin/binutils224/gprof/gconfig.h b/gnu/usr.bin/binutils224/gprof/gconfig.h index dc00bad763..c1485998e3 100644 --- a/gnu/usr.bin/binutils224/gprof/gconfig.h +++ b/gnu/usr.bin/binutils224/gprof/gconfig.h @@ -51,11 +51,8 @@ /* Name of package */ #define PACKAGE "gprof" -/* Define to the address where bug reports for this package should be sent. - * This definition redefines the libbfd config.h version, so it's disabled - * to silent the error messages seeing during buildworld. - * #define PACKAGE_BUGREPORT "" - */ +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "" /* Define to the full name of this package. */ #define PACKAGE_NAME "" @@ -98,7 +95,7 @@ /* Version number of package */ -#define VERSION "2.21.1" +#define VERSION "2.24" /* Number of bits in a file offset, on hosts where this is settable. */ /* #undef _FILE_OFFSET_BITS */ diff --git a/gnu/usr.bin/binutils224/gprof/gprof.1 b/gnu/usr.bin/binutils224/gprof/gprof.1 index 1e0349f426..04cb49f123 100644 --- a/gnu/usr.bin/binutils224/gprof/gprof.1 +++ b/gnu/usr.bin/binutils224/gprof/gprof.1 @@ -124,7 +124,7 @@ .\" ======================================================================== .\" .IX Title "GPROF 1" -.TH GPROF 1 "2011-07-16" "binutils-2.21.1" "GNU" +.TH GPROF 1 "2013-11-18" "binutils-2.23.91" "GNU" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/gnu/usr.bin/binutils224/ld/Makefile.i386 b/gnu/usr.bin/binutils224/ld/Makefile.i386 index 9b0490e499..21e1d4d2e8 100644 --- a/gnu/usr.bin/binutils224/ld/Makefile.i386 +++ b/gnu/usr.bin/binutils224/ld/Makefile.i386 @@ -31,5 +31,6 @@ e${NATIVE_EMULATION}.c ${LDSCRIPTS_${NATIVE_EMULATION}}: \ ${NATIVE_EMULATION:Q} \ "" \ no \ + yes \ ${NATIVE_EMULATION:Q} \ ${TARGET_TUPLE:Q} diff --git a/gnu/usr.bin/binutils224/ld/Makefile.x86_64 b/gnu/usr.bin/binutils224/ld/Makefile.x86_64 index 8e1f794531..04a42037e4 100644 --- a/gnu/usr.bin/binutils224/ld/Makefile.x86_64 +++ b/gnu/usr.bin/binutils224/ld/Makefile.x86_64 @@ -27,6 +27,7 @@ e${NATIVE_EMULATION}.c ${LDSCRIPTS_${NATIVE_EMULATION}}: \ ${NATIVE_EMULATION:Q} \ "" \ no \ + yes \ ${NATIVE_EMULATION:Q} \ ${TARGET_TUPLE:Q} @@ -44,7 +45,17 @@ CLEANFILES+= e${X86_EMULATION}.c e${X86_EMULATION}.c ${LDSCRIPTS_${X86_EMULATION}}: \ emulparams/${X86_EMULATION}.sh emultempl/elf32.em \ scripttempl/elf.sc genscripts.sh stringify.sed - sh ${SRCDIR}/ld/genscripts.sh ${SRCDIR:Q}/ld ${_i386_path:Q} \ - "" "" \ - ${HOST} ${TARGET_TUPLE:Q} ${TARGET_TUPLE:Q} \ - ${X86_EMULATION:Q} "" no ${X86_EMULATION:Q} ${TARGET_TUPLE:Q} + sh ${SRCDIR}/ld/genscripts.sh \ + ${SRCDIR:Q}/ld \ + ${_i386_path:Q} \ + "" \ + "" \ + ${HOST} \ + ${TARGET_TUPLE:Q} \ + ${TARGET_TUPLE:Q} \ + ${X86_EMULATION:Q} \ + "" \ + no \ + yes \ + ${X86_EMULATION:Q} \ + ${TARGET_TUPLE:Q} diff --git a/gnu/usr.bin/binutils224/ld/config.h b/gnu/usr.bin/binutils224/ld/config.h index ab62ab80ec..a7d80b7ee8 100644 --- a/gnu/usr.bin/binutils224/ld/config.h +++ b/gnu/usr.bin/binutils224/ld/config.h @@ -1,6 +1,13 @@ /* config.h. Generated from config.in by configure. */ /* config.in. Generated from configure.in by autoheader. */ +/* Check that config.h is #included before system headers + (this works only for glibc, but that should be enough). */ +#if defined(__GLIBC__) && !defined(__FreeBSD_kernel__) && !defined(__CONFIG_H__) +# error config.h must be #included before system headers +#endif +#define __CONFIG_H__ 1 + /* Define to 1 if translation of program messages to the user's native language is requested. */ /* #undef ENABLE_NLS */ @@ -62,12 +69,21 @@ /* Define to 1 if you have the `glob' function. */ #define HAVE_GLOB 1 +/* Define .init_array/.fini_array sections are available and working. */ +#define HAVE_INITFINI_ARRAY 1 + /* Define to 1 if you have the header file. */ #define HAVE_INTTYPES_H 1 +/* Define if your file defines LC_MESSAGES. */ +#define HAVE_LC_MESSAGES 1 + /* Define to 1 if you have the header file. */ #define HAVE_LIMITS_H 1 +/* Define to 1 if you have the header file. */ +#define HAVE_LOCALE_H 1 + /* Define to 1 if you have the `lseek' function. */ #define HAVE_LSEEK 1 @@ -89,6 +105,9 @@ /* Define to 1 if you have the `sbrk' function. */ #define HAVE_SBRK 1 +/* Define to 1 if you have the `setlocale' function. */ +#define HAVE_SETLOCALE 1 + /* Define to 1 if you have the header file. */ #define HAVE_STDINT_H 1 @@ -130,7 +149,7 @@ /* Define to 1 if you have the `waitpid' function. */ #define HAVE_WAITPID 1 -/* Define to 1 if you have the header file. */ +/* Define to 1 if you have the header file. */ /* #undef HAVE_WINDOWS_H */ /* Define to 1 if you have the header file. */ @@ -161,12 +180,15 @@ /* Define to the version of this package. */ #define PACKAGE_VERSION "" -/* The size of `long', as computed by sizeof. */ -/* #undef SIZEOF_LONG */ +/* The size of `void *', as computed by sizeof. */ +/* #define SIZEOF_VOID_P 8 */ /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 +/* Define if you can safely include both and . */ +#define STRING_WITH_STRINGS 1 + /* Use b modifier when opening binary files? */ /* #undef USE_BINARY_FOPEN */ @@ -193,7 +215,7 @@ /* Version number of package */ -#define VERSION "2.21.1" +#define VERSION "2.24" /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a `char[]'. */ diff --git a/gnu/usr.bin/binutils224/libbfd/Makefile b/gnu/usr.bin/binutils224/libbfd/Makefile index d26c3e8d73..818e4528fb 100644 --- a/gnu/usr.bin/binutils224/libbfd/Makefile +++ b/gnu/usr.bin/binutils224/libbfd/Makefile @@ -15,7 +15,8 @@ SRCS= archive.c archures.c bfd.c bfdio.c bfdwin.c \ format.c init.c libbfd.c opncls.c reloc.c \ section.c syms.c targets.c hash.c linker.c \ srec.c binary.c tekhex.c ihex.c stabs.c stab-syms.c \ - merge.c dwarf2.c simple.c compress.c verilog.c + merge.c dwarf2.c simple.c compress.c verilog.c \ + elf-nacl.c SRCS+= targmatch.h elf32-target.h elf64-target.h CLEANFILES+= elf64-target.h elf32-target.h targmatch.h diff --git a/gnu/usr.bin/binutils224/libbfd/config.h b/gnu/usr.bin/binutils224/libbfd/config.h index 43a0c1586e..8376ed39c3 100644 --- a/gnu/usr.bin/binutils224/libbfd/config.h +++ b/gnu/usr.bin/binutils224/libbfd/config.h @@ -1,6 +1,13 @@ /* config.h. Generated from config.in by configure. */ /* config.in. Generated from configure.in by autoheader. */ +/* Check that config.h is #included before system headers + (this works only for glibc, but that should be enough). */ +#if defined(__GLIBC__) && !defined(__FreeBSD_kernel__) && !defined(__CONFIG_H__) +# error config.h must be #included before system headers +#endif +#define __CONFIG_H__ 1 + /* Name of host specific core header file to include in elf.c. */ /* #undef CORE_HEADER */ @@ -106,6 +113,9 @@ /* Define to 1 if you have the `getpagesize' function. */ #define HAVE_GETPAGESIZE 1 +/* Define to 1 if you have the `getrlimit' function. */ +#define HAVE_GETRLIMIT 1 + /* Define to 1 if you have the `getuid' function. */ #define HAVE_GETUID 1 @@ -228,6 +238,9 @@ /* Define to 1 if you have the header file. */ #define HAVE_SYS_PROCFS_H 1 +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_RESOURCE_H 1 + /* Define to 1 if you have the header file. */ #define HAVE_SYS_STAT_H 1 @@ -246,6 +259,9 @@ /* Define if has win32_pstatus_t. */ /* #undef HAVE_WIN32_PSTATUS_T */ +/* Define to 1 if you have the header file. */ +/* #undef HAVE_WINDOWS_H */ + /* Define to 1 if you have the header file. */ #define HAVE_ZLIB_H 1 @@ -260,19 +276,19 @@ #define PACKAGE_BUGREPORT "" /* Define to the full name of this package. */ -#define PACKAGE_NAME "" +#define PACKAGE_NAME "bfd" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "" +#define PACKAGE_STRING "bfd 2.24" /* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "" +#define PACKAGE_TARNAME "bfd" /* Define to the home page for this package. */ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "" +#define PACKAGE_VERSION "2.24" /* The size of `char', as computed by sizeof. */ /* #undef SIZEOF_CHAR */ @@ -281,7 +297,7 @@ /* #undef SIZEOF_INT */ /* The size of `long', as computed by sizeof. */ -/* #define SIZEOF_LONG 4 */ +/* #undef SIZEOF_LONG */ /* The size of `long long', as computed by sizeof. */ #define SIZEOF_LONG_LONG 8 @@ -293,7 +309,7 @@ /* #undef SIZEOF_SHORT */ /* The size of `void *', as computed by sizeof. */ -/* #define SIZEOF_VOID_P 4 */ +/* #undef SIZEOF_VOID_P */ /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 @@ -305,7 +321,7 @@ #define TIME_WITH_SYS_TIME 1 /* Name of host specific header file to include in trad-core.c. */ -/* #define TRAD_HEADER "hosts/i386bsd.h" */ +/* #undef TRAD_HEADER */ /* Use b modifier when opening binary files? */ /* #undef USE_BINARY_FOPEN */ @@ -345,7 +361,7 @@ /* Version number of package */ -#define VERSION "2.21.1" +#define VERSION "2.24" /* Number of bits in a file offset, on hosts where this is settable. */ /* #undef _FILE_OFFSET_BITS */ diff --git a/gnu/usr.bin/binutils224/libbinutils/config.h b/gnu/usr.bin/binutils224/libbinutils/config.h index c960d99eb9..eb3a29121a 100644 --- a/gnu/usr.bin/binutils224/libbinutils/config.h +++ b/gnu/usr.bin/binutils224/libbinutils/config.h @@ -1,6 +1,13 @@ /* config.h. Generated from config.in by configure. */ /* config.in. Generated from configure.in by autoheader. */ +/* Check that config.h is #included before system headers + (this works only for glibc, but that should be enough). */ +#if defined(__GLIBC__) && !defined(__FreeBSD_kernel__) && !defined(__CONFIG_H__) +# error config.h must be #included before system headers +#endif +#define __CONFIG_H__ 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. */ @@ -9,6 +16,9 @@ /* Define to 1 if using `alloca.c'. */ /* #undef C_ALLOCA */ +/* Should ar and ranlib use -D behavior by default? */ +#define DEFAULT_AR_DETERMINISTIC 0 + /* Define to 1 if translation of program messages to the user's native language is requested. */ /* #undef ENABLE_NLS */ @@ -54,6 +64,10 @@ */ #define HAVE_DECL_STPCPY 1 +/* Define to 1 if you have the declaration of `strnlen', and to 0 if you + don't. */ +#define HAVE_DECL_STRNLEN 1 + /* Define to 1 if you have the declaration of `strstr', and to 0 if you don't. */ #define HAVE_DECL_STRSTR 1 @@ -83,9 +97,18 @@ /* Define to 1 if you have the header file. */ #define HAVE_INTTYPES_H 1 +/* Define if your file defines LC_MESSAGES. */ +#define HAVE_LC_MESSAGES 1 + /* Define to 1 if you have the header file. */ #define HAVE_LIMITS_H 1 +/* Define to 1 if you have the header file. */ +#define HAVE_LOCALE_H 1 + +/* Define if mbstate_t exists in wchar.h. */ +#define HAVE_MBSTATE_T 1 + /* Define to 1 if you have the header file. */ #define HAVE_MEMORY_H 1 @@ -98,6 +121,9 @@ /* Define to 1 if you have the `sbrk' function. */ #define HAVE_SBRK 1 +/* Define to 1 if you have the `setlocale' function. */ +#define HAVE_SETLOCALE 1 + /* Define to 1 if you have the `setmode' function. */ #define HAVE_SETMODE 1 @@ -143,6 +169,9 @@ /* Define to 1 if you have the `utimes' function. */ #define HAVE_UTIMES 1 +/* Define to 1 if you have the header file. */ +#define HAVE_WCHAR_H 1 + /* Define to 1 if you have the header file. */ #define HAVE_ZLIB_H 1 @@ -185,8 +214,11 @@ /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 +/* Define if you can safely include both and . */ +#define STRING_WITH_STRINGS 1 + /* Configured target name. */ -/* #define TARGET "i386-unknown-dragonfly2.9" */ +/* #define TARGET "x86_64-unknown-dragonfly3.7" */ /* Define to 1 if user symbol names have a leading underscore, 0 if not. */ #define TARGET_PREPENDS_UNDERSCORE 0 @@ -217,7 +249,7 @@ /* Version number of package */ -#define VERSION "2.21.1" +#define VERSION "2.24" /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a `char[]'. */ diff --git a/gnu/usr.bin/binutils224/libgold/Makefile b/gnu/usr.bin/binutils224/libgold/Makefile index 62414af682..dfcd96cd8d 100644 --- a/gnu/usr.bin/binutils224/libgold/Makefile +++ b/gnu/usr.bin/binutils224/libgold/Makefile @@ -20,6 +20,7 @@ SRCS+= archive.cc \ expression.cc \ fileread.cc \ gc.cc \ + gdb-index.cc \ gold-threads.cc \ gold.cc \ icf.cc \ @@ -28,6 +29,7 @@ SRCS+= archive.cc \ layout.cc \ mapfile.cc \ merge.cc \ + nacl.cc \ object.cc \ options.cc \ output.cc \ @@ -58,6 +60,7 @@ CFLAGS+= -DGOLD_DEFAULT_MACHINE=${GOLD_DEFAULT_MACHINE} CFLAGS+= -DGOLD_DEFAULT_SIZE=${GOLD_DEFAULT_SIZE} CFLAGS+= -DBINDIR="\"${TOOLS_PREFIX}${BINDIR}\"" CFLAGS+= -DTOOLBINDIR="\"${TOOLS_PREFIX}${BINDIR}\"" +CFLAGS+= -DTOOLLIBDIR="\"${TOOLS_PREFIX}${LIBDIR}\"" CFLAGS+= -DUSRDATA_PREFIX="\"${USRDATA_PREFIX}\"" CFLAGS+= -I. -I${.CURDIR} CFLAGS+= -I${SRCDIR}/gold diff --git a/gnu/usr.bin/binutils224/libgold/config.h b/gnu/usr.bin/binutils224/libgold/config.h index 7c11a64d84..3b70eb05b3 100644 --- a/gnu/usr.bin/binutils224/libgold/config.h +++ b/gnu/usr.bin/binutils224/libgold/config.h @@ -1,6 +1,13 @@ /* config.h. Generated from config.in by configure. */ /* config.in. Generated from configure.ac by autoheader. */ +/* Check that config.h is #included before system headers + (this works only for glibc, but that should be enough). */ +#if defined(__GLIBC__) && !defined(__FreeBSD_kernel__) && !defined(__CONFIG_H__) +# error config.h must be #included before system headers +#endif +#define __CONFIG_H__ 1 + /* Define if building universal (internal helper macro) */ /* #undef AC_APPLE_UNIVERSAL_BUILD */ @@ -18,13 +25,13 @@ #define GOLD_DEFAULT_BIG_ENDIAN false /* Default machine code */ -/* #define GOLD_DEFAULT_MACHINE EM_386 */ +/* #define GOLD_DEFAULT_MACHINE EM_X86_64 */ /* Default OSABI code */ #define GOLD_DEFAULT_OSABI ELFOSABI_NONE /* Default size (32 or 64) */ -/* #define GOLD_DEFAULT_SIZE 32 */ +/* #define GOLD_DEFAULT_SIZE 64 */ /* Define to 1 if you have the header file. */ /* #undef HAVE_BYTESWAP_H */ @@ -67,12 +74,18 @@ don't. */ #define HAVE_DECL_VSNPRINTF 1 +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + /* Define to 1 if you have the header file. */ #define HAVE_EXT_HASH_MAP 1 /* Define to 1 if you have the header file. */ #define HAVE_EXT_HASH_SET 1 +/* Define to 1 if you have the `fallocate' function. */ +/* #undef HAVE_FALLOCATE */ + /* Define to 1 if you have the `ffsll' function. */ #define HAVE_FFSLL 1 @@ -82,17 +95,26 @@ /* Define to 1 if you have the header file. */ #define HAVE_INTTYPES_H 1 +/* Define if your file defines LC_MESSAGES. */ +#define HAVE_LC_MESSAGES 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_LOCALE_H 1 + /* Define to 1 if you have the `mallinfo' function. */ /* #undef HAVE_MALLINFO */ /* Define to 1 if you have the header file. */ #define HAVE_MEMORY_H 1 -/* Define to 1 if you have the `mremap' function. */ +/* Define to 1 if you have the `mmap' function. */ +#define HAVE_MMAP 1 + +/* Define to 1 if you have the mremap function with MREMAP_MAYMOVE support */ /* #undef HAVE_MREMAP */ /* Define if compiler supports #pragma omp threadprivate */ -/* #undef HAVE_OMP_SUPPORT */ +#define HAVE_OMP_SUPPORT 1 /* Define to 1 if you have the `posix_fallocate' function. */ /* #undef HAVE_POSIX_FALLOCATE */ @@ -103,6 +125,9 @@ /* Define to 1 if you have the `readv' function. */ #define HAVE_READV 1 +/* Define to 1 if you have the `setlocale' function. */ +#define HAVE_SETLOCALE 1 + /* Define if struct stat has a field st_mtim with timespec for mtime */ #define HAVE_STAT_ST_MTIM 1 @@ -121,6 +146,9 @@ /* Define to 1 if you have the `sysconf' function. */ #define HAVE_SYSCONF 1 +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_MMAN_H 1 + /* Define to 1 if you have the header file. */ #define HAVE_SYS_STAT_H 1 @@ -145,6 +173,9 @@ /* Define to 1 if you have the `times' function. */ #define HAVE_TIMES 1 +/* Define if std::tr1::hash is usable */ +#define HAVE_TR1_HASH_OFF_T 1 + /* Define to 1 if you have the header file. */ #define HAVE_TR1_UNORDERED_MAP 1 @@ -157,9 +188,18 @@ /* Define to 1 if you have the header file. */ #define HAVE_UNISTD_H 1 +/* Define to 1 if you have the header file. */ +/* #undef HAVE_WINDOWS_H */ + /* Define to 1 if you have the header file. */ #define HAVE_ZLIB_H 1 +/* Default library search path */ +#define LIB_PATH "::DEFAULT::" + +/* Whether configured as a native linker */ +#define NATIVE_LINKER 1 + /* Name of package */ #define PACKAGE "gold" diff --git a/gnu/usr.bin/binutils224/libiberty/Makefile b/gnu/usr.bin/binutils224/libiberty/Makefile index 1adb61fa4a..7c6bbec235 100644 --- a/gnu/usr.bin/binutils224/libiberty/Makefile +++ b/gnu/usr.bin/binutils224/libiberty/Makefile @@ -10,6 +10,7 @@ SRCS= argv.c \ cp-demint.c \ cplus-dem.c \ crc32.c \ + dwarfnames.c \ dyn-string.c \ filename_cmp.c \ floatformat.c \ @@ -34,7 +35,9 @@ SRCS= argv.c \ simple-object-coff.c \ simple-object-elf.c \ simple-object-mach-o.c \ + simple-object-xcoff.c \ stpcpy.c \ + timeval-utils.c \ unlink-if-ordinary.c \ xatexit.c \ xexit.c \ diff --git a/gnu/usr.bin/binutils224/libiberty/config.h b/gnu/usr.bin/binutils224/libiberty/config.h index 312905e1d8..f43a22493c 100644 --- a/gnu/usr.bin/binutils224/libiberty/config.h +++ b/gnu/usr.bin/binutils224/libiberty/config.h @@ -110,6 +110,9 @@ /* Define to 1 if you have the `getpagesize' function. */ #define HAVE_GETPAGESIZE 1 +/* Define to 1 if you have the `getrlimit' function. */ +#define HAVE_GETRLIMIT 1 + /* Define to 1 if you have the `getrusage' function. */ #define HAVE_GETRUSAGE 1 @@ -170,9 +173,6 @@ /* Define to 1 if you have the `on_exit' function. */ /* #undef HAVE_ON_EXIT */ -/* Define if you have prctl PR_SET_NAME */ -/* #undef HAVE_PRCTL_SET_NAME */ - /* Define to 1 if you have the header file. */ /* #undef HAVE_PROCESS_H */ @@ -209,6 +209,9 @@ /* Define to 1 if you have the `setproctitle' function. */ #define HAVE_SETPROCTITLE 1 +/* Define to 1 if you have the `setrlimit' function. */ +#define HAVE_SETRLIMIT 1 + /* Define to 1 if you have the `sigsetmask' function. */ #define HAVE_SIGSETMASK 1 @@ -234,7 +237,7 @@ #define HAVE_STPCPY 1 /* Define to 1 if you have the `stpncpy' function. */ -/* #undef HAVE_STPNCPY */ +#define HAVE_STPNCPY 1 /* Define to 1 if you have the `strcasecmp' function. */ #define HAVE_STRCASECMP 1 @@ -260,6 +263,9 @@ /* Define to 1 if you have the `strndup' function. */ #define HAVE_STRNDUP 1 +/* Define to 1 if you have the `strnlen' function. */ +#define HAVE_STRNLEN 1 + /* Define to 1 if you have the `strrchr' function. */ #define HAVE_STRRCHR 1 @@ -305,6 +311,9 @@ /* Define to 1 if you have the header file. */ #define HAVE_SYS_PARAM_H 1 +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_PRCTL_H */ + /* Define to 1 if you have the header file. */ /* #undef HAVE_SYS_PSTAT_H */ diff --git a/gnu/usr.bin/binutils224/libopcodes/config.h b/gnu/usr.bin/binutils224/libopcodes/config.h index 18697c3287..5f8fe83184 100644 --- a/gnu/usr.bin/binutils224/libopcodes/config.h +++ b/gnu/usr.bin/binutils224/libopcodes/config.h @@ -1,6 +1,13 @@ /* config.h. Generated from config.in by configure. */ /* config.in. Generated from configure.in by autoheader. */ +/* Check that config.h is #included before system headers + (this works only for glibc, but that should be enough). */ +#if defined(__GLIBC__) && !defined(__FreeBSD_kernel__) && !defined(__CONFIG_H__) +# error config.h must be #included before system headers +#endif +#define __CONFIG_H__ 1 + /* Define to 1 if translation of program messages to the user's native language is requested. */ /* #undef ENABLE_NLS */ @@ -74,6 +81,9 @@ /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 +/* Define if you can safely include both and . */ +#define STRING_WITH_STRINGS 1 + /* Enable extensions on AIX 3, Interix. */ #ifndef _ALL_SOURCE # define _ALL_SOURCE 1 @@ -97,7 +107,7 @@ /* Version number of package */ -#define VERSION "2.21.1" +#define VERSION "2.24" /* Define to 1 if on MINIX. */ /* #undef _MINIX */ diff --git a/gnu/usr.bin/binutils224/objdump/Makefile b/gnu/usr.bin/binutils224/objdump/Makefile index 29c89a45d3..f743a8c7f9 100644 --- a/gnu/usr.bin/binutils224/objdump/Makefile +++ b/gnu/usr.bin/binutils224/objdump/Makefile @@ -9,6 +9,7 @@ MFILE= objdump${MANPAGEVER}.1 MAN= ${MFILE} WARNS= 1 +CFLAGS+= -DOBJDUMP_PRIVATE_VECTORS="" DPADD+= ${.OBJDIR}/../libopcodes/libopcodes.a LDADD+= ${.OBJDIR}/../libopcodes/libopcodes.a diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5 index 283b4e09bf..43037e9754 100644 --- a/share/man/man5/make.conf.5 +++ b/share/man/man5/make.conf.5 @@ -148,9 +148,9 @@ is the default value. .Pq Vt str Controls which binutils to use by default. Currently accepted values are -.Dq binutils221 -and .Dq binutils222 +and +.Dq binutils224 (default). .It Va WORLD_BINUTILSVER .Pq Vt str @@ -380,9 +380,9 @@ with the setuid bit turned on. .It Va MODULES_WITH_WORLD .Pq Vt bool Set to build modules with the system instead of the kernel. -.It Va NO_BINUTILS221 +.It Va NO_ALTBINUTILS .Pq Vt bool -Set to not build the older version of binutils (2.21). +Set to not build the alternative (non-default) set of binutils. .It Va NO_CRYPT .Pq Vt bool Set to not build crypto code. -- 2.41.0