Module Name:	gnusrc
Committed By:	tv
Date:		Tue Aug 14 04:43:12 UTC 2001

Modified Files:
	gnusrc/gnu/dist/toolchain/bfd: Makefile.am Makefile.in aout-target.h
	    aoutx.h archive.c bfd-in.h bfd-in2.h coffcode.h config.bfd
	    configure configure.in ecofflink.c elf.c elf32-arm.h elf32-mips.c
	    elf32-sh.c elf64-alpha.c elflink.h i386netbsd.c libaout.h
	    libbfd-in.h libbfd.c libbfd.h netbsd.h reloc.c sparcnetbsd.c
	    sunos.c targets.c vaxnetbsd.c
	gnusrc/gnu/dist/toolchain/binutils: bucomm.c objcopy.c objdump.c size.c
	gnusrc/gnu/dist/toolchain/gas: configure configure.in dwarf2dbg.c
	    struc-symbol.h
	gnusrc/gnu/dist/toolchain/gas/config: aout_gnu.h obj-aout.c obj-aout.h
	    tc-alpha.c tc-arm.c tc-arm.h tc-i386.c tc-i386.h tc-m68k.c
	    tc-ns32k.c tc-ns32k.h tc-sh.h tc-sparc.c tc-vax.h vax-inst.h
	gnusrc/gnu/dist/toolchain/gprof: Makefile.am Makefile.in corefile.c
	    gmon.h gmon_io.c
	gnusrc/gnu/dist/toolchain/include: libiberty.h
	gnusrc/gnu/dist/toolchain/include/aout: aout64.h
	gnusrc/gnu/dist/toolchain/ld: Makefile.am Makefile.in configure
	    configure.host configure.tgt ld.h ldgram.c ldgram.y ldint.texinfo
	    ldlex.c ldmain.c lexsup.c
	gnusrc/gnu/dist/toolchain/opcodes: ppc-opc.c vax-dis.c

Log Message:
Resolve conflicts from binutils 2.11.2 import
(Also fix some cosmetic garbage added by autoconf, automake, or CVS merges
to get our files closer to the FSF versions.)


To generate a diff of this commit:
cvs rdiff -r1.4 -r1.5 gnusrc/gnu/dist/toolchain/bfd/Makefile.am \
    gnusrc/gnu/dist/toolchain/bfd/Makefile.in \
    gnusrc/gnu/dist/toolchain/bfd/archive.c \
    gnusrc/gnu/dist/toolchain/bfd/bfd-in2.h \
    gnusrc/gnu/dist/toolchain/bfd/coffcode.h \
    gnusrc/gnu/dist/toolchain/bfd/elflink.h \
    gnusrc/gnu/dist/toolchain/bfd/libaout.h \
    gnusrc/gnu/dist/toolchain/bfd/libbfd.h \
    gnusrc/gnu/dist/toolchain/bfd/netbsd.h
cvs rdiff -r1.3 -r1.4 gnusrc/gnu/dist/toolchain/bfd/aout-target.h \
    gnusrc/gnu/dist/toolchain/bfd/aoutx.h \
    gnusrc/gnu/dist/toolchain/bfd/bfd-in.h \
    gnusrc/gnu/dist/toolchain/bfd/ecofflink.c \
    gnusrc/gnu/dist/toolchain/bfd/elf32-mips.c \
    gnusrc/gnu/dist/toolchain/bfd/elf32-sh.c \
    gnusrc/gnu/dist/toolchain/bfd/libbfd-in.h \
    gnusrc/gnu/dist/toolchain/bfd/libbfd.c \
    gnusrc/gnu/dist/toolchain/bfd/sparcnetbsd.c \
    gnusrc/gnu/dist/toolchain/bfd/sunos.c \
    gnusrc/gnu/dist/toolchain/bfd/vaxnetbsd.c
cvs rdiff -r1.9 -r1.10 gnusrc/gnu/dist/toolchain/bfd/config.bfd
cvs rdiff -r1.11 -r1.12 gnusrc/gnu/dist/toolchain/bfd/configure
cvs rdiff -r1.10 -r1.11 gnusrc/gnu/dist/toolchain/bfd/configure.in
cvs rdiff -r1.5 -r1.6 gnusrc/gnu/dist/toolchain/bfd/elf.c \
    gnusrc/gnu/dist/toolchain/bfd/targets.c
cvs rdiff -r1.2 -r1.3 gnusrc/gnu/dist/toolchain/bfd/elf32-arm.h \
    gnusrc/gnu/dist/toolchain/bfd/i386netbsd.c \
    gnusrc/gnu/dist/toolchain/bfd/reloc.c
