From 7c91639ec9a640dd9637495a329468aea5818529 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Sat, 17 Mar 2001 00:49:09 +0000
Subject: [PATCH] Update.

2001-03-16  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/unix/sysv/linux/ia64/makecontext.c (__makecontext):
	Internationalize.
---
 ChangeLog                                  | 5 +++++
 elf/dl-load.c                              | 2 +-
 linuxthreads/ChangeLog                     | 4 ++++
 sysdeps/unix/sysv/linux/configure          | 4 ++--
 sysdeps/unix/sysv/linux/ia64/makecontext.c | 8 ++++----
 5 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8821b88d38..a31102e11e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-16  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/unix/sysv/linux/ia64/makecontext.c (__makecontext):
+	Internationalize.
+
 2001-02-06  Jakub Jelinek  <jakub@redhat.com>
 
 	* elf/dl-load.c (_dl_map_object): Don't test l_opencount when
diff --git a/elf/dl-load.c b/elf/dl-load.c
index 873a0bad4b..44efb11da0 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -1514,7 +1514,7 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded,
       /* If the requested name matches the soname of a loaded object,
 	 use that object.  Elide this check for names that have not
 	 yet been opened.  */
-      if (l->l_faked == 0)
+      if (l->l_faked != 0)
 	continue;
       if (!_dl_name_match_p (name, l))
 	{
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 8d680babb3..5fe8ced1de 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,7 @@
+2001-02-26  Jakub Jelinek  <jakub@redhat.com>
+
+	* signals.c (pthread_sighandler): Use CALL_SIGHANDLER.
+
 2001-02-23  Jakub Jelinek  <jakub@redhat.com>
 
 	* internals.h (__pthread_init_max_stacksize): New prototype.
diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure
index fc5297de26..f852718906 100644
--- a/sysdeps/unix/sysv/linux/configure
+++ b/sysdeps/unix/sysv/linux/configure
@@ -89,7 +89,7 @@ echo "configure:89: checking for kernel header at least $minimum_kernel" >&5
   decnum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/(\1 * 65536 + \2 * 256 + \3)/'`;
   abinum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1,\2,\3/'`;
   cat > conftest.$ac_ext <<EOF
-#line 92 "configure"
+#line 93 "configure"
 #include "confdefs.h"
 #include <linux/version.h>
 #if LINUX_VERSION_CODE < $decnum
@@ -205,7 +205,7 @@ if test $host = $build; then
     ac_prefix=$ac_default_prefix
   fi
   echo $ac_n "checking for symlinks in ${ac_prefix}/include""... $ac_c" 1>&6
-echo "configure:204: checking for symlinks in ${ac_prefix}/include" >&5
+echo "configure:209: checking for symlinks in ${ac_prefix}/include" >&5
   ac_message=
   if test -L ${ac_prefix}/include/net; then
     ac_message="$ac_message
diff --git a/sysdeps/unix/sysv/linux/ia64/makecontext.c b/sysdeps/unix/sysv/linux/ia64/makecontext.c
index 9f80b114bd..24a7d04c77 100644
--- a/sysdeps/unix/sysv/linux/ia64/makecontext.c
+++ b/sysdeps/unix/sysv/linux/ia64/makecontext.c
@@ -1,6 +1,6 @@
 /* Copyright (C) 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
-     Contributed by David Mosberger-Tang <davidm@hpl.hp.com>.
+   Contributed by David Mosberger-Tang <davidm@hpl.hp.com>.
 
    The GNU C Library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public License as
@@ -21,8 +21,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <ucontext.h>
+#include <sys/rse.h>
 
-#include <ia64/rse.h>
 
 struct fdesc
   {
@@ -59,8 +59,8 @@ __makecontext (ucontext_t *ucp, void (*func) (void), int argc, ...)
 
   if (argc > 8)
     {
-      fprintf (stderr, "__makecontext: does not know how to handle more "
-	       "than 8 arguments\n");
+      fprintf (stderr, _("\
+makecontext: does not know how to handle more than 8 arguments\n"));
       exit (-1);
     }