summary refs log tree commit diff
path: root/sysdeps/i386/elf/start.S
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-03-06 17:21:43 +0000
committerUlrich Drepper <drepper@redhat.com>1998-03-06 17:21:43 +0000
commit7dea968e78d0903e5f6069f2bf72a9961f49465f (patch)
tree20dd8ba18cd1960f9c60d8ae73adea86de2a253e /sysdeps/i386/elf/start.S
parent4b7814cf8a55c034f34e02c14207bb271b3aee50 (diff)
downloadglibc-7dea968e78d0903e5f6069f2bf72a9961f49465f.tar.gz
glibc-7dea968e78d0903e5f6069f2bf72a9961f49465f.tar.xz
glibc-7dea968e78d0903e5f6069f2bf72a9961f49465f.zip
Update.
1998-03-06 17:04  Ulrich Drepper  <drepper@cygnus.com>

	* libc.map: Add _dl_debug_impcalls, _dl_debug_fd, _dl_sysdep_output,
	__libc_start_main.
	* csu/Makefile (routines): Add libc-start.
	* elf/dl-error.c: Remove declaration of _dl_argv.  Include <unitsd.h>.
	* elf/dl-lookup.c: Likewise.
	* elf/dl-version.c: Likewise.
	* sysdeps/i386/dl-machine.h: Likewise.
	* elf/link.h: Declare _dl_argv, _dl_debug_fd.
	Declare _dl_sysdep_output.  Make _dl_sysdep_fatal, _dl_sysdep_error and
	_dl_sysdep_message macros which use _dl_sysdep_output.
	* elf/dl-fini.c: Write out which destructor is called while debugging.
	* elf/dl-init.c: Likewise for constructor.
	* elf/dl-load.c: Use _dl_debug_message instead of _dl_sysdep_message.
	* elf/dl-misc.c: Remove _dl_sysdep_fatal, _dl_sysdep_error and
	_dl_sysdep_message.  Add _dl_sysdep_output.
	* elf/rtld.c: Recognize LD_DEBUG_OUTPUT.  Set _dl_debug_fd if
	this file can be opened.
	For LD_DEBUG=libs also set _dl_debug_impcalls.
	* sysdeps/generic/dl-cache.c: Include unistd.h.
	* sysdeps/generic/libc-start.c: New file.
	* sysdeps/i386/elf/start.S: Don't call main directly, call
	* sysdeps/unix/sysv/linux/libc-start.c: New file.
	__libc_start_main instead.

	* elf/Makefile ($(objpfx)ld.so): Add $(load-map-file) as dependency.
Diffstat (limited to 'sysdeps/i386/elf/start.S')
-rw-r--r--sysdeps/i386/elf/start.S8
1 files changed, 5 insertions, 3 deletions
diff --git a/sysdeps/i386/elf/start.S b/sysdeps/i386/elf/start.S
index 7416c0ace9..e8ed2043ff 100644
--- a/sysdeps/i386/elf/start.S
+++ b/sysdeps/i386/elf/start.S
@@ -1,5 +1,5 @@
 /* Startup code compliant to the ELF i386 ABI.
-   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1998 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
@@ -88,9 +88,11 @@ _start:
 	call atexit
 	popl %eax
 
-	/* Call the user's main function, and exit with its value.  */
-	call main
+	/* Call the user's main function, and exit with its value.
+	   But let the libc call main.    */
+	movl $main, %eax
 	pushl %eax
+	call __libc_start_main
 	call exit
 	hlt			/* Crash if somehow `exit' does return.  */