cvs rdiff -r1.6 -r1.7 gnusrc/gnu/dist/toolchain/bfd/elf64-alpha.c
cvs rdiff -r1.3 -r1.4 gnusrc/gnu/dist/toolchain/binutils/bucomm.c \
    gnusrc/gnu/dist/toolchain/binutils/size.c
cvs rdiff -r1.5 -r1.6 gnusrc/gnu/dist/toolchain/binutils/objcopy.c \
    gnusrc/gnu/dist/toolchain/binutils/objdump.c
cvs rdiff -r1.9 -r1.10 gnusrc/gnu/dist/toolchain/gas/configure \
    gnusrc/gnu/dist/toolchain/gas/configure.in
cvs rdiff -r1.2 -r1.3 gnusrc/gnu/dist/toolchain/gas/dwarf2dbg.c
cvs rdiff -r1.3 -r1.4 gnusrc/gnu/dist/toolchain/gas/struc-symbol.h
cvs rdiff -r1.3 -r1.4 gnusrc/gnu/dist/toolchain/gas/config/aout_gnu.h \
    gnusrc/gnu/dist/toolchain/gas/config/obj-aout.c \
    gnusrc/gnu/dist/toolchain/gas/config/obj-aout.h \
    gnusrc/gnu/dist/toolchain/gas/config/tc-arm.h \
    gnusrc/gnu/dist/toolchain/gas/config/tc-i386.c \
    gnusrc/gnu/dist/toolchain/gas/config/tc-i386.h \
    gnusrc/gnu/dist/toolchain/gas/config/tc-ns32k.c \
    gnusrc/gnu/dist/toolchain/gas/config/tc-ns32k.h \
    gnusrc/gnu/dist/toolchain/gas/config/tc-sh.h \
    gnusrc/gnu/dist/toolchain/gas/config/tc-sparc.c
cvs rdiff -r1.4 -r1.5 gnusrc/gnu/dist/toolchain/gas/config/tc-alpha.c \
    gnusrc/gnu/dist/toolchain/gas/config/tc-m68k.c
cvs rdiff -r1.9 -r1.10 gnusrc/gnu/dist/toolchain/gas/config/tc-arm.c
cvs rdiff -r1.5 -r1.6 gnusrc/gnu/dist/toolchain/gas/config/tc-vax.h
cvs rdiff -r1.2 -r1.3 gnusrc/gnu/dist/toolchain/gas/config/vax-inst.h
cvs rdiff -r1.2 -r1.3 gnusrc/gnu/dist/toolchain/gprof/Makefile.am \
    gnusrc/gnu/dist/toolchain/gprof/Makefile.in \
    gnusrc/gnu/dist/toolchain/gprof/gmon.h
cvs rdiff -r1.4 -r1.5 gnusrc/gnu/dist/toolchain/gprof/corefile.c
cvs rdiff -r1.3 -r1.4 gnusrc/gnu/dist/toolchain/gprof/gmon_io.c
cvs rdiff -r1.3 -r1.4 gnusrc/gnu/dist/toolchain/include/libiberty.h
cvs rdiff -r1.3 -r1.4 gnusrc/gnu/dist/toolchain/include/aout/aout64.h
cvs rdiff -r1.5 -r1.6 gnusrc/gnu/dist/toolchain/ld/Makefile.am \
    gnusrc/gnu/dist/toolchain/ld/Makefile.in
cvs rdiff -r1.2 -r1.3 gnusrc/gnu/dist/toolchain/ld/configure \
    gnusrc/gnu/dist/toolchain/ld/ldint.texinfo
cvs rdiff -r1.4 -r1.5 gnusrc/gnu/dist/toolchain/ld/configure.host \
    gnusrc/gnu/dist/toolchain/ld/ldlex.c
cvs rdiff -r1.8 -r1.9 gnusrc/gnu/dist/toolchain/ld/configure.tgt
cvs rdiff -r1.3 -r1.4 gnusrc/gnu/dist/toolchain/ld/ld.h \
    gnusrc/gnu/dist/toolchain/ld/ldgram.c \
    gnusrc/gnu/dist/toolchain/ld/ldgram.y \
    gnusrc/gnu/dist/toolchain/ld/ldmain.c \
    gnusrc/gnu/dist/toolchain/ld/lexsup.c
cvs rdiff -r1.3 -r1.4 gnusrc/gnu/dist/toolchain/opcodes/ppc-opc.c
cvs rdiff -r1.2 -r1.3 gnusrc/gnu/dist/toolchain/opcodes/vax-dis.c

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