From owner-cvs-all Sun Sep 6 16:00:37 1998 Return-Path: Received: (from daemon@localhost) by hub.freebsd.org (8.8.8/8.8.8) id QAA09501 for cvs-all-outgoing; Sun, 6 Sep 1998 16:00:37 -0700 (PDT) (envelope-from owner-cvs-all) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id QAA09496; Sun, 6 Sep 1998 16:00:36 -0700 (PDT) (envelope-from jdp@FreeBSD.org) From: John Polstra Received: (from jdp@localhost) by freefall.freebsd.org (8.8.8/8.8.5) id QAA09695; Sun, 6 Sep 1998 16:00:35 -0700 (PDT) Date: Sun, 6 Sep 1998 16:00:35 -0700 (PDT) Message-Id: <199809062300.QAA09695@freefall.freebsd.org> To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG Subject: cvs commit: src/contrib/binutils/bfd elf.c elf32-i386.c src/contrib/binutils/binutils nm.c src/contrib/binutils/gas configure configure.in src/contrib/binutils/gas/config tc-i386.c tc-i386.h src/contrib/binutils/ld Makefile.in configure.tgt Sender: owner-cvs-all@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk jdp 1998/09/06 16:00:35 PDT Modified files: contrib/binutils/bfd elf.c elf32-i386.c contrib/binutils/binutils nm.c contrib/binutils/gas configure configure.in contrib/binutils/gas/config tc-i386.c tc-i386.h contrib/binutils/ld Makefile.in configure.tgt Log: Resolve conflicts from import of binutils-2.9.1. Submitted by: Doug Rabson Revision Changes Path 1.3 +197 -33 src/contrib/binutils/bfd/elf.c 1.3 +27 -19 src/contrib/binutils/bfd/elf32-i386.c 1.3 +30 -18 src/contrib/binutils/binutils/nm.c 1.4 +1201 -422 src/contrib/binutils/gas/configure 1.3 +137 -256 src/contrib/binutils/gas/configure.in 1.3 +203 -120 src/contrib/binutils/gas/config/tc-i386.c 1.3 +13 -2 src/contrib/binutils/gas/config/tc-i386.h 1.3 +625 -425 src/contrib/binutils/ld/Makefile.in 1.4 +36 -19 src/contrib/binutils/ld/configure.tgt