From 7dea968e78d0903e5f6069f2bf72a9961f49465f Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 6 Mar 1998 17:21:43 +0000 Subject: Update. 1998-03-06 17:04 Ulrich Drepper * 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 . * 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. --- elf/link.h | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) (limited to 'elf/link.h') diff --git a/elf/link.h b/elf/link.h index b8bce58..4fa6fbb 100644 --- a/elf/link.h +++ b/elf/link.h @@ -231,6 +231,9 @@ typedef void (*receiver_fct) (int, const char *, const char *); user interface to run-time dynamic linking. */ +/* Parameters passed to te dynamic linker. */ +extern char **_dl_argv; + /* Cached value of `getpagesize ()'. */ extern size_t _dl_pagesize; @@ -244,26 +247,48 @@ extern struct link_map *_dl_profile_map; /* If nonzero the appropriate debug information if printed. */ extern int _dl_debug_libs; +extern int _dl_debug_impcalls; + +/* File deccriptor to write debug messages to. */ +extern int _dl_debug_fd; /* OS-dependent function to open the zero-fill device. */ extern int _dl_sysdep_open_zero_fill (void); /* dl-sysdep.c */ +/* OS-dependent function to write a message on the specified + descriptor FD. All arguments are `const char *'; args until a null + pointer are concatenated to form the message to print. */ +extern void _dl_sysdep_output (int fd, const char *string, ...); + +/* OS-dependent function to write a debug message on the specified + descriptor for this. All arguments are `const char *'; args until + a null pointer are concatenated to form the message to print. */ +#define _dl_debug_message(string, args...) \ + _dl_sysdep_output (_dl_debug_fd, string, ##args) + /* OS-dependent function to write a message on the standard output. All arguments are `const char *'; args until a null pointer are concatenated to form the message to print. */ -extern void _dl_sysdep_message (const char *string, ...); +#define _dl_sysdep_message(string, args...) \ + _dl_sysdep_output (STDOUT_FILENO, string, ##args) /* OS-dependent function to write a message on the standard error. All arguments are `const char *'; args until a null pointer are concatenated to form the message to print. */ -extern void _dl_sysdep_error (const char *string, ...); +#define _dl_sysdep_error(string, args...) \ + _dl_sysdep_output (STDERR_FILENO, string, ##args) /* OS-dependent function to give a fatal error message and exit when the dynamic linker fails before the program is fully linked. All arguments are `const char *'; args until a null pointer are concatenated to form the message to print. */ -extern void _dl_sysdep_fatal (const char *string, ...) - __attribute__ ((__noreturn__)); +#define _dl_sysdep_fatal(string, args...) \ + do \ + { \ + _dl_sysdep_output (STDERR_FILENO, string, ##args); \ + _exit (127); \ + } \ + while (1) /* Nonzero if the program should be "secure" (i.e. it's setuid or somesuch). This tells the dynamic linker to ignore environment variables. */ -- cgit v1.1