Module Name:	src
Committed By:	tv
Date:		Tue Feb  2 20:27:23 UTC 1999

Modified Files:
	src/gnu/dist/bfd: Makefile.am Makefile.in aout-target.h aoutx.h
	    archive.c bfd-in.h bfd-in2.h config.bfd configure configure.host
	    configure.in elf32-mips.c elf64-alpha.c i386netbsd.c libaout.h
	    libbfd-in.h libbfd.h m68k4knetbsd.c m68knetbsd.c netbsd-core.c
	    netbsd.h ns32knetbsd.c reloc.c sparcnetbsd.c sunos.c targets.c
	src/gnu/dist/bfd/doc: bfd.texinfo
	src/gnu/dist/binutils: bucomm.c objcopy.c objdump.c size.c
	src/gnu/dist/gas: configure configure.in macro.c
	src/gnu/dist/gas/config: obj-aout.c obj-aout.h tc-arm.c tc-arm.h
	    tc-i386.c tc-i386.h tc-m68k.c tc-ns32k.c tc-ns32k.h tc-sparc.c
	    te-nbsd.h
	src/gnu/dist/gas/doc: as.1 internals.texi
	src/gnu/dist/include: dis-asm.h
	src/gnu/dist/include/elf: common.h
	src/gnu/dist/include/opcode: i386.h
	src/gnu/dist/ld: Makefile.am Makefile.in configure.host configure.tgt
	    ldint.texinfo lexsup.c
	src/gnu/dist/ld/emulparams: elf64_sparc.sh
	src/gnu/dist/ld/scripttempl: elf.sc
	src/gnu/dist/opcodes: alpha-opc.c disassemble.c i386-dis.c ns32k-dis.c
Added Files:
	src/gnu/dist/bfd: aout-arm32.c
	src/gnu/dist/ld/emulparams: armnbsd.sh
Removed Files:
	src/gnu/dist/bfd: VERSION aoutarm32.c
	src/gnu/dist/bfd/doc: bfd.texi
	src/gnu/dist/binutils: defparse.c defparse.h nlmheader.h rclex.c
	    rcparse.c rcparse.h
Log Message:
Resolve conflicts and update NetBSD local changes tobinutils 2.9.1.