From 4ae4f784dc36bd8a06fe48ef30a828a82918f260 Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Thu, 23 Nov 2000 12:28:19 +0000
Subject: [PATCH] Update for the Bintuils 2.10.1 import.

---
 contrib/binutils/FREEBSD-Xlist   | 26 +++++++++++++++++-----
 contrib/binutils/FREEBSD-upgrade | 37 +++++++++-----------------------
 2 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/contrib/binutils/FREEBSD-Xlist b/contrib/binutils/FREEBSD-Xlist
index 24c2415325c1..70042651cd5f 100644
--- a/contrib/binutils/FREEBSD-Xlist
+++ b/contrib/binutils/FREEBSD-Xlist
@@ -1,3 +1,7 @@
+$FreeBSD$
+.cvsignore
+config.if
+mkdep
 *-hp*
 *-mac*
 *-ncr*
@@ -8,6 +12,7 @@
 */arparse.[ch]
 */deflex.c
 */gprof
+*/intl/*
 */itbl-lex.c
 */itbl-parse.[ch]
 */ldgram.[ch]
@@ -19,35 +24,39 @@
 *10[23]00*
 *532*
 *COPYING*
-*ChangeLog.*
 *[a-z]29k*
 *[a-z][89]60*
+*_be*
 *a68*
 *adobe*
 *aix*
 *apollo*
-*arm*
+*beos*
 *bout*
 *cisco*
 *d10v*
 *delt88*
 *delta*
 *dgux*
+*djgpp*
 *dos*
 *dpx2*
 *dynix*
+*epoc*
 *go32*
 *h8[35]00*
 *hp300*
 *hp[-.]*
 *hppa*
 *hpux*
+*interix*
 *irix*
 *lynx*
 *m32r*
 *m[68]8k*
 *mac-*
 *mach*
+*mcore*
 *mpw*
 *netware*
 *news*
@@ -57,16 +66,14 @@
 *os9*
 *pei*
 *pmac*
-*powerpc*
-*ppc*
 *psos*
 *pyr*
 *riscix*
 *riscos*
 *rs6000*
 *sa29200*
+*shpe*
 *som*
-*sparc*
 *st2000*
 *sun*
 *symmetry*
@@ -79,3 +86,12 @@
 *we32k*
 *win*
 *xcoff*
+*i370*
+*avr*
+*tic54x*
+*tic80*
+*d30v*
+*fr30*
+*-sh.*
+*pj*
+*ver.texi
diff --git a/contrib/binutils/FREEBSD-upgrade b/contrib/binutils/FREEBSD-upgrade
index 5f40eaf9b66a..2d785c62540b 100644
--- a/contrib/binutils/FREEBSD-upgrade
+++ b/contrib/binutils/FREEBSD-upgrade
@@ -1,39 +1,22 @@
 $FreeBSD$
 
-To get a copy of the Binutils source from the Sourceware CVS repository
-this command line was used:
+To strip down a new version of GNU binutils for import, extract
+the files like this:
 
-	cvs -d :pserver:anoncvs@anoncvs.cygnus.com:/cvs/src login
-	#	password is "anoncvs"
+    tar -xvzf binutils-2.10.1.tar.gz -X FREEBSD-Xlist
+    tar -xvzf binutils-2.10.1.tar.gz include/elf
 
-	cvs -d :pserver:anoncvs@anoncvs.cygnus.com:/cvs/src \
-		co -rbinutils-2_10-branch -l src
-	cvs -d :pserver:anoncvs@anoncvs.cygnus.com:/cvs/src \
-		co -rbinutils-2_10-branch \
-		src/bfd src/binutils src/config src/etc src/gas src/include \
-		src/ld src/libiberty src/opcodes
+Don't eliminate the *z8* files.  They're needed because of a stupid
+hard-coded configure script in the opcodes subdirectory.
 
-
-To strip down a new version of GNU binutils for import (starting with a
-checked out copy from the Sourceware anoncvs repo), prune files like this:
-
-	for F in `cat FREEBSD-deletelist`
-		do find . -name "$F" -exec rm -rfv {} \; 
-	done
-
-This command should be repeated until no files are shown as being deleted.
-
-If you decide to bring in more of the files, import them -- don't use
-``cvs add''.  And please remember to adjust the contents of "FREEBSD-Xlist"
-and "FREEBSD-deletelist" so that it reflects what is really imported from
+If you decide to bring in more of the files, import them -- don't
+use ``cvs add''.  And please remember to adjust the contents of
+`FREEBSD-Xlist' so that it reflects what is really imported from
 the vendor.
 
-
 The vendor import was done by:
 
-	cvs import src/contrib/binutils GNU \
-		sourceware_binutils-2_10-branch_anoncvs_20000512
-
+	cvs import src/contrib/binutils GNU binutils_2_10_1
 
 Note that many of the files generated by GNU configure are present pre-built
 in the "src/gnu/usr.bin/binutils" tree.  These can be regenerated for a new