From: Andrew Cagney <ac131313@redhat.com>
Date: Fri, 10 Aug 2001 18:50:04 +0000 (+0000)
Subject: Fix CVS merge botch.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=894aeeb0d63c9b9804f7c75cd6d4b2040371a70f;p=gcc.git

Fix CVS merge botch.

From-SVN: r44774
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 00b22c53465..23c2c4dfe19 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2001-08-10  Andrew Cagney  <ac131313@redhat.com>
+
+	* doc/install.texi (Specific): Fix CVS merge botch.
+
 2001-08-10  Richard Henderson  <rth@redhat.com>
 
 	* config/m68k/m68k.c (m68k_svr3_asm_out_constructor): Protect with
diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi
index c43b43a5d70..1b8afee625e 100644
--- a/gcc/doc/install.texi
+++ b/gcc/doc/install.texi
@@ -3057,11 +3057,6 @@ the @command{pkginfo} command.  To add an optional package, use the
 @command{pkgadd} command.  For further details, see the Solaris
 documentation.
 
-For Solaris 2.0 and 2.1, GCC needs six packages: @samp{SUNWarc},
-@samp{SUNWbtool}, @samp{SUNWesu}, @samp{SUNWhea}, @samp{SUNWlibm}, and
-@samp{SUNWtoo}.
-
-=======
 On some versions of Solaris, trying to use the linker and other tools in
 @file{/usr/ucb} to install GCC has been observed to cause trouble.
 For example, the linker may hang indefinitely.  The fix is to remove