--- binutils-2.9.1.0.25/bfd/elf.c.bak	Sun Aug  1 20:04:19 1999
+++ binutils-2.9.1.0.25/bfd/elf.c	Sun Aug  1 20:04:34 1999
@@ -2958,9 +2958,11 @@
       else
 	i_ehdrp->e_machine = EM_SPARC;
       break;
+#if 0
     case bfd_arch_i370:
       i_ehdrp->e_machine = EM_I370;
       break;
+#endif
     case bfd_arch_i386:
       i_ehdrp->e_machine = EM_386;
       break;
--- binutils-2.9.1.0.25/gas/config/te-freebsd.h.bak	Sun Aug  1 22:29:48 1999
+++ binutils-2.9.1.0.25/gas/config/te-freebsd.h	Sun Aug  1 20:14:02 1999
@@ -0,0 +1,31 @@
+/* te-386bsd.h -- 386BSD target environment declarations.
+   Copyright (C) 1987, 1990, 1991, 1992 Free Software Foundation, Inc.
+   
+   This file is part of GAS, the GNU Assembler.
+   
+   GAS is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+   
+   GAS is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with GAS; see the file COPYING.  If not, write to
+   the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#define TE_FREEBSD	1
+
+#include "obj-format.h"
+
+/*
+ * Local Variables:
+ * comment-column: 0
+ * fill-column: 131
+ * End:
+ */
+
+/* end of te-sun3.h */
--- binutils-2.9.1.0.25/gnu/usr.bin/binutils/libiberty/Makefile.bak	Sun Aug  1 20:07:59 1999
+++ binutils-2.9.1.0.25/gnu/usr.bin/binutils/libiberty/Makefile	Sun Aug  1 20:08:09 1999
@@ -11,7 +11,7 @@
 		fdmatch.c fnmatch.c getopt.c getopt1.c getruntime.c \
 		hex.c floatformat.c objalloc.c obstack.c spaces.c \
 		strerror.c strsignal.c xatexit.c xexit.c xmalloc.c \
-		xstrdup.c xstrerror.c insque.c
+		xstrdup.c xstrerror.c insque.c bugs.c
 NOPROFILE=	true
 NOPIC=		true
 INTERNALLIB=	true
--- binutils-2.9.1.0.25/gnu/usr.bin/binutils/Makefile.inc0.bak	Sun Aug  1 20:01:57 1999
+++ binutils-2.9.1.0.25/gnu/usr.bin/binutils/Makefile.inc0	Sun Aug  1 20:02:20 1999
@@ -15,7 +15,7 @@
 # added to it as we descend into subdirectories.
 RELTOP:=	..
 
-RELSRC=		${RELTOP}/../../../contrib/binutils
+RELSRC=		${RELTOP}/../../..
 SRCDIR=		${.CURDIR}/${RELSRC}
 
 CFLAGS+=	-D_GNU_SOURCE