Fix CVS merge botch.

From-SVN: r44774

Fix CVS merge botch.
From-SVN: r44774
894aeeb0 · Andrew Cagney · Andrew Cagney · 6e15d3a8 · 894aeeb0 · 894aeeb0
Commit 894aeeb0 authored Aug 10, 2001 by Andrew Cagney Committed by Andrew Cagney Aug 10, 2001
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 5 deletions

gcc/ChangeLog
+4 -0

gcc/doc/install.texi
+0 -5

No files found.
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
+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

--- 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