aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Cagney <ac131313@redhat.com>2001-08-10 18:50:04 +0000
committerAndrew Cagney <cagney@gcc.gnu.org>2001-08-10 18:50:04 +0000
commit894aeeb0d63c9b9804f7c75cd6d4b2040371a70f (patch)
tree639748c93b3e283dd5dc6bd4205ede0ba5165060
parent6e15d3a83a314538349311b61c27c5357ba100b1 (diff)
downloadgcc-894aeeb0d63c9b9804f7c75cd6d4b2040371a70f.zip
gcc-894aeeb0d63c9b9804f7c75cd6d4b2040371a70f.tar.gz
gcc-894aeeb0d63c9b9804f7c75cd6d4b2040371a70f.tar.bz2
Fix CVS merge botch.
From-SVN: r44774
-rw-r--r--gcc/ChangeLog4
-rw-r--r--gcc/doc/install.texi5
2 files changed, 4 insertions, 5 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 00b22c5..23c2c4d 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 c43b43a..1b8afee 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