From c1349648c5b0b75583f9f96e42e689f10f8f74ad Mon Sep 17 00:00:00 2001
From: Andreas Schwab <schwab@suse.de>
Date: Fri, 9 Apr 1999 02:24:04 +0000
Subject: [PATCH] * scripts/test-installation.pl (installation_problem): Skip

	libnss1_* libraries from glibc-compat add-on.

Wed Apr  7 22:52:39 1999  H.J. Lu  <hjl@gnu.org>

	* io/Versions (__dup2, __pipe): Added to GLIBC_2.0 for
	libstdc++ 2.7.2.
	* posix/Versions (__waitpid): Likewise.

1999-04-08  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
---
 ChangeLog                    | 11 +++++++++++
 io/Versions                  |  3 +++
 posix/Versions               |  3 +++
 scripts/test-installation.pl |  6 ++++--
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6eace595da..6a098f277d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+1999-04-08  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
+
+	* scripts/test-installation.pl (installation_problem): Skip
+	libnss1_* libraries from glibc-compat add-on.
+
+Wed Apr  7 22:52:39 1999  H.J. Lu  <hjl@gnu.org>
+
+	* io/Versions (__dup2, __pipe): Added to GLIBC_2.0 for
+	libstdc++ 2.7.2.
+	* posix/Versions (__waitpid): Likewise.
+
 1999-04-08  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
 
 	* manual/install.texi (Reporting Bugs): Add section about reported 
diff --git a/io/Versions b/io/Versions
index d816d03f07..ab489fd25e 100644
--- a/io/Versions
+++ b/io/Versions
@@ -9,6 +9,9 @@ libc {
     __xstat; __fxstat; __lxstat; __xmknod; __write; __close; __fcntl;
     __lseek; __open; __read;
 
+    # functions used by libstdc++ 2.7.2
+    __dup2; __pipe;
+
     # a*
     access;
 
diff --git a/posix/Versions b/posix/Versions
index 985281d99a..c106c826bb 100644
--- a/posix/Versions
+++ b/posix/Versions
@@ -15,6 +15,9 @@ libc {
     __sched_getparam; __sched_getscheduler; __sched_setscheduler;
     __sched_yield; __fork; __getpid; __wait;
 
+    # functions used by libstdc++ 2.7.2
+    __waitpid;
+
     # global variables
     __environ; _environ;
 
diff --git a/scripts/test-installation.pl b/scripts/test-installation.pl
index a0e824ed1f..6e640cd4cc 100755
--- a/scripts/test-installation.pl
+++ b/scripts/test-installation.pl
@@ -1,6 +1,6 @@
 #! /usr/bin/perl -w
 
-# Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+# Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 # Contributed by Andreas Jaeger <aj@arthur.rhein-neckar.de>, 1997.
 
@@ -104,7 +104,9 @@ while (<SOVERSIONS>) {
     # Filter out some libraries we don't want to link:
     # - nss_ldap since it's not yet available
     # - libdb1 since it conflicts with libdb
-    if ($name ne "nss_ldap" && $name ne "db1") {
+    # - libnss1_* from glibc-compat add-on
+    if ($name ne "nss_ldap" && $name ne "db1"
+	&& !($name =~/^nss1_/)) {
       $link_libs .= " -l$name";
       $versions{$name} = $version;
     }