summary refs log tree commit diff
path: root/sysdeps/i386/dl-machine.h
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2000-04-03 17:13:51 +0000
committerRoland McGrath <roland@gnu.org>2000-04-03 17:13:51 +0000
commitc6d80202830057548b130381c214ddb383fccd5d (patch)
tree1b5cc503acb22f56e94fa86a9c415a32b914988b /sysdeps/i386/dl-machine.h
parent9129b9874db71c9325ee0772810fee8a5e4a82f8 (diff)
downloadglibc-c6d80202830057548b130381c214ddb383fccd5d.tar.gz
glibc-c6d80202830057548b130381c214ddb383fccd5d.tar.xz
glibc-c6d80202830057548b130381c214ddb383fccd5d.zip
* sysdeps/mach/hurd/i386/init-first.c (init): Don't set __environ
	here, before we might move the stack.
	(posixland_init): Set __libc_argc, __libc_argc, and __environ here.
	(init1): And not here.

	* sysdeps/i386/dl-machine.h (RTLD_START): Fix code broken by last
	change, to restore argc value in call-clobbered register after
	RTLD_START_SPECIAL_INIT, which will contain a call.

	* elf/dl-deps.c (_dl_map_object_deps): Fix size calculations for
	allocating and initializing L->l_initfini.

	* resolv/Makefile (headers): Add bits/netdb.h, so it gets installed.
Diffstat (limited to 'sysdeps/i386/dl-machine.h')
-rw-r--r--sysdeps/i386/dl-machine.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h
index 5220d923b7..3082d4d4e8 100644
--- a/sysdeps/i386/dl-machine.h
+++ b/sysdeps/i386/dl-machine.h
@@ -233,6 +233,7 @@ _dl_start_user:\n\
 " RTLD_START_SPECIAL_INIT "\n\
 	# Load the parameters again.\n\
 	# (eax, edx, ecx, *--esp) = (_dl_loaded, argc, argv, envp)\n\
+	movl (%esp), %edx\n\
 	movl _dl_loaded@GOT(%ebx), %esi\n\
 	leal 8(%esp,%edx,4), %eax\n\
 	leal 4(%esp), %ecx\n\