From: John Marino Date: Sat, 21 May 2011 09:35:14 +0000 (+0200) Subject: binutils 2.20: Upgrade to version 2.20.1 X-Git-Tag: v2.12.0~582 X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/182ccc58a3d43793a0b172d8126104c6e3bd3344?ds=sidebyside binutils 2.20: Upgrade to version 2.20.1 In addition to the point upgrade, the makefiles have been prepared to generate c++filt. Soon the version of c++filt will be moved from the compilers to binutils. --- diff --git a/contrib/binutils-2.20/README.DELETED b/contrib/binutils-2.20/README.DELETED index 703a8444cd..f47e6d4371 100644 --- a/contrib/binutils-2.20/README.DELETED +++ b/contrib/binutils-2.20/README.DELETED @@ -1,5 +1,8 @@ ChangeLog MAINTAINERS +Makefile.def +Makefile.in +Makefile.tpl README-maintainer-mode bfd/ChangeLog bfd/ChangeLog-0001 @@ -14,6 +17,8 @@ bfd/ChangeLog-9495 bfd/ChangeLog-9697 bfd/ChangeLog-9899 bfd/MAINTAINERS +bfd/Makefile.am +bfd/Makefile.in bfd/PORTING bfd/TODO bfd/acinclude.m4 @@ -77,6 +82,11 @@ bfd/coff64-rs6000.c bfd/coffcode.h bfd/cofflink.c bfd/coffswap.h +bfd/config.in +bfd/configure +bfd/configure.com +bfd/configure.host +bfd/configure.in bfd/cpu-alpha.c bfd/cpu-arc.c bfd/cpu-arm.c @@ -398,6 +408,8 @@ binutils/ChangeLog-2008 binutils/ChangeLog-9197 binutils/ChangeLog-9899 binutils/MAINTAINERS +binutils/Makefile.am +binutils/Makefile.in binutils/NEWS binutils/aclocal.m4 binutils/arlex.c @@ -407,7 +419,11 @@ binutils/bin2c.c binutils/coffdump.c binutils/coffgrok.c binutils/coffgrok.h -binutils/cxxfilt.c +binutils/config.in +binutils/configure +binutils/configure.com +binutils/configure.in +binutils/configure.tgt binutils/deflex.c binutils/deflex.l binutils/defparse.c @@ -417,6 +433,8 @@ binutils/dep-in.sed binutils/dlltool.c binutils/dlltool.h binutils/dllwrap.c +binutils/doc/Makefile.in +binutils/doc/Makefile.am binutils/doc/binutils.info binutils/doc/cxxfilt.man binutils/doc/dlltool.1 @@ -466,14 +484,16 @@ binutils/windres.h binutils/winduni.c binutils/winduni.h compile -config/ config-ml.in +config.guess +config.rpath +config.sub +config/ +configure +configure.ac cpu/ depcomp elfcpp/ChangeLog -elfcpp/arm.h -elfcpp/powerpc.h -elfcpp/sparc.h etc/ gas/CONTRIBUTORS gas/ChangeLog @@ -488,6 +508,8 @@ gas/ChangeLog-9295 gas/ChangeLog-9697 gas/ChangeLog-9899 gas/MAINTAINERS +gas/Makefile.am +gas/Makefile.in gas/NEWS gas/acinclude.m4 gas/aclocal.m4 @@ -496,6 +518,7 @@ gas/bfin-parse.c gas/bfin-parse.h gas/cgen.c gas/cgen.h +gas/config.in gas/config/aout_gnu.h gas/config/atof-vax.c gas/config/bfin-aux.h @@ -697,8 +720,14 @@ gas/config/vax-inst.h gas/config/xtensa-istack.h gas/config/xtensa-relax.c gas/config/xtensa-relax.h +gas/configure +gas/configure.com +gas/configure.in +gas/configure.tgt gas/debug.c gas/dep-in.sed +gas/doc/Makefile.in +gas/doc/Makefile.am gas/doc/all.texi gas/doc/as.info gas/doc/c-mt.texi @@ -723,14 +752,17 @@ gas/po/ gas/stamp-h.in gas/testsuite/ gold/ChangeLog +gold/Makefile.am +gold/Makefile.in gold/NEWS gold/TODO gold/aclocal.m4 -gold/freebsd.h +gold/config.in +gold/configure +gold/configure.ac +gold/configure.tgt gold/po/ -gold/powerpc.cc gold/pread.c -gold/sparc.cc gold/testsuite/ gprof/ include/ChangeLog @@ -873,9 +905,16 @@ ld/ChangeLog-2008 ld/ChangeLog-9197 ld/ChangeLog-9899 ld/MAINTAINERS +ld/Makefile.am +ld/Makefile.in ld/NEWS ld/TODO ld/aclocal.m4 +ld/config.in +ld/configure +ld/configure.host +ld/configure.in +ld/configure.tgt ld/deffile.h ld/deffilep.c ld/deffilep.h @@ -1302,6 +1341,7 @@ ld/scripttempl/z8000.sc ld/stamp-h.in ld/testsuite/ libiberty/ChangeLog +libiberty/Makefile.in libiberty/_doprnt.c libiberty/aclocal.m4 libiberty/alloca.c @@ -1314,8 +1354,12 @@ libiberty/bsearch.c libiberty/bzero.c libiberty/calloc.c libiberty/clock.c -libiberty/config/ libiberty/config.h-vms +libiberty/config.in +libiberty/config/ +libiberty/configure +libiberty/configure.ac +libiberty/configure.com libiberty/copying-lib.texi libiberty/copysign.c libiberty/crc32.c @@ -1417,6 +1461,8 @@ opcodes/ChangeLog-2008 opcodes/ChangeLog-9297 opcodes/ChangeLog-9899 opcodes/MAINTAINERS +opcodes/Makefile.am +opcodes/Makefile.in opcodes/aclocal.m4 opcodes/alpha-dis.c opcodes/alpha-opc.c @@ -1438,6 +1484,10 @@ opcodes/cgen-opc.c opcodes/cgen-ops.h opcodes/cgen-types.h opcodes/cgen.sh +opcodes/config.in +opcodes/configure +opcodes/configure.com +opcodes/configure.in opcodes/cr16-dis.c opcodes/cr16-opc.c opcodes/cris-dis.c diff --git a/contrib/binutils-2.20/README.DRAGONFLY b/contrib/binutils-2.20/README.DRAGONFLY index 5747592e6a..475ca7843c 100644 --- a/contrib/binutils-2.20/README.DRAGONFLY +++ b/contrib/binutils-2.20/README.DRAGONFLY @@ -1,16 +1,17 @@ +GNU BINUTILS 2.20.1 +=================== - BINUTILS-2.20 AS USED BY DRAGONFLY +Original source can be downloaded from: +http://ftp.gnu.org/gnu/binutils - This directory contains a selected set of files from the GNU - binutils-2.20 distribution. The entire distribution is 125MB but - we really only need around 21MB of it. No files have been moved - or modified from their extracted position. +file = binutils-2.20.1.tar.bz2 +date = 3 Mar 2010 +size = 17501436 +sha1 = fd2ba806e6f3a55cee453cb25c86991b26a75dee - ON THE VENDOR BRANCH (vendor/BINUTILS220), DO NOT CREATE OR EDIT ANY - FILES IN THIS DIRECTORY HIERARCHY! THIS HIERARCHY REPRESENTS AN EXACT - COPY, MINUS UNNEEDED FILES, OF THE GNU BINUTILS DISTRIBUTION. +A list of files and directories removed is in README.DELETED - All modifications are made in the master or release branches! - - -SHA1 (binutils-2.20.tar.bz2) = 747e7b4d94bce46587236dc5f428e5b412a590dc +Local modifications applied to following files: + bfd/config.bfd + gas/config/tc-i386.c + ld/ldlex.l diff --git a/contrib/binutils-2.20/ld/ldlex.l b/contrib/binutils-2.20/ld/ldlex.l index 4add152288..ef09eb0412 100644 --- a/contrib/binutils-2.20/ld/ldlex.l +++ b/contrib/binutils-2.20/ld/ldlex.l @@ -22,6 +22,7 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ +#include "sysdep.h" #include "bfd.h" #include "safe-ctype.h" #include "bfdlink.h" diff --git a/gnu/usr.bin/binutils220/Makefile b/gnu/usr.bin/binutils220/Makefile index d5dbe7d89b..1b3ed85af4 100644 --- a/gnu/usr.bin/binutils220/Makefile +++ b/gnu/usr.bin/binutils220/Makefile @@ -1,3 +1,5 @@ +# notyet: cxxfilt + SUBDIR= libiberty libbfd libopcodes libbinutils \ addr2line ar as ld nm objcopy objdump ranlib readelf \ size strings strip doc diff --git a/gnu/usr.bin/binutils220/as/config.h b/gnu/usr.bin/binutils220/as/config.h index 1059799db4..fdf1f1d2b2 100644 --- a/gnu/usr.bin/binutils220/as/config.h +++ b/gnu/usr.bin/binutils220/as/config.h @@ -278,7 +278,7 @@ /* #undef USING_CGEN */ /* Version number of package */ -#define VERSION "2.20.0" +#define VERSION "2.20.1" /* 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/binutils220/cxxfilt/Makefile b/gnu/usr.bin/binutils220/cxxfilt/Makefile new file mode 100644 index 0000000000..a85c1a18d6 --- /dev/null +++ b/gnu/usr.bin/binutils220/cxxfilt/Makefile @@ -0,0 +1,16 @@ +.include "../Makefile.bu" + +.PATH: ${SRCDIR}/binutils + +PROG= c++filt +SRCS= cxxfilt.c +MAN= c++filt220.1 +#MLINKS+=c++filt220.1 c++filt.1 +WARNS= 1 + +c++filt220.1: ${.CURDIR}/c++filt.1 + cp ${.ALLSRC} ${.TARGET} + +CLEANFILES+= c++filt220.1 + +.include diff --git a/gnu/usr.bin/binutils220/cxxfilt/c++filt.1 b/gnu/usr.bin/binutils220/cxxfilt/c++filt.1 new file mode 100644 index 0000000000..76c7e0d5cb --- /dev/null +++ b/gnu/usr.bin/binutils220/cxxfilt/c++filt.1 @@ -0,0 +1,345 @@ +.\" Automatically generated by Pod::Man 2.16 (Pod::Simple 3.05) +.\" +.\" Standard preamble: +.\" ======================================================================== +.de Sh \" Subsection heading +.br +.if t .Sp +.ne 5 +.PP +\fB\\$1\fR +.PP +.. +.de Sp \" Vertical space (when we can't use .PP) +.if t .sp .5v +.if n .sp +.. +.de Vb \" Begin verbatim text +.ft CW +.nf +.ne \\$1 +.. +.de Ve \" End verbatim text +.ft R +.fi +.. +.\" Set up some character translations and predefined strings. \*(-- will +.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left +.\" double quote, and \*(R" will give a right double quote. \*(C+ will +.\" give a nicer C++. Capital omega is used to do unbreakable dashes and +.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, +.\" nothing in troff, for use with C<>. +.tr \(*W- +.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' +.ie n \{\ +. ds -- \(*W- +. ds PI pi +. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch +. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch +. ds L" "" +. ds R" "" +. ds C` "" +. ds C' "" +'br\} +.el\{\ +. ds -- \|\(em\| +. ds PI \(*p +. ds L" `` +. ds R" '' +'br\} +.\" +.\" Escape single quotes in literal strings from groff's Unicode transform. +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" +.\" If the F register is turned on, we'll generate index entries on stderr for +.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index +.\" entries marked with X<> in POD. Of course, you'll have to process the +.\" output yourself in some meaningful fashion. +.ie \nF \{\ +. de IX +. tm Index:\\$1\t\\n%\t"\\$2" +.. +. nr % 0 +. rr F +.\} +.el \{\ +. de IX +.. +.\} +.\" +.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). +.\" Fear. Run. Save yourself. No user-serviceable parts. +. \" fudge factors for nroff and troff +.if n \{\ +. ds #H 0 +. ds #V .8m +. ds #F .3m +. ds #[ \f1 +. ds #] \fP +.\} +.if t \{\ +. ds #H ((1u-(\\\\n(.fu%2u))*.13m) +. ds #V .6m +. ds #F 0 +. ds #[ \& +. ds #] \& +.\} +. \" simple accents for nroff and troff +.if n \{\ +. ds ' \& +. ds ` \& +. ds ^ \& +. ds , \& +. ds ~ ~ +. ds / +.\} +.if t \{\ +. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u" +. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u' +. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u' +. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u' +. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u' +. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' +.\} +. \" troff and (daisy-wheel) nroff accents +.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V' +.ds 8 \h'\*(#H'\(*b\h'-\*(#H' +.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#] +.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H' +.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u' +.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#] +.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#] +.ds ae a\h'-(\w'a'u*4/10)'e +.ds Ae A\h'-(\w'A'u*4/10)'E +. \" corrections for vroff +.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' +.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' +. \" for low resolution devices (crt and lpr) +.if \n(.H>23 .if \n(.V>19 \ +\{\ +. ds : e +. ds 8 ss +. ds o a +. ds d- d\h'-1'\(ga +. ds D- D\h'-1'\(hy +. ds th \o'bp' +. ds Th \o'LP' +. ds ae ae +. ds Ae AE +.\} +.rm #[ #] #H #V #F C +.\" ======================================================================== +.\" +.IX Title "C++FILT 1" +.TH C++FILT 1 "2009-10-16" "binutils-2.20" "GNU Development Tools" +.\" For nroff, turn off justification. Always turn off hyphenation; it makes +.\" way too many mistakes in technical documents. +.if n .ad l +.nh +.SH "NAME" +c++filt \- Demangle C++ and Java symbols. +.SH "SYNOPSIS" +.IX Header "SYNOPSIS" +c++filt [\fB\-_\fR|\fB\-\-strip\-underscores\fR] + [\fB\-n\fR|\fB\-\-no\-strip\-underscores\fR] + [\fB\-p\fR|\fB\-\-no\-params\fR] + [\fB\-t\fR|\fB\-\-types\fR] + [\fB\-i\fR|\fB\-\-no\-verbose\fR] + [\fB\-s\fR \fIformat\fR|\fB\-\-format=\fR\fIformat\fR] + [\fB\-\-help\fR] [\fB\-\-version\fR] [\fIsymbol\fR...] +.SH "DESCRIPTION" +.IX Header "DESCRIPTION" +The \*(C+ and Java languages provide function overloading, which means +that you can write many functions with the same name, providing that +each function takes parameters of different types. In order to be +able to distinguish these similarly named functions \*(C+ and Java +encode them into a low-level assembler name which uniquely identifies +each different version. This process is known as \fImangling\fR. The +\&\fBc++filt\fR +[1] +program does the inverse mapping: it decodes (\fIdemangles\fR) low-level +names into user-level names so that they can be read. +.PP +Every alphanumeric word (consisting of letters, digits, underscores, +dollars, or periods) seen in the input is a potential mangled name. +If the name decodes into a \*(C+ name, the \*(C+ name replaces the +low-level name in the output, otherwise the original word is output. +In this way you can pass an entire assembler source file, containing +mangled names, through \fBc++filt\fR and see the same source file +containing demangled names. +.PP +You can also use \fBc++filt\fR to decipher individual symbols by +passing them on the command line: +.PP +.Vb 1 +\& c++filt +.Ve +.PP +If no \fIsymbol\fR arguments are given, \fBc++filt\fR reads symbol +names from the standard input instead. All the results are printed on +the standard output. The difference between reading names from the +command line versus reading names from the standard input is that +command line arguments are expected to be just mangled names and no +checking is performed to separate them from surrounding text. Thus +for example: +.PP +.Vb 1 +\& c++filt \-n _Z1fv +.Ve +.PP +will work and demangle the name to \*(L"f()\*(R" whereas: +.PP +.Vb 1 +\& c++filt \-n _Z1fv, +.Ve +.PP +will not work. (Note the extra comma at the end of the mangled +name which makes it invalid). This command however will work: +.PP +.Vb 1 +\& echo _Z1fv, | c++filt \-n +.Ve +.PP +and will display \*(L"f(),\*(R", i.e., the demangled name followed by a +trailing comma. This behaviour is because when the names are read +from the standard input it is expected that they might be part of an +assembler source file where there might be extra, extraneous +characters trailing after a mangled name. For example: +.PP +.Vb 1 +\& .type _Z1fv, @function +.Ve +.SH "OPTIONS" +.IX Header "OPTIONS" +.IP "\fB\-_\fR" 4 +.IX Item "-_" +.PD 0 +.IP "\fB\-\-strip\-underscores\fR" 4 +.IX Item "--strip-underscores" +.PD +On some systems, both the C and \*(C+ compilers put an underscore in front +of every name. For example, the C name \f(CW\*(C`foo\*(C'\fR gets the low-level +name \f(CW\*(C`_foo\*(C'\fR. This option removes the initial underscore. Whether +\&\fBc++filt\fR removes the underscore by default is target dependent. +.IP "\fB\-n\fR" 4 +.IX Item "-n" +.PD 0 +.IP "\fB\-\-no\-strip\-underscores\fR" 4 +.IX Item "--no-strip-underscores" +.PD +Do not remove the initial underscore. +.IP "\fB\-p\fR" 4 +.IX Item "-p" +.PD 0 +.IP "\fB\-\-no\-params\fR" 4 +.IX Item "--no-params" +.PD +When demangling the name of a function, do not display the types of +the function's parameters. +.IP "\fB\-t\fR" 4 +.IX Item "-t" +.PD 0 +.IP "\fB\-\-types\fR" 4 +.IX Item "--types" +.PD +Attempt to demangle types as well as function names. This is disabled +by default since mangled types are normally only used internally in +the compiler, and they can be confused with non-mangled names. For example, +a function called \*(L"a\*(R" treated as a mangled type name would be +demangled to \*(L"signed char\*(R". +.IP "\fB\-i\fR" 4 +.IX Item "-i" +.PD 0 +.IP "\fB\-\-no\-verbose\fR" 4 +.IX Item "--no-verbose" +.PD +Do not include implementation details (if any) in the demangled +output. +.IP "\fB\-s\fR \fIformat\fR" 4 +.IX Item "-s format" +.PD 0 +.IP "\fB\-\-format=\fR\fIformat\fR" 4 +.IX Item "--format=format" +.PD +\&\fBc++filt\fR can decode various methods of mangling, used by +different compilers. The argument to this option selects which +method it uses: +.RS 4 +.ie n .IP """auto""" 4 +.el .IP "\f(CWauto\fR" 4 +.IX Item "auto" +Automatic selection based on executable (the default method) +.ie n .IP """gnu""" 4 +.el .IP "\f(CWgnu\fR" 4 +.IX Item "gnu" +the one used by the \s-1GNU\s0 \*(C+ compiler (g++) +.ie n .IP """lucid""" 4 +.el .IP "\f(CWlucid\fR" 4 +.IX Item "lucid" +the one used by the Lucid compiler (lcc) +.ie n .IP """arm""" 4 +.el .IP "\f(CWarm\fR" 4 +.IX Item "arm" +the one specified by the \*(C+ Annotated Reference Manual +.ie n .IP """hp""" 4 +.el .IP "\f(CWhp\fR" 4 +.IX Item "hp" +the one used by the \s-1HP\s0 compiler (aCC) +.ie n .IP """edg""" 4 +.el .IP "\f(CWedg\fR" 4 +.IX Item "edg" +the one used by the \s-1EDG\s0 compiler +.ie n .IP """gnu\-v3""" 4 +.el .IP "\f(CWgnu\-v3\fR" 4 +.IX Item "gnu-v3" +the one used by the \s-1GNU\s0 \*(C+ compiler (g++) with the V3 \s-1ABI\s0. +.ie n .IP """java""" 4 +.el .IP "\f(CWjava\fR" 4 +.IX Item "java" +the one used by the \s-1GNU\s0 Java compiler (gcj) +.ie n .IP """gnat""" 4 +.el .IP "\f(CWgnat\fR" 4 +.IX Item "gnat" +the one used by the \s-1GNU\s0 Ada compiler (\s-1GNAT\s0). +.RE +.RS 4 +.RE +.IP "\fB\-\-help\fR" 4 +.IX Item "--help" +Print a summary of the options to \fBc++filt\fR and exit. +.IP "\fB\-\-version\fR" 4 +.IX Item "--version" +Print the version number of \fBc++filt\fR and exit. +.IP "\fB@\fR\fIfile\fR" 4 +.IX Item "@file" +Read command-line options from \fIfile\fR. The options read are +inserted in place of the original @\fIfile\fR option. If \fIfile\fR +does not exist, or cannot be read, then the option will be treated +literally, and not removed. +.Sp +Options in \fIfile\fR are separated by whitespace. A whitespace +character may be included in an option by surrounding the entire +option in either single or double quotes. Any character (including a +backslash) may be included by prefixing the character to be included +with a backslash. The \fIfile\fR may itself contain additional +@\fIfile\fR options; any such options will be processed recursively. +.SH "FOOTNOTES" +.IX Header "FOOTNOTES" +.IP "1." 4 +MS-DOS does not allow \f(CW\*(C`+\*(C'\fR characters in file names, so on +MS-DOS this program is named \fB\s-1CXXFILT\s0\fR. +.SH "SEE ALSO" +.IX Header "SEE ALSO" +the Info entries for \fIbinutils\fR. +.SH "COPYRIGHT" +.IX Header "COPYRIGHT" +Copyright (c) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +.PP +Permission is granted to copy, distribute and/or modify this document +under the terms of the \s-1GNU\s0 Free Documentation License, Version 1.3 +or any later version published by the Free Software Foundation; +with no Invariant Sections, with no Front-Cover Texts, and with no +Back-Cover Texts. A copy of the license is included in the +section entitled \*(L"\s-1GNU\s0 Free Documentation License\*(R". diff --git a/gnu/usr.bin/binutils220/ld/Makefile b/gnu/usr.bin/binutils220/ld/Makefile index 2df8cad474..2f2793e35e 100644 --- a/gnu/usr.bin/binutils220/ld/Makefile +++ b/gnu/usr.bin/binutils220/ld/Makefile @@ -4,8 +4,9 @@ ELF_SCR_EXT= x xbn xc xd xdc xdw xn xr xs xsc xsw xu xw .PATH: ${SRCDIR}/ld -PROG= ld +PROG= ld.bfd MAN= ld220.1 +#MLINKS+=ld220.1 ld.1 LIBEXEC_BINUTILS= ${BINDIR}/.. SCRIPTDIR= ${LIBEXEC_BINUTILS}/ldscripts SRCS+= ldgram.y ldlex.l lexsup.c ldlang.c mri.c ldctor.c ldmain.c \ @@ -23,6 +24,8 @@ NOSHARED?= yes CLEANDIRS+= ldscripts tmpdir CLEANFILES+= ldemul-list.h stringify.sed +LINKS= ${BINDIR}/ld.bfd ${BINDIR}/ld + EMXFR= EMLST= .for _e in ${EMS} diff --git a/gnu/usr.bin/binutils220/ld/config.h b/gnu/usr.bin/binutils220/ld/config.h index 156aab219c..342dd33c61 100644 --- a/gnu/usr.bin/binutils220/ld/config.h +++ b/gnu/usr.bin/binutils220/ld/config.h @@ -163,7 +163,7 @@ /* Version number of package */ -#define VERSION "2.20.0" +#define VERSION "2.20.1" /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a `char[]'. */ diff --git a/gnu/usr.bin/binutils220/libbfd/Makefile b/gnu/usr.bin/binutils220/libbfd/Makefile index 6e6e4ad09d..c1f678a710 100644 --- a/gnu/usr.bin/binutils220/libbfd/Makefile +++ b/gnu/usr.bin/binutils220/libbfd/Makefile @@ -68,9 +68,9 @@ bfd.h: ${CONTRIBDIR}/bfd-in2.h mv -f bfd.h.new bfd.h bfdver.h: ${CONTRIBDIR}/version.h - sed -e "s/@bfd_version_string@/\"2.20.0\"/g" \ + sed -e "s/@bfd_version_string@/\"2.20.1\"/g" \ -e "s/@bfd_version_package@/\"(GNU Binutils) \"/g" \ - -e "s/@bfd_version@/220000000/g" \ + -e "s/@bfd_version@/220001000/g" \ -e "s/@report_bugs_to@/\"\"/g" \ < ${CONTRIBDIR}/version.h > bfdver.h.new mv -f bfdver.h.new bfdver.h diff --git a/gnu/usr.bin/binutils220/libbfd/config.h b/gnu/usr.bin/binutils220/libbfd/config.h index 3efe6f84b8..4c16e1e3d8 100644 --- a/gnu/usr.bin/binutils220/libbfd/config.h +++ b/gnu/usr.bin/binutils220/libbfd/config.h @@ -324,7 +324,7 @@ /* Version number of package */ -#define VERSION "2.20.0" +#define VERSION "2.20.1" /* Number of bits in a file offset, on hosts where this is settable. */ /* #undef _FILE_OFFSET_BITS */ diff --git a/gnu/usr.bin/binutils220/libbinutils/config.h b/gnu/usr.bin/binutils220/libbinutils/config.h index 77b3a176f7..0365fc71c4 100644 --- a/gnu/usr.bin/binutils220/libbinutils/config.h +++ b/gnu/usr.bin/binutils220/libbinutils/config.h @@ -223,7 +223,7 @@ /* Version number of package */ -#define VERSION "2.20.0" +#define VERSION "2.20.1" /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a `char[]'. */ diff --git a/gnu/usr.bin/binutils220/libopcodes/config.h b/gnu/usr.bin/binutils220/libopcodes/config.h index 7b045b7b3d..53cd03a306 100644 --- a/gnu/usr.bin/binutils220/libopcodes/config.h +++ b/gnu/usr.bin/binutils220/libopcodes/config.h @@ -97,7 +97,7 @@ /* Version number of package */ -#define VERSION "2.20.0" +#define VERSION "2.20.1" /* Define to 1 if on MINIX. */ /* #undef _MINIX */ diff --git a/gnu/usr.bin/binutils221/cxxfilt/Makefile b/gnu/usr.bin/binutils221/cxxfilt/Makefile index b75a0b4182..95b15beafc 100644 --- a/gnu/usr.bin/binutils221/cxxfilt/Makefile +++ b/gnu/usr.bin/binutils221/cxxfilt/Makefile @@ -5,7 +5,7 @@ PROG= c++filt SRCS= cxxfilt.c MAN= c++filt221.1 -#MLINKS+=c++filt221.1 c++filt.1 +MLINKS+=c++filt221.1 c++filt.1 WARNS= 1 c++filt221.1: ${SRCDIR}/binutils/doc/c++filt.1