Remove documentation of upgrading from libc5.

4 files changed, 30 insertions, 58 deletions

diff --git a/ChangeLog b/ChangeLog
index dea30b0..373dac2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2012-02-18  Joseph Myers  <joseph@codesourcery.com>
 
+	[BZ #5993]
+	* manual/install.texi: Do not document upgrading from libc5.
+
+2012-02-18  Joseph Myers  <joseph@codesourcery.com>
+
 	[BZ #4596]
 	* manual/conf.texi (_POSIX_VERSION): Do not mention __POSIX__.
 
diff --git a/INSTALL b/INSTALL
index 43a15ee..9f9588d 100644
--- a/INSTALL
+++ b/INSTALL
@@ -65,10 +65,9 @@ will be used, and CFLAGS sets optimization options for the compiler.
 
      This option is primarily of use on a system where the headers in
      `/usr/include' come from an older version of glibc.  Conflicts can
-     occasionally happen in this case.  Note that Linux libc5 qualifies
-     as an older version of glibc.  You can also use this option if you
-     want to compile glibc with a newer set of kernel headers than the
-     ones found in `/usr/include'.
+     occasionally happen in this case.  You can also use this option if
+     you want to compile glibc with a newer set of kernel headers than
+     the ones found in `/usr/include'.
 
 `--enable-add-ons[=LIST]'
      Specify add-on packages to include in the build.  If this option is
@@ -211,10 +210,11 @@ C library, we recommend that you shut the system down to single-user
 mode first, and reboot afterward.  This minimizes the risk of breaking
 things when the library changes out from underneath.
 
-   If you're upgrading from Linux libc5 or some other C library, you
-need to replace the `/usr/include' with a fresh directory before
-installing it.  The new `/usr/include' should contain the Linux
-headers, but nothing else.
+   `make install' will do the entire job of upgrading from a previous
+installation of glibc 2.x.  There may sometimes be headers left behind
+from the previous installation, but those are generally harmless.  If
+you want to avoid leaving headers behind you can do things in the
+following order.
 
    You must first build the library (`make'), optionally check it
 (`make check'), switch the include directories and then install (`make
@@ -222,20 +222,12 @@ install').  The steps must be done in this order.  Not moving the
 directory before install will result in an unusable mixture of header
 files from both libraries, but configuring, building, and checking the
 library requires the ability to compile and run programs against the old
+library.  The new `/usr/include', after switching the include
+directories and before installing the library should contain the Linux
+headers, but nothing else.  If you do this, you will need to restore
+any headers from non-glibc libraries youself after installing the
 library.
 
-   If you are upgrading from a previous installation of glibc 2.0 or
-2.1, `make install' will do the entire job.  You do not need to remove
-the old includes - if you want to do so anyway you must then follow the
-order given above.
-
-   You may also need to reconfigure GCC to work with the new library.
-The easiest way to do that is to figure out the compiler switches to
-make it work again (`-Wl,--dynamic-linker=/lib/ld-linux.so.2' should
-work on GNU/Linux systems) and use them to recompile gcc.  You can also
-edit the specs file (`/usr/lib/gcc-lib/TARGET/VERSION/specs'), but that
-is a bit of a black art.
-
    You can install glibc somewhere other than where you configured it
 to go by setting the `install_root' variable on the command line for
 `make install'.  The value of this variable is prepended to all the
@@ -373,9 +365,7 @@ kernel you can get your hands on.
 config' as above; then, rename or delete `/usr/include', create a new
 `/usr/include', and make symbolic links of `/usr/include/linux' and
 `/usr/include/asm' into the kernel sources.  You can then configure
-glibc with no special options.  This tactic is recommended if you are
-upgrading from libc5, since you need to get rid of the old header files
-anyway.
+glibc with no special options.
 
    After installing GNU libc, you may need to remove or rename
 `/usr/include/linux' and `/usr/include/asm', and replace them with
@@ -398,12 +388,6 @@ configure glibc with `--prefix=/usr'.  If you set some other prefix or
 allow it to default to `/usr/local', then all the components are
 installed there.
 
-   If you are upgrading from libc5, you need to recompile every shared
-library on your system against the new library for the sake of new code,
-but keep the old libraries around for old binaries to use.  This is
-complicated and difficult.  Consult the Glibc2 HOWTO at
-`http://www.imaxx.net/~thrytis/glibc' for details.
-
    You cannot use `nscd' with 2.0 kernels, due to bugs in the
 kernel-side thread support.  `nscd' happens to hit these bugs
 particularly hard, but you might have problems with any threaded
diff --git a/NEWS b/NEWS
index b4539a9..d80d65c 100644
--- a/NEWS
+++ b/NEWS
@@ -9,7 +9,7 @@ Version 2.16
 
 * The following bugs are resolved with this release:
 
-  174, 350, 411, 3335, 4026, 4596, 4822, 5077, 5805, 6884, 6907, 9902,
+  174, 350, 411, 3335, 4026, 4596, 4822, 5077, 5805, 5993, 6884, 6907, 9902,
   10140, 10210, 11494, 12047, 13058, 13525, 13526, 13527, 13528, 13529,
   13530, 13531, 13532, 13533, 13547, 13551, 13552, 13553, 13555, 13559,
   13583, 13618
diff --git a/manual/install.texi b/manual/install.texi
index a83a5dd..61ff23c 100644
--- a/manual/install.texi
+++ b/manual/install.texi
@@ -85,8 +85,7 @@ but if you specify this option, it will look in @var{DIRECTORY} instead.
 
 This option is primarily of use on a system where the headers in
 @file{/usr/include} come from an older version of glibc.  Conflicts can
-occasionally happen in this case.  Note that Linux libc5 qualifies as an
-older version of glibc.  You can also use this option if you want to
+occasionally happen in this case.  You can also use this option if you want to
 compile glibc with a newer set of kernel headers than the ones found in
 @file{/usr/include}.
 
@@ -238,10 +237,11 @@ primary C library, we recommend that you shut the system down to
 single-user mode first, and reboot afterward.  This minimizes the risk
 of breaking things when the library changes out from underneath.
 
-If you're upgrading from Linux libc5 or some other C library, you need to
-replace the @file{/usr/include} with a fresh directory before installing
-it.  The new @file{/usr/include} should contain the Linux headers, but
-nothing else.
+@samp{make install} will do the entire job of upgrading from a
+previous installation of glibc 2.x.  There may sometimes be headers
+left behind from the previous installation, but those are generally
+harmless.  If you want to avoid leaving headers behind you can do
+things in the following order.
 
 You must first build the library (@samp{make}), optionally check it
 (@samp{make check}), switch the include directories and then install
@@ -249,20 +249,12 @@ You must first build the library (@samp{make}), optionally check it
 the directory before install will result in an unusable mixture of header
 files from both libraries, but configuring, building, and checking the
 library requires the ability to compile and run programs against the old
+library.  The new @file{/usr/include}, after switching the include
+directories and before installing the library should contain the Linux
+headers, but nothing else.  If you do this, you will need to restore
+any headers from non-glibc libraries youself after installing the
 library.
 
-If you are upgrading from a previous installation of glibc 2.0 or 2.1,
-@samp{make install} will do the entire job.  You do not need to remove
-the old includes -- if you want to do so anyway you must then follow the
-order given above.
-
-You may also need to reconfigure GCC to work with the new library.  The
-easiest way to do that is to figure out the compiler switches to make it
-work again (@samp{-Wl,--dynamic-linker=/lib/ld-linux.so.2} should work on
-GNU/Linux systems) and use them to recompile gcc.  You can also edit the specs
-file (@file{/usr/lib/gcc-lib/@var{TARGET}/@var{VERSION}/specs}), but that
-is a bit of a black art.
-
 You can install glibc somewhere other than where you configured it to go
 by setting the @code{install_root} variable on the command line for
 @samp{make install}.  The value of this variable is prepended to all the
@@ -400,7 +392,6 @@ patches, although we try to avoid this.
 
 @node Linux
 @appendixsec Specific advice for GNU/Linux systems
-@cindex upgrading from libc5
 @cindex kernel header files
 
 If you are installing GNU libc on a GNU/Linux system, you need to have the
@@ -419,9 +410,7 @@ An alternate tactic is to unpack the 2.2 kernel and run @samp{make
 config} as above; then, rename or delete @file{/usr/include}, create a
 new @file{/usr/include}, and make symbolic links of
 @file{/usr/include/linux} and @file{/usr/include/asm} into the kernel
-sources.  You can then configure glibc with no special options.  This
-tactic is recommended if you are upgrading from libc5, since you need to
-get rid of the old header files anyway.
+sources.  You can then configure glibc with no special options.
 
 After installing GNU libc, you may need to remove or rename
 @file{/usr/include/linux} and @file{/usr/include/asm}, and replace them
@@ -445,12 +434,6 @@ if you configure glibc with @samp{--prefix=/usr}.  If you set some other
 prefix or allow it to default to @file{/usr/local}, then all the
 components are installed there.
 
-If you are upgrading from libc5, you need to recompile every shared
-library on your system against the new library for the sake of new code,
-but keep the old libraries around for old binaries to use.  This is
-complicated and difficult.  Consult the Glibc2 HOWTO at
-@url{http://www.imaxx.net/~thrytis/glibc} for details.
-
 You cannot use @code{nscd} with 2.0 kernels, due to bugs in the
 kernel-side thread support.  @code{nscd} happens to hit these bugs
 particularly hard, but you might have problems with any threaded