Update.

	* elf/dl-object.c (_dl_new_object): l_local_scope really gets
	assigned the local scope.

	* math/tgmath.h: Rename nextafterx to nexttoward.

3 files changed, 6 insertions, 53 deletions

diff --git a/ChangeLog b/ChangeLog
index 7c7190166d..7310c4df19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 1999-01-19  Ulrich Drepper  <drepper@cygnus.com>
 
+	* elf/dl-object.c (_dl_new_object): l_local_scope really gets
+	assigned the local scope.
+
 	* posix/test-vfork.c (main): Improve test to check for correct
 	exit code.
 
@@ -12,7 +15,7 @@
 
 1999-01-19  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
 
-	* math/tgmath.h (nexttoward): Rename nextafterx to nexttoward.
+	* math/tgmath.h: Rename nextafterx to nexttoward.
 
 1999-01-19  Ulrich Drepper  <drepper@cygnus.com>
 
diff --git a/elf/dl-object.c b/elf/dl-object.c
index ec05abd423..1c940c607a 100644
--- a/elf/dl-object.c
+++ b/elf/dl-object.c
@@ -1,5 +1,5 @@
 /* Storage management for the chain of loaded shared objects.
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -77,7 +77,7 @@ _dl_new_object (char *realname, const char *libname, int type,
   else
     new->l_scope[idx] = &new->l_searchlist;
 
-  new->l_local_scope[0] = new->l_scope[idx];
+  new->l_local_scope[0] = &new->l_searchlist;
 
   /* Don't try to find the origin for the main map which has the name "".  */
   if (realname[0] != '\0')
diff --git a/sysdeps/unix/sysv/linux/i386/vfork.S b/sysdeps/unix/sysv/linux/i386/vfork.S
deleted file mode 100644
index 1f6469a9a1..0000000000
--- a/sysdeps/unix/sysv/linux/i386/vfork.S
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Copyright (C) 1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
-
-   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
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <sysdep.h>
-#define _ERRNO_H	1
-#include <bits/errno.h>
-
-/* Clone the calling process, but without copying the whole address space.
-   The calling process is suspended until the new process exits or is
-   replaced by a call to `execve'.  Return -1 for errors, 0 to the new process,
-   and the process ID of the new process to the old process.  */
-
-ENTRY (__vfork)
-
-	/* We have to use the clone() system call.  The flags to use are
-		CLONE_VFORK | CLONE_VM
-	   and we send SIGCHLD on termination (i.e., flags = 0x4111).  */
-
-	popl	%edx		/* Pop return address.  */
-	pushl	%ebx
-	movl	%esp, %ecx
-	movl	$0x4111, %ebx
-	movl	$SYS_ify(clone), %eax
-	int	$0x80
-	popl	%ebx
-	pushl	%edx
-	cmpl	$-4095, %eax
-	jae	SYSCALL_ERROR_LABEL
-L(pseudo_end):
-	ret
-
-PSEUDO_END (__vfork)
-
-weak_alias (__vfork, vfork)