From c16b9cb4c20af12f9124cc15e0bdfb023b7ce575 Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Fri, 10 May 2002 05:21:15 +0000
Subject: [PATCH] Import data for 3.0.2.

---
 contrib/gcc/FREEBSD-libiberty | 22 ++++++++++++----------
 contrib/gcc/FREEBSD-upgrade   | 20 ++++++++------------
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/contrib/gcc/FREEBSD-libiberty b/contrib/gcc/FREEBSD-libiberty
index 0c08f8712709..1b8c24940c4b 100644
--- a/contrib/gcc/FREEBSD-libiberty
+++ b/contrib/gcc/FREEBSD-libiberty
@@ -11,24 +11,26 @@ for F in \
 	getopt1.c	\
 	getpwd.c	\
 	hashtab.c	\
+	lbasename.c	\
+	md5.c		\
 	obstack.c	\
 	partition.c	\
 	pexecute.c	\
-	splay-tree.c	\
+	splay-tree.c
 do
 	cp -ip ../libiberty/$F .
 done
 
 for F in \
-	ansidecl.h
-	demangle.h
-	dyn-string.h
-	getopt.h
-	hashtab.h
-	libiberty.h
-	obstack.h
-	partition.h
-	splay-tree.h
+	ansidecl.h	\
+	demangle.h	\
+	dyn-string.h	\
+	getopt.h	\
+	hashtab.h	\
+	libiberty.h	\
+	obstack.h	\
+	partition.h	\
+	splay-tree.h	\
 	symcat.h
 do
 	cp -ip ../include/$F .
diff --git a/contrib/gcc/FREEBSD-upgrade b/contrib/gcc/FREEBSD-upgrade
index 0f025eeb9353..922f8eb4d0d0 100644
--- a/contrib/gcc/FREEBSD-upgrade
+++ b/contrib/gcc/FREEBSD-upgrade
@@ -1,17 +1,13 @@
 $FreeBSD$
 
-cvs -d :pserver:anoncvs@anoncvs.cygnus.com:/cvs/gcc login
-#	password is "anoncvs"
+tar -xvjf gcc-3.0.2.tar.bz2 -X FREEBSD-Xlist
 
-cvs -d :pserver:anoncvs@anoncvs.cygnus.com:/cvs/gcc co -D '7/11/2000 11:43'
-	egcs/gcc egcs/libiberty
+cd gcc-3.0.2/gcc
+sh FREEBSD-libiberty
 
-for F in `cat FREEBSD-deletelist` ; do rm -rfv "$F" ; done
-for F in `cat FREEBSD-deletelist` ; do find . -name "$F" -exec rm -rfv {} \; ; done
+cvs import src/contrib/gcc FSF gcc_3_0_2
 
-cd egcs/gcc
-mv -iv config/i386/freebsd.h config/i386/freebsd-aout.h
-mv -iv config/i386/freebsd-elf.h config/i386/freebsd.h
-cp -pv config/i386/freebsd.h config/i386/freebsd.h.fixed
-
-cvs import src/contrib/gcc FSF gcc_cvs_20000711_1143
+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.