CVS commit: src/external/gpl3/binutils/dist

["Christos Zoulas" <christos%netbsd.org@localhost>]

Module Name:    src
Committed By:   christos
Date:           Sat Feb 14 17:59:15 UTC 2026

Modified Files:
        src/external/gpl3/binutils/dist/binutils: BRANCHES ChangeLog
            MAINTAINERS Makefile.am Makefile.in NEWS README
            README-how-to-make-a-release aclocal.m4 addr2line.c ar.c arlex.c
            arlex.l arparse.c arparse.y arsup.c arsup.h bfdtest1.c bfdtest2.c
            bin2c.c binemul.c binemul.h bucomm.c bucomm.h budbg.h coffdump.c
            coffgrok.c coffgrok.h configure configure.ac configure.com
            configure.tgt cxxfilt.c debug.c debug.h deflex.c deflex.l
            defparse.c defparse.y demanguse.c demanguse.h dlltool.c dlltool.h
            dllwrap.c dwarf-mode.el dwarf.c dwarf.h elfcomm.c elfcomm.h
            elfedit.c embedspu.sh emul_aix.c emul_vanilla.c filemode.c
            is-ranlib.c is-strip.c makefile.vms maybe-ranlib.c maybe-strip.c
            mclex.c mcparse.c mcparse.y nm.c not-ranlib.c not-strip.c objcopy.c
            objdump.c objdump.h od-elf32_avr.c od-macho.c od-pe.c od-xcoff.c
            prdbg.c ranlib.sh rclex.c rcparse.c rcparse.y rdcoff.c rddbg.c
            readelf.c rename.c resbin.c rescoff.c resrc.c resres.c sanity.sh
            size.c srconv.c stabs.c strings.c sysdep.h sysdump.c sysinfo.y
            syslex.c syslex.l syslex_wrap.c unwind-ia64.c unwind-ia64.h
            version.c windint.h windmc.c windmc.h windres.c windres.h winduni.c
            winduni.h wrstabs.c
        src/external/gpl3/binutils/dist/binutils/doc: addr2line.1 ar.1
            binutils.texi c++filt.1 cxxfilt.man dlltool.1 elfedit.1 local.mk
            nm.1 objcopy.1 objdump.1 ranlib.1 readelf.1 size.1 strings.1
            strip.1 windmc.1 windres.1
        src/external/gpl3/binutils/dist/binutils/po: Make-in binutils.pot
            fr.gmo fr.po pt.gmo pt.po ro.gmo ro.po sr.gmo sr.po uk.gmo uk.po
        src/external/gpl3/binutils/dist/libsframe/doc: sframe-spec.info

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/binutils/dist/binutils/BRANCHES \
    src/external/gpl3/binutils/dist/binutils/MAINTAINERS \
    src/external/gpl3/binutils/dist/binutils/Makefile.am \
    src/external/gpl3/binutils/dist/binutils/README \
    src/external/gpl3/binutils/dist/binutils/README-how-to-make-a-release \
    src/external/gpl3/binutils/dist/binutils/addr2line.c \
    src/external/gpl3/binutils/dist/binutils/arlex.c \
    src/external/gpl3/binutils/dist/binutils/arlex.l \
    src/external/gpl3/binutils/dist/binutils/arparse.c \
    src/external/gpl3/binutils/dist/binutils/arparse.y \
    src/external/gpl3/binutils/dist/binutils/arsup.h \
    src/external/gpl3/binutils/dist/binutils/bfdtest1.c \
    src/external/gpl3/binutils/dist/binutils/bfdtest2.c \
    src/external/gpl3/binutils/dist/binutils/bin2c.c \
    src/external/gpl3/binutils/dist/binutils/binemul.c \
    src/external/gpl3/binutils/dist/binutils/binemul.h \
    src/external/gpl3/binutils/dist/binutils/bucomm.h \
    src/external/gpl3/binutils/dist/binutils/budbg.h \
    src/external/gpl3/binutils/dist/binutils/coffdump.c \
    src/external/gpl3/binutils/dist/binutils/coffgrok.c \
    src/external/gpl3/binutils/dist/binutils/coffgrok.h \
    src/external/gpl3/binutils/dist/binutils/configure.ac \
    src/external/gpl3/binutils/dist/binutils/configure.com \
    src/external/gpl3/binutils/dist/binutils/configure.tgt \
    src/external/gpl3/binutils/dist/binutils/cxxfilt.c \
    src/external/gpl3/binutils/dist/binutils/debug.c \
    src/external/gpl3/binutils/dist/binutils/debug.h \
    src/external/gpl3/binutils/dist/binutils/deflex.c \
    src/external/gpl3/binutils/dist/binutils/deflex.l \
    src/external/gpl3/binutils/dist/binutils/defparse.c \
    src/external/gpl3/binutils/dist/binutils/defparse.y \
    src/external/gpl3/binutils/dist/binutils/demanguse.c \
    src/external/gpl3/binutils/dist/binutils/demanguse.h \
    src/external/gpl3/binutils/dist/binutils/dlltool.c \
    src/external/gpl3/binutils/dist/binutils/dlltool.h \
    src/external/gpl3/binutils/dist/binutils/dllwrap.c \
    src/external/gpl3/binutils/dist/binutils/dwarf-mode.el \
    src/external/gpl3/binutils/dist/binutils/dwarf.h \
    src/external/gpl3/binutils/dist/binutils/elfcomm.c \
    src/external/gpl3/binutils/dist/binutils/elfcomm.h \
    src/external/gpl3/binutils/dist/binutils/elfedit.c \
    src/external/gpl3/binutils/dist/binutils/embedspu.sh \
    src/external/gpl3/binutils/dist/binutils/emul_aix.c \
    src/external/gpl3/binutils/dist/binutils/emul_vanilla.c \
    src/external/gpl3/binutils/dist/binutils/filemode.c \
    src/external/gpl3/binutils/dist/binutils/is-ranlib.c \
    src/external/gpl3/binutils/dist/binutils/is-strip.c \
    src/external/gpl3/binutils/dist/binutils/makefile.vms \
    src/external/gpl3/binutils/dist/binutils/maybe-ranlib.c \
    src/external/gpl3/binutils/dist/binutils/maybe-strip.c \
    src/external/gpl3/binutils/dist/binutils/mclex.c \
    src/external/gpl3/binutils/dist/binutils/mcparse.c \
    src/external/gpl3/binutils/dist/binutils/mcparse.y \
    src/external/gpl3/binutils/dist/binutils/nm.c \
    src/external/gpl3/binutils/dist/binutils/not-ranlib.c \
    src/external/gpl3/binutils/dist/binutils/not-strip.c \
    src/external/gpl3/binutils/dist/binutils/objdump.c \
    src/external/gpl3/binutils/dist/binutils/objdump.h \
    src/external/gpl3/binutils/dist/binutils/od-elf32_avr.c \
    src/external/gpl3/binutils/dist/binutils/od-macho.c \
    src/external/gpl3/binutils/dist/binutils/od-pe.c \
    src/external/gpl3/binutils/dist/binutils/od-xcoff.c \
    src/external/gpl3/binutils/dist/binutils/prdbg.c \
    src/external/gpl3/binutils/dist/binutils/ranlib.sh \
    src/external/gpl3/binutils/dist/binutils/rclex.c \
    src/external/gpl3/binutils/dist/binutils/rcparse.c \
    src/external/gpl3/binutils/dist/binutils/rcparse.y \
    src/external/gpl3/binutils/dist/binutils/rdcoff.c \
    src/external/gpl3/binutils/dist/binutils/rddbg.c \
    src/external/gpl3/binutils/dist/binutils/rename.c \
    src/external/gpl3/binutils/dist/binutils/resbin.c \
    src/external/gpl3/binutils/dist/binutils/rescoff.c \
    src/external/gpl3/binutils/dist/binutils/resrc.c \
    src/external/gpl3/binutils/dist/binutils/resres.c \
    src/external/gpl3/binutils/dist/binutils/sanity.sh \
    src/external/gpl3/binutils/dist/binutils/size.c \
    src/external/gpl3/binutils/dist/binutils/srconv.c \
    src/external/gpl3/binutils/dist/binutils/stabs.c \
    src/external/gpl3/binutils/dist/binutils/sysdep.h \
    src/external/gpl3/binutils/dist/binutils/sysdump.c \
    src/external/gpl3/binutils/dist/binutils/sysinfo.y \
    src/external/gpl3/binutils/dist/binutils/syslex.c \
    src/external/gpl3/binutils/dist/binutils/syslex.l \
    src/external/gpl3/binutils/dist/binutils/syslex_wrap.c \
    src/external/gpl3/binutils/dist/binutils/unwind-ia64.c \
    src/external/gpl3/binutils/dist/binutils/unwind-ia64.h \
    src/external/gpl3/binutils/dist/binutils/version.c \
    src/external/gpl3/binutils/dist/binutils/windint.h \
    src/external/gpl3/binutils/dist/binutils/windmc.c \
    src/external/gpl3/binutils/dist/binutils/windmc.h \
    src/external/gpl3/binutils/dist/binutils/windres.c \
    src/external/gpl3/binutils/dist/binutils/windres.h \
    src/external/gpl3/binutils/dist/binutils/winduni.c \
    src/external/gpl3/binutils/dist/binutils/winduni.h \
    src/external/gpl3/binutils/dist/binutils/wrstabs.c
