diff options
54 files changed, 4231 insertions, 2616 deletions
@@ -1,4 +1,116 @@ -Mon Jul 13 10:28:28 1998 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> +1998-07-10 18:14 -0400 Zack Weinberg <zack@rabi.phys.columbia.edu> + + * manual/Makefile: Overhauled. Generate libc.texinfo from the + chapter files. Exorcise the chapters, chapters-incl mess. + Support inserting doc chapters from add-on modules. + (chapters): New variable. + (add-chapters): New variable. + (appendices): New variable. + (libc.texinfo): New target. + (clean): Fix bugs. + (realclean): Fix bugs. + + * manual/texis.awk: New file. + * manual/libc-texinfo.sh: New file. + * manual/libc-texinfo.in: New file. + + * manual/conf.texi (top @node): Remove next pointer. + * manual/lang.texi (top @node): Remove prev pointer. + + * manual/job.texi (top @node): Add explicit pointers. + * manual/message.texi (top @node): Add explicit pointers. + * manual/nss.texi (top @node): Add explicit pointers. + * manual/process.texi (top @node): Add explicit pointers. + * manual/startup.texi (top @node): Add explicit pointers. + * manual/terminal.texi (top @node): Add explicit pointers. + * manual/users.texi (top @node): Add explicit pointers. + + * manual/arith.texi: Add %MENU% tag. + * manual/conf.texi: Add %MENU% tag. + * manual/contrib.texi: Add %MENU% tag. + * manual/ctype.texi: Add %MENU% tag. + * manual/errno.texi: Add %MENU% tag. + * manual/filesys.texi: Add %MENU% tag. + * manual/header.texi: Add %MENU% tag. + * manual/install.texi: Add %MENU% tag. + * manual/intro.texi: Add %MENU% tag. + * manual/io.texi: Add %MENU% tag. + * manual/job.texi: Add %MENU% tag. + * manual/lang.texi: Add %MENU% tag. + * manual/llio.texi: Add %MENU% tag. + * manual/locale.texi: Add %MENU% tag. + * manual/maint.texi: Add %MENU% tag. + * manual/math.texi: Add %MENU% tag. + * manual/mbyte.texi: Add %MENU% tag. + * manual/memory.texi: Add %MENU% tag. + * manual/message.texi: Add %MENU% tag. + * manual/nss.texi: Add %MENU% tag. + * manual/pattern.texi: Add %MENU% tag. + * manual/pipe.texi: Add %MENU% tag. + * manual/process.texi: Add %MENU% tag. + * manual/search.texi: Add %MENU% tag. + * manual/setjmp.texi: Add %MENU% tag. + * manual/signal.texi: Add %MENU% tag. + * manual/socket.texi: Add %MENU% tag. + * manual/startup.texi: Add %MENU% tag. + * manual/stdio.texi: Add %MENU% tag. + * manual/string.texi: Add %MENU% tag. + * manual/sysinfo.texi: Add %MENU% tag. + * manual/terminal.texi: Add %MENU% tag. + * manual/time.texi: Add %MENU% tag. + * manual/users.texi: Add %MENU% tag. + +1998-07-13 Ulrich Drepper <drepper@cygnus.com> + + * sysdeps/unix/sysv/linux/i386/dl-procinfo.h (x86_cap_flags): + Update. + +1998-07-11 Andreas Jaeger <aj@arthur.rhein-neckar.de> + + * sysdeps/unix/sysv/linux/recvmsg.c (__libc_recvmsg): Use ANSI + style declaration to avoid warning. + * sysdeps/unix/sysv/linux/sendmsg.c (__libc_sendmsg): Likewise. + +1998-07-04 Mark Kettenis <kettenis@phys.uva.nl> + + * elf/rtld.c (process_dl_debug): Add missing continue. + +1998-07-12 Mark Kettenis <kettenis@phys.uva.nl> + + * elf/rtld.c (_dl_skip_args): Make global because the Hurd startup + code needs it. + +1998-07-10 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> + + * Makeconfig ($(common-objpfx)sysd-dirs): Write out definition of + sysd-dirs-done. + * Makerules: Don't generate version maps too early. + ($(common-objpfx)sysd-versions): Force regeneration if the list of + subdirs has changed. + +1998-07-10 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> + + * elf/dlfcn.h (DL_CALL_FCT): Use portable comma expression. + +1998-07-11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> + + * iconv/gconv_db.c (gen_steps): Always set *handle and *nsteps. + * iconv/gconv_dl.c (__gconv_find_shlib): Correct use of tfind + return value. + +1998-07-12 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> + + * elf/dl-open.c (dl_open_worker): New function. + (_dl_open): Call it to do the actual work while catching errors. + * elf/dl-close.c (_dl_close): Only call termination function if + the initialisation function was called. + +1998-07-13 Ulrich Drepper <drepper@cygnus.com> + + * libio/libioP.h (_IO_cleanup_registration_needed): Use __PMT. + Reported by Felix von Leitner <leitner@amdiv.de>. + +1998-07-13 10:28 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/m68k/dl-envvars.h: New file. @@ -857,6 +969,10 @@ Mon Jul 13 10:28:28 1998 Andreas Schwab <schwab@issan.informatik.uni-dortmund. 1998-06-23 Mark Kettenis <kettenis@phys.uva.nl> + * elf/rtld.c (process_dl_debug): Add missing continue. + +1998-06-23 Mark Kettenis <kettenis@phys.uva.nl> + * elf/dl-load.c (_dl_map_object_from_fd): Add missing cast. 1998-06-23 Andreas Jaeger <aj@arthur.rhein-neckar.de> diff --git a/Makeconfig b/Makeconfig index ee1cc6e79b..43b44c9e87 100644 --- a/Makeconfig +++ b/Makeconfig @@ -777,7 +777,9 @@ all-Subdirs-files = $(wildcard $(addsuffix /Subdirs, $(config-sysdirs))) $(common-objpfx)sysd-dirs: $(common-objpfx)config.make $(all-Subdirs-files) (echo define sysdep-subdirs; \ sed 's/#.*$$//' $(all-Subdirs-files) /dev/null; \ - echo endef) > $@-tmp + echo endef; \ + echo 'sysd-dirs-done = t'; \ + ) > $@-tmp mv -f $@-tmp $@ endif # Makeconfig not yet included @@ -276,22 +276,31 @@ ifndef sysd-rules-done no_deps=t endif -# Generate version maps. +# Generate version maps, but wait until sysdep-subdirs is known +ifdef sysd-dirs-done ifeq ($(versioning),yes) -ifndef no_deps -include $(common-objpfx)sysd-versions $(addprefix $(common-objpfx),$(version-maps)): $(common-objpfx)sysd-versions -generated += $(version-maps) +common-generated += $(version-maps) sysd-versions +ifndef avoid-generated +ifneq ($(sysd-versions-subdirs),$(all-subdirs) $(config-sysdirs)) +sysd-versions-force = FORCE +FORCE: +endif $(common-objpfx)sysd-versions: $(..)Versions.def $(..)scripts/versions.awk \ $(wildcard $(all-subdirs:%=$(..)%/Versions)) \ - $(wildcard $(+sysdep_dirs:%=%/Versions)) - $(AWK) -v buildroot=$(common-objpfx) -v defsfile=$< \ - -v move_if_change='$(move-if-change)' \ - -f $(filter-out $<,$^) > $@T + $(wildcard $(sysdirs:%=%/Versions)) \ + $(sysd-versions-force) + { echo 'sysd-versions-subdirs = $(all-subdirs) $(config-sysdirs)' ; \ + $(AWK) -v buildroot=$(common-objpfx) -v defsfile=$< \ + -v move_if_change='$(move-if-change)' \ + -f $(filter-out $< $(sysd-versions-force),$^); \ + } > $@T mv -f $@T $@ -endif -endif +endif # avoid-generated +endif # $(versioning) = yes +endif # sysd-dirs-done ifndef compile-command.S compile-command.S = $(compile.S) $(OUTPUT_OPTION) diff --git a/elf/dl-close.c b/elf/dl-close.c index 8b352d0f47..e1ca142a69 100644 --- a/elf/dl-close.c +++ b/elf/dl-close.c @@ -62,7 +62,9 @@ _dl_close (struct link_map *map) { struct link_map *imap = list[i]; if (imap->l_opencount == 1 && imap->l_type == lt_loaded - && imap->l_info[DT_FINI]) + && imap->l_info[DT_FINI] + /* Skip any half-cooked objects that were never initialized. */ + && imap->l_init_called) { /* When debugging print a message first. */ if (_dl_debug_impcalls) diff --git a/elf/dl-open.c b/elf/dl-open.c index 2b9590913f..b595f2df73 100644 --- a/elf/dl-open.c +++ b/elf/dl-open.c @@ -20,6 +20,7 @@ #include <dlfcn.h> #include <errno.h> #include <stdlib.h> +#include <string.h> #include <bits/libc-lock.h> #include <elf/ldsodefs.h> @@ -50,25 +51,31 @@ static size_t _dl_global_scope_alloc; __libc_lock_define_initialized_recursive (, _dl_load_lock) -struct link_map * -internal_function -_dl_open (const char *file, int mode) +/* We must be carefull not to leave us in an inconsistent state. Thus we + catch any error and re-raise it after cleaning up. */ + +struct dl_open_args { + const char *file; + int mode; + struct link_map *map; +}; + +static void +dl_open_worker (void *a) +{ + struct dl_open_args *args = a; + const char *file = args->file; + int mode = args->mode; struct link_map *new, *l; ElfW(Addr) init; struct r_debug *r; - /* Make sure we are alone. */ - __libc_lock_lock (_dl_load_lock); - /* Load the named object. */ - new = _dl_map_object (NULL, file, 0, lt_loaded, 0); + args->map = new = _dl_map_object (NULL, file, 0, lt_loaded, 0); if (new->l_searchlist) - { - /* It was already open. */ - __libc_lock_unlock (_dl_load_lock); - return new; - } + /* It was already open. */ + return; /* Load that object's dependencies. */ _dl_map_object_deps (new, NULL, 0, 0); @@ -147,7 +154,7 @@ _dl_open (const char *file, int mode) { _dl_global_scope = _dl_default_scope; nomem: - _dl_close (new); + new->l_global = 0; _dl_signal_error (ENOMEM, file, "cannot extend global scope"); } _dl_global_scope[2] = _dl_default_scope[2]; @@ -158,8 +165,8 @@ _dl_open (const char *file, int mode) } else { - if (_dl_global_scope_alloc < - (size_t) (_dl_global_scope_end - _dl_global_scope + 2)) + if (_dl_global_scope_end + 2 + == _dl_global_scope + _dl_global_scope_alloc) { /* Must extend the list. */ struct link_map **new = realloc (_dl_global_scope, @@ -167,9 +174,8 @@ _dl_open (const char *file, int mode) * sizeof (struct link_map *)); if (! new) goto nomem; - _dl_global_scope_end = new + (_dl_global_scope_end - - _dl_global_scope); _dl_global_scope = new; + _dl_global_scope_end = new + _dl_global_scope_alloc - 2; _dl_global_scope_alloc *= 2; } @@ -199,9 +205,49 @@ _dl_open (const char *file, int mode) /* We must be the static _dl_open in libc.a. A static program that has loaded a dynamic object now has competition. */ __libc_multiple_libcs = 1; +} + + +struct link_map * +internal_function +_dl_open (const char *file, int mode) +{ |