From e685772ec2b4d864baac10cebac3fd809645724d Mon Sep 17 00:00:00 2001 From: John Marino Date: Sat, 26 Nov 2011 00:14:58 +0100 Subject: [PATCH] binutils 2.22: Promote to primary binutils --- Makefile.inc1 | 2 +- UPDATING | 2 +- gnu/usr.bin/Makefile | 4 ++-- gnu/usr.bin/binutils221/addr2line/Makefile | 1 - gnu/usr.bin/binutils221/ar/Makefile | 1 - gnu/usr.bin/binutils221/as/Makefile.inc0 | 1 - gnu/usr.bin/binutils221/cxxfilt/Makefile | 1 - gnu/usr.bin/binutils221/elfedit/Makefile | 1 - gnu/usr.bin/binutils221/gprof/Makefile | 1 - gnu/usr.bin/binutils221/ld/Makefile | 1 - gnu/usr.bin/binutils221/nm/Makefile | 1 - gnu/usr.bin/binutils221/objcopy/Makefile | 1 - gnu/usr.bin/binutils221/objdump/Makefile | 1 - gnu/usr.bin/binutils221/ranlib/Makefile | 1 - gnu/usr.bin/binutils221/readelf/Makefile | 1 - gnu/usr.bin/binutils221/size/Makefile | 1 - gnu/usr.bin/binutils221/strings/Makefile | 1 - gnu/usr.bin/binutils221/strip/Makefile | 1 - share/man/man5/make.conf.5 | 6 +++--- share/man/man7/hier.7 | 2 +- share/mk/bsd.cpu.mk | 4 ++-- usr.bin/objformat/objformat.c | 3 ++- 22 files changed, 12 insertions(+), 26 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index faf5062636..0b6e7d1277 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -120,7 +120,7 @@ DESTDIRBASE?= ${OBJTREE}${.CURDIR} # This sets the compiler we use to build the world/kernel with WORLD_CCVER?= gcc44 -WORLD_BINUTILSVER?= binutils221 +WORLD_BINUTILSVER?= binutils222 # temporary until everybody has converted to x86_64 .if ${MACHINE_ARCH} == "amd64" diff --git a/UPDATING b/UPDATING index 370e971d14..f00264b35b 100644 --- a/UPDATING +++ b/UPDATING @@ -46,7 +46,7 @@ from your kernel configuration. BINUTILS 2.20 ------------- Binutils 2.20 has been removed in favor of Binutils 2.22. The accepted -values of BINUTILSVERS have changed accordingly. +values of BINUTILSVERS are now binutils221 and binutils222 (default). +-----------------------------------------------------------------------+ + UPGRADING DRAGONFLY FROM 2.8 to later versions + diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile index bf71fd081d..b79a7ceaee 100644 --- a/gnu/usr.bin/Makefile +++ b/gnu/usr.bin/Makefile @@ -15,10 +15,10 @@ SUBDIR+= binutils221 .if !defined(NO_GCC41) SUBDIR+= cc41 -.ORDER: binutils221 cc41 +.ORDER: binutils222 cc41 .endif SUBDIR+= cc44 -.ORDER: binutils221 cc44 +.ORDER: binutils222 cc44 .include diff --git a/gnu/usr.bin/binutils221/addr2line/Makefile b/gnu/usr.bin/binutils221/addr2line/Makefile index c4355deaf1..94378e4df3 100644 --- a/gnu/usr.bin/binutils221/addr2line/Makefile +++ b/gnu/usr.bin/binutils221/addr2line/Makefile @@ -5,7 +5,6 @@ PROG= addr2line SRCS= addr2line.c MAN= addr2line221.1 -MLINKS+=addr2line221.1 addr2line.1 WARNS= 2 addr2line221.1: ${SRCDIR}/binutils/doc/addr2line.1 diff --git a/gnu/usr.bin/binutils221/ar/Makefile b/gnu/usr.bin/binutils221/ar/Makefile index a9175bf915..f96681f3ab 100644 --- a/gnu/usr.bin/binutils221/ar/Makefile +++ b/gnu/usr.bin/binutils221/ar/Makefile @@ -5,7 +5,6 @@ PROG= ar SRCS= ar.c not-ranlib.c MAN= ar221.1 -MLINKS+=ar221.1 ar.1 NOSHARED?= yes ar221.1: ${SRCDIR}/binutils/doc/ar.1 diff --git a/gnu/usr.bin/binutils221/as/Makefile.inc0 b/gnu/usr.bin/binutils221/as/Makefile.inc0 index a40e06f69e..ff98bc4625 100644 --- a/gnu/usr.bin/binutils221/as/Makefile.inc0 +++ b/gnu/usr.bin/binutils221/as/Makefile.inc0 @@ -7,7 +7,6 @@ TARGET_OS?= dragonfly PROG= as MAN= as221.1 -MLINKS+=as221.1 as.1 SRCS+= app.c \ as.c \ atof-generic.c \ diff --git a/gnu/usr.bin/binutils221/cxxfilt/Makefile b/gnu/usr.bin/binutils221/cxxfilt/Makefile index f7c658a401..3d709b155d 100644 --- a/gnu/usr.bin/binutils221/cxxfilt/Makefile +++ b/gnu/usr.bin/binutils221/cxxfilt/Makefile @@ -5,7 +5,6 @@ PROG= c++filt SRCS= cxxfilt.c MAN= c++filt221.1 -MLINKS+=c++filt221.1 c++filt.1 WARNS= 1 c++filt221.1: ${.CURDIR}/c++filt.1 diff --git a/gnu/usr.bin/binutils221/elfedit/Makefile b/gnu/usr.bin/binutils221/elfedit/Makefile index f04be48d2c..b15b4cb263 100644 --- a/gnu/usr.bin/binutils221/elfedit/Makefile +++ b/gnu/usr.bin/binutils221/elfedit/Makefile @@ -5,7 +5,6 @@ PROG= elfedit SRCS= elfedit.c elfcomm.c MAN= elfedit221.1 -MLINKS+=elfedit221.1 elfedit.1 WARNS= 1 elfedit221.1: ${SRCDIR}/binutils/doc/elfedit.1 diff --git a/gnu/usr.bin/binutils221/gprof/Makefile b/gnu/usr.bin/binutils221/gprof/Makefile index 4889a0c9f3..1bd9482e23 100644 --- a/gnu/usr.bin/binutils221/gprof/Makefile +++ b/gnu/usr.bin/binutils221/gprof/Makefile @@ -28,7 +28,6 @@ SRCS= basic_blocks.c \ bsd_callg_bl.c \ fsf_callg_bl.c MAN= gprof221.1 -MLINKS+=gprof221.1 gprof.1 CFLAGS= -DHAVE_CONFIG_H CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../libbfd -I${.OBJDIR}/../libbfd diff --git a/gnu/usr.bin/binutils221/ld/Makefile b/gnu/usr.bin/binutils221/ld/Makefile index 1aa01f62be..55bce0f2e6 100644 --- a/gnu/usr.bin/binutils221/ld/Makefile +++ b/gnu/usr.bin/binutils221/ld/Makefile @@ -6,7 +6,6 @@ ELF_SCR_EXT= x xbn xc xd xdc xdw xn xr xs xsc xsw xu xw PROG= ld.bfd MAN= ld221.1 -MLINKS+=ld221.1 ld.1 LIBEXEC_BINUTILS= ${BINDIR}/.. SCRIPTDIR= ${LIBEXEC_BINUTILS}/ldscripts SRCS+= ldgram.y \ diff --git a/gnu/usr.bin/binutils221/nm/Makefile b/gnu/usr.bin/binutils221/nm/Makefile index a5a6a74668..a41a7babe1 100644 --- a/gnu/usr.bin/binutils221/nm/Makefile +++ b/gnu/usr.bin/binutils221/nm/Makefile @@ -4,7 +4,6 @@ PROG= nm MAN= nm221.1 -MLINKS+=nm221.1 nm.1 WARNS= 2 nm221.1: ${SRCDIR}/binutils/doc/nm.1 diff --git a/gnu/usr.bin/binutils221/objcopy/Makefile b/gnu/usr.bin/binutils221/objcopy/Makefile index f25b4b9612..15c65ecae4 100644 --- a/gnu/usr.bin/binutils221/objcopy/Makefile +++ b/gnu/usr.bin/binutils221/objcopy/Makefile @@ -5,7 +5,6 @@ PROG= objcopy SRCS= not-strip.c objcopy.c MAN= objcopy221.1 -MLINKS+=objcopy221.1 objcopy.1 WARNS= 1 objcopy221.1: ${SRCDIR}/binutils/doc/objcopy.1 diff --git a/gnu/usr.bin/binutils221/objdump/Makefile b/gnu/usr.bin/binutils221/objdump/Makefile index c599c0ed9f..f16093020c 100644 --- a/gnu/usr.bin/binutils221/objdump/Makefile +++ b/gnu/usr.bin/binutils221/objdump/Makefile @@ -5,7 +5,6 @@ PROG= objdump SRCS= elfcomm.c objdump.c MAN= objdump221.1 -MLINKS+=objdump221.1 objdump.1 WARNS= 1 DPADD+= ${.OBJDIR}/../libopcodes/libopcodes.a diff --git a/gnu/usr.bin/binutils221/ranlib/Makefile b/gnu/usr.bin/binutils221/ranlib/Makefile index ea13c8db08..5e0e26f36d 100644 --- a/gnu/usr.bin/binutils221/ranlib/Makefile +++ b/gnu/usr.bin/binutils221/ranlib/Makefile @@ -5,7 +5,6 @@ PROG= ranlib SRCS= ar.c is-ranlib.c MAN= ranlib221.1 -MLINKS+=ranlib221.1 ranlib.1 NOSHARED?= yes diff --git a/gnu/usr.bin/binutils221/readelf/Makefile b/gnu/usr.bin/binutils221/readelf/Makefile index 19bb965489..74d26b89ee 100644 --- a/gnu/usr.bin/binutils221/readelf/Makefile +++ b/gnu/usr.bin/binutils221/readelf/Makefile @@ -5,7 +5,6 @@ PROG= readelf SRCS= readelf.c unwind-ia64.c dwarf.c elfcomm.c MAN= readelf221.1 -MLINKS+=readelf221.1 readelf.1 WARNS= 1 readelf221.1: ${SRCDIR}/binutils/doc/readelf.1 diff --git a/gnu/usr.bin/binutils221/size/Makefile b/gnu/usr.bin/binutils221/size/Makefile index af60e8154d..c699d34de3 100644 --- a/gnu/usr.bin/binutils221/size/Makefile +++ b/gnu/usr.bin/binutils221/size/Makefile @@ -4,7 +4,6 @@ PROG= size MAN= size221.1 -MLINKS+=size221.1 size.1 WARNS= 2 size221.1: ${SRCDIR}/binutils/doc/size.1 diff --git a/gnu/usr.bin/binutils221/strings/Makefile b/gnu/usr.bin/binutils221/strings/Makefile index aae83b6a1e..221b24b428 100644 --- a/gnu/usr.bin/binutils221/strings/Makefile +++ b/gnu/usr.bin/binutils221/strings/Makefile @@ -4,7 +4,6 @@ PROG= strings MAN= strings221.1 -MLINKS+=strings221.1 strings.1 WARNS= 2 strings221.1: ${SRCDIR}/binutils/doc/strings.1 diff --git a/gnu/usr.bin/binutils221/strip/Makefile b/gnu/usr.bin/binutils221/strip/Makefile index 087b595ebc..bf37e47973 100644 --- a/gnu/usr.bin/binutils221/strip/Makefile +++ b/gnu/usr.bin/binutils221/strip/Makefile @@ -5,7 +5,6 @@ PROG= strip SRCS= objcopy.c is-strip.c MAN= strip221.1 -MLINKS+=strip221.1 strip.1 WARNS= 1 CLEANFILES+= maybe_stripped diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5 index 0e86e33145..882e32c412 100644 --- a/share/man/man5/make.conf.5 +++ b/share/man/man5/make.conf.5 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD: src/share/man/man5/make.conf.5,v 1.12.2.30 2003/05/18 17:05:55 brueffer Exp $ .\" -.Dd April 2, 2011 +.Dd November 26, 2011 .Dt MAKE.CONF 5 .Os .Sh NAME @@ -128,9 +128,9 @@ All other values will handled according to the settings in .Pq Vt str Controls which binutils to use by default. Currently accepted values are -.Dq binutils222 -and .Dq binutils221 +and +.Dq binutils222 (default). .It Va CFLAGS .Pq Vt str diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 index 8e861ae9d8..1dbe92705c 100644 --- a/share/man/man7/hier.7 +++ b/share/man/man7/hier.7 @@ -32,7 +32,7 @@ .\" @(#)hier.7 8.1 (Berkeley) 6/5/93 .\" $FreeBSD: src/share/man/man7/hier.7,v 1.29.2.17 2003/01/13 21:43:50 ceri Exp $ .\" -.Dd April 2, 2011 +.Dd November 26, 2011 .Dt HIER 7 .Os .Sh NAME diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk index f7244484ce..6e6c2dd8c8 100644 --- a/share/mk/bsd.cpu.mk +++ b/share/mk/bsd.cpu.mk @@ -24,8 +24,8 @@ HOST_CCVER?= ${_CCVER} HOST_CCVER?= ${_DEFAULT_CCVER} .endif -_DEFAULT_BINUTILSVER= binutils221 -_PREVIOUS_BINUTILSVER= binutils217 +_DEFAULT_BINUTILSVER= binutils222 +_PREVIOUS_BINUTILSVER= binutils220 .if exists(/usr/libexec/${_DEFAULT_BINUTILSVER}/elf/as) HOST_BINUTILSVER?= ${_DEFAULT_BINUTILSVER} diff --git a/usr.bin/objformat/objformat.c b/usr.bin/objformat/objformat.c index ee152b8cf5..ba8001073e 100644 --- a/usr.bin/objformat/objformat.c +++ b/usr.bin/objformat/objformat.c @@ -41,7 +41,7 @@ #endif #ifndef BINUTILSVER_DEFAULT -#define BINUTILSVER_DEFAULT "binutils221" +#define BINUTILSVER_DEFAULT "binutils222" #endif #ifndef OBJFORMAT_PATH_DEFAULT @@ -78,6 +78,7 @@ static struct command commands[] = { {"size", BINUTILS}, {"strings", BINUTILS}, {"strip", BINUTILS}, + {"incremental-dump", BINUTILS}, {"objformat", OBJFORMAT}, {"", -1} }; -- 2.41.0