cvs rdiff -u -r1.15 -r1.16 src/external/gpl3/binutils/dist/binutils/ChangeLog \
    src/external/gpl3/binutils/dist/binutils/strings.c
cvs rdiff -u -r1.17 -r1.18 \
    src/external/gpl3/binutils/dist/binutils/Makefile.in \
    src/external/gpl3/binutils/dist/binutils/objcopy.c
cvs rdiff -u -r1.14 -r1.15 src/external/gpl3/binutils/dist/binutils/NEWS \
    src/external/gpl3/binutils/dist/binutils/ar.c \
    src/external/gpl3/binutils/dist/binutils/bucomm.c
cvs rdiff -u -r1.11 -r1.12 \
    src/external/gpl3/binutils/dist/binutils/aclocal.m4
cvs rdiff -u -r1.12 -r1.13 src/external/gpl3/binutils/dist/binutils/arsup.c
cvs rdiff -u -r1.16 -r1.17 src/external/gpl3/binutils/dist/binutils/configure
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/binutils/dist/binutils/dwarf.c
cvs rdiff -u -r1.29 -r1.30 src/external/gpl3/binutils/dist/binutils/readelf.c
cvs rdiff -u -r1.16 -r1.17 \
    src/external/gpl3/binutils/dist/binutils/doc/addr2line.1 \
    src/external/gpl3/binutils/dist/binutils/doc/binutils.texi \
    src/external/gpl3/binutils/dist/binutils/doc/dlltool.1 \
    src/external/gpl3/binutils/dist/binutils/doc/nm.1 \
    src/external/gpl3/binutils/dist/binutils/doc/objcopy.1 \
    src/external/gpl3/binutils/dist/binutils/doc/objdump.1 \
    src/external/gpl3/binutils/dist/binutils/doc/ranlib.1 \
    src/external/gpl3/binutils/dist/binutils/doc/size.1 \
    src/external/gpl3/binutils/dist/binutils/doc/strip.1 \
    src/external/gpl3/binutils/dist/binutils/doc/windmc.1 \
    src/external/gpl3/binutils/dist/binutils/doc/windres.1
