From f787edde1dcd0f35feff9c8fd6384bd564558180 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 27 Aug 1998 20:08:32 +0000 Subject: Update. 1998-08-27 19:42 Ulrich Drepper * elf/Makefile (distribute): Add dl-origin.h. * sysdeps/generic/dl-origin.h: New file. * sysdeps/unix/sysv/linux/dl-origin.h: New file. * elf/link.h (struct link_map): Add l_origin field. * elf/dl-load.c (expand_dynamic_string_token): New function. (decompose_path): Remove WHERE argument, take link map pointer instead. Call expand_dynamic_string_token instead of local_strdup to make copy of rpath. (_dl_init_paths): Call decompose_path with correct argument. (_dl_map_object_from_fd): Define static is EXTERNAL_MAP_FROM_FD is not defined. Check EI_OSABI and EI_ABIVERSION fields in header. (_dl_map_object): Call decompose_path with correct argument. Call expand_dynamic_string_token instead of local_strdup to also expand DST. * elf/dl-object.c (_dl_new_object): Determine l_origin for all maps but the main one. * elf/dl-support.c: Define _dl_origin_path. * elf/rtld.c: Likewise. Set _dl_origin_path based on LD_ORIGIN_PATH. * elf/dl-close (_dl_close): Free l_name and l_origin. * sysdeps/i386/useldt.h (THREAD_GETMEM, THREAD_SETMEM): Use P modifier in asm, not c. * sysdeps/mach/hurd/Makefile [subdirs==elf]: Define CFLAGS-dl-load.c to -DEXTERNAL_MAP_FROM_FD to make _dl_map_object_from_fd extern. --- sysdeps/mach/hurd/Makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'sysdeps/mach/hurd/Makefile') diff --git a/sysdeps/mach/hurd/Makefile b/sysdeps/mach/hurd/Makefile index afd8473540..42e9a79e7b 100644 --- a/sysdeps/mach/hurd/Makefile +++ b/sysdeps/mach/hurd/Makefile @@ -124,6 +124,8 @@ $(inst_libdir)/libc.so: $(rpcuserlibs) # objects directly into the shared object. ifeq (elf,$(subdir)) $(objpfx)librtld.os: $(rpcuserlibs:.so=_pic.a) + +CFLAGS-dl-load.c = -DEXTERNAL_MAP_FROM_FD endif # We need these libs to link static programs in the libc source tree, too. -- cgit 1.4.1