cvs rdiff -u -r1.17 -r1.18 src/external/gpl3/binutils/dist/binutils/doc/ar.1 \
    src/external/gpl3/binutils/dist/binutils/doc/cxxfilt.man \
    src/external/gpl3/binutils/dist/binutils/doc/readelf.1 \
    src/external/gpl3/binutils/dist/binutils/doc/strings.1
cvs rdiff -u -r1.8 -r1.9 \
    src/external/gpl3/binutils/dist/binutils/doc/c++filt.1
cvs rdiff -u -r1.15 -r1.16 \
    src/external/gpl3/binutils/dist/binutils/doc/elfedit.1
cvs rdiff -u -r1.6 -r1.7 \
    src/external/gpl3/binutils/dist/binutils/doc/local.mk
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/binutils/dist/binutils/po/Make-in \
    src/external/gpl3/binutils/dist/binutils/po/binutils.pot \
    src/external/gpl3/binutils/dist/binutils/po/fr.gmo \
    src/external/gpl3/binutils/dist/binutils/po/fr.po \
    src/external/gpl3/binutils/dist/binutils/po/pt.gmo \
    src/external/gpl3/binutils/dist/binutils/po/pt.po \
    src/external/gpl3/binutils/dist/binutils/po/ro.gmo \
    src/external/gpl3/binutils/dist/binutils/po/ro.po \
    src/external/gpl3/binutils/dist/binutils/po/sr.gmo \
    src/external/gpl3/binutils/dist/binutils/po/sr.po \
    src/external/gpl3/binutils/dist/binutils/po/uk.gmo \
    src/external/gpl3/binutils/dist/binutils/po/uk.po
cvs rdiff -u -r1.1.1.3 -r1.2 \
    src/external/gpl3/binutils/dist/libsframe/doc/sframe-spec.info

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.