diff options
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/generic/dl-cache.c | 4 | ||||
| -rw-r--r-- | sysdeps/generic/dl-machine.h | 4 | ||||
| -rw-r--r-- | sysdeps/generic/dl-origin.c | 4 | ||||
| -rw-r--r-- | sysdeps/generic/dl-sysdep.c | 4 | ||||
| -rw-r--r-- | sysdeps/generic/elf/backtracesyms.c | 4 | ||||
| -rw-r--r-- | sysdeps/generic/elf/backtracesymsfd.c | 4 | ||||
| -rw-r--r-- | sysdeps/generic/ldsodefs.h | 411 | ||||
| -rw-r--r-- | sysdeps/generic/libc-start.c | 2 | ||||
| -rw-r--r-- | sysdeps/i386/dl-machine.h | 4 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/dl-sysdep.c | 4 | ||||
| -rw-r--r-- | sysdeps/mips/elf/ldsodefs.h | 25 | ||||
| -rw-r--r-- | sysdeps/powerpc/dl-machine.c | 4 | ||||
| -rw-r--r-- | sysdeps/powerpc/elf/libc-start.c | 4 | ||||
| -rw-r--r-- | sysdeps/sparc/sparc32/dl-machine.h | 4 | ||||
| -rw-r--r-- | sysdeps/sparc/sparc64/dl-machine.h | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/dl-origin.c | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/dl-librecon.h | 2 |
17 files changed, 464 insertions, 28 deletions
diff --git a/sysdeps/generic/dl-cache.c b/sysdeps/generic/dl-cache.c index 36d3dc37aa..2ab13d8d3f 100644 --- a/sysdeps/generic/dl-cache.c +++ b/sysdeps/generic/dl-cache.c @@ -1,5 +1,5 @@ /* Support for reading /etc/ld.so.cache files written by Linux ldconfig. - Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998, 1999, 2000 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 @@ -18,7 +18,7 @@ Boston, MA 02111-1307, USA. */ #include <unistd.h> -#include <elf/ldsodefs.h> +#include <ldsodefs.h> #include <sys/mman.h> #include <dl-cache.h> diff --git a/sysdeps/generic/dl-machine.h b/sysdeps/generic/dl-machine.h index da6c74bcaa..d74aebeb6d 100644 --- a/sysdeps/generic/dl-machine.h +++ b/sysdeps/generic/dl-machine.h @@ -1,5 +1,5 @@ /* Machine-dependent ELF dynamic relocation inline functions. Stub version. - Copyright (C) 1995, 1996, 1997, 1999 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 1997, 1999, 2000 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 @@ -117,7 +117,7 @@ elf_machine_runtime_setup (struct link_map *l, int lazy) in. Their initial contents will arrange when called to push an offset into the .rel.plt section, push _GLOBAL_OFFSET_TABLE_[1], and then jump to _GLOBAL_OFFSET_TABLE[2]. */ - Elf32_Addr *got = (Elf32_Addr *) l->l_info[DT_PLTGOT]->d_un.d_ptr; + Elf32_Addr *got = (Elf32_Addr *) D_PTR (l, l_info[DT_PLTGOT]); got[1] = (Elf32_Addr) l; /* Identify this shared object. */ /* This function will get called to fix up the GOT entry indicated by diff --git a/sysdeps/generic/dl-origin.c b/sysdeps/generic/dl-origin.c index b10fee2d57..d63bf75f4c 100644 --- a/sysdeps/generic/dl-origin.c +++ b/sysdeps/generic/dl-origin.c @@ -1,5 +1,5 @@ /* Find path of executable. - Copyright (C) 1998, 1999 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -21,7 +21,7 @@ #include <stdlib.h> #include <string.h> #include <sys/param.h> -#include <elf/ldsodefs.h> +#include <ldsodefs.h> #include <dl-dst.h> diff --git a/sysdeps/generic/dl-sysdep.c b/sysdeps/generic/dl-sysdep.c index 5ef67ab4a0..5994af3986 100644 --- a/sysdeps/generic/dl-sysdep.c +++ b/sysdeps/generic/dl-sysdep.c @@ -1,5 +1,5 @@ /* Operating system support for run-time dynamic linker. Generic Unix version. - Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 1997, 1998, 2000 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 @@ -26,7 +26,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <sys/mman.h> -#include <elf/ldsodefs.h> +#include <ldsodefs.h> #include <stdio-common/_itoa.h> #include <fpu_control.h> diff --git a/sysdeps/generic/elf/backtracesyms.c b/sysdeps/generic/elf/backtracesyms.c index 100d94aa42..0419773d40 100644 --- a/sysdeps/generic/elf/backtracesyms.c +++ b/sysdeps/generic/elf/backtracesyms.c @@ -1,5 +1,5 @@ /* Return list with names for address in backtrace. - Copyright (C) 1998, 1999 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -23,7 +23,7 @@ #include <stdlib.h> #include <string.h> -#include <elf/ldsodefs.h> +#include <ldsodefs.h> #if __ELF_NATIVE_CLASS == 32 # define WORD_WIDTH 8 diff --git a/sysdeps/generic/elf/backtracesymsfd.c b/sysdeps/generic/elf/backtracesymsfd.c index b67b64529e..80e6da967e 100644 --- a/sysdeps/generic/elf/backtracesymsfd.c +++ b/sysdeps/generic/elf/backtracesymsfd.c @@ -1,5 +1,5 @@ /* Write formatted list with names for addresses in backtrace to a file. - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -23,7 +23,7 @@ #include <sys/uio.h> #include <stdio-common/_itoa.h> -#include <elf/ldsodefs.h> +#include <ldsodefs.h> #if __ELF_NATIVE_CLASS == 32 # define WORD_WIDTH 8 diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h new file mode 100644 index 0000000000..bcc74b3ab2 --- /dev/null +++ b/sysdeps/generic/ldsodefs.h @@ -0,0 +1,411 @@ +/* Run-time dynamic linker data structures for loaded ELF shared objects. + Copyright (C) 1995-1999, 2000 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 + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#ifndef _LDSODEFS_H +#define _LDSODEFS_H 1 + +#include <features.h> + +#define __need_size_t +#define __need_NULL +#include <stddef.h> + +#include <elf.h> +#include <dlfcn.h> +#include <link.h> + +__BEGIN_DECLS + +/* We use this macro to refer to ELF types independent of the native wordsize. + `ElfW(TYPE)' is used in place of `Elf32_TYPE' or `Elf64_TYPE'. */ +#define ELFW(type) _ElfW (ELF, __ELF_NATIVE_CLASS, type) + +/* All references to the value of l_info[DT_PLTGOT], + l_info[DT_STRTAB], l_info[DT_SYMTAB], l_info[DT_RELA], + l_info[DT_REL], l_info[DT_JMPREL], l_info[VERSYMIDX (DT_VERSYM)], + and l_info[DT_INIT_ARRAY] have to accessed via the D_PTR macro. The + macro is needed since for most architectures the entry is already + relocated - but for some not and we need to relocate at access time. */ +#ifdef DL_RO_DYN_SECTION +# define D_PTR(map,i) (map->i->d_un.d_ptr + map->l_addr) +#else +# define D_PTR(map,i) map->i->d_un.d_ptr +#endif + +/* For the version handling we need an array with only names and their + hash values. */ +struct r_found_version + { + const char *name; + ElfW(Word) hash; + + int hidden; + const char *filename; + }; + +/* We want to cache information about the searches for shared objects. */ + +enum r_dir_status { unknown, nonexisting, existing }; + +struct r_search_path_elem + { + /* This link is only used in the `all_dirs' member of `r_search_path'. */ + struct r_search_path_elem *next; + + /* Strings saying where the definition came from. */ + const char *what; + const char *where; + + /* Basename for this search path element. The string must end with + a slash character. */ + const char *dirname; + size_t dirnamelen; + + enum r_dir_status status[0]; + }; + +struct r_strlenpair + { + const char *str; + size_t len; + }; + + +/* A data structure for a simple single linked list of strings. */ +struct libname_list + { + const char *name; /* Name requested (before search). */ + struct libname_list *next; /* Link to next name for this object. */ + }; + + +/* Test whether given NAME matches any of the names of the given object. */ +static __inline int +__attribute__ ((unused)) +_dl_name_match_p (const char *__name, struct link_map *__map) +{ + int __found = strcmp (__name, __map->l_name) == 0; + struct libname_list *__runp = __map->l_libname; + + while (! __found && __runp != NULL) + if (strcmp (__name, __runp->name) == 0) + __found = 1; + else + __runp = __runp->next; + + return __found; +} + +/* Function used as argument for `_dl_receive_error' function. The + arguments are the error code, error string, and the objname the + error occurred in. */ +typedef void (*receiver_fct) (int, const char *, const char *); + +/* Internal functions of the run-time dynamic linker. + These can be accessed if you link again the dynamic linker + as a shared library, as in `-lld' or `/lib/ld.so' explicitly; + but are not normally of interest to user programs. + + The `-ldl' library functions in <dlfcn.h> provide a simple + user interface to run-time dynamic linking. */ + + +/* Parameters passed to the dynamic linker. */ +extern char **_dl_argv; + +/* Cached value of `getpagesize ()'. */ +extern size_t _dl_pagesize; + +/* File descriptor referring to the zero-fill device. */ +extern int _dl_zerofd; + +/* Name of the shared object to be profiled (if any). */ +extern const char *_dl_profile; +/* Map of shared object to be profiled. */ +extern struct link_map *_dl_profile_map; +/* Filename of the output file. */ +extern const char *_dl_profile_output; + +/* If nonzero the appropriate debug information is printed. */ +extern int _dl_debug_libs; +extern int _dl_debug_impcalls; +extern int _dl_debug_bindings; +extern int _dl_debug_symbols; +extern int _dl_debug_versions; +extern int _dl_debug_reloc; +extern int _dl_debug_files; + +/* Expect cache ID. */ +extern int _dl_correct_cache_id; + +/* Mask for hardware capabilities that are available. */ +extern unsigned long int _dl_hwcap; + +/* Mask for important hardware capabilities we honour. */ +extern unsigned long int _dl_hwcap_mask; + +/* File descriptor to write debug messages to. */ +extern int _dl_debug_fd; + +/* Names of shared object for which the RPATH should be ignored. */ +extern const char *_dl_inhibit_rpath; + +/* 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. If + NEW_LINE is nonzero it is assumed that the message starts on a new + line. */ +extern void _dl_debug_message (int new_line, const char *string, ...); + +/* 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. */ +#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. */ +#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. */ +#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. */ +extern int _dl_secure; + +/* This function is called by all the internal dynamic linker functions + when they encounter an error. ERRCODE is either an `errno' code or + zero; OBJECT is the name of the problematical shared object, or null if + it is a general problem; ERRSTRING is a string describing the specific + problem. */ +extern void _dl_signal_error (int errcode, + const char *object, + const char *errstring) + internal_function + __attribute__ ((__noreturn__)); + +/* Like _dl_signal_error, but may return when called in the context of + _dl_receive_error. */ +extern void _dl_signal_cerror (int errcode, + const char *object, + const char *errstring) + internal_function; + +/* Call OPERATE, receiving errors from `dl_signal_cerror'. Unlike + `_dl_catch_error' the operation is resumed after the OPERATE + function returns. + ARGS is passed as argument to OPERATE. */ +extern void _dl_receive_error (receiver_fct fct, void (*operate) (void *), + void *args) + internal_function; + + +/* Open the shared object NAME and map in its segments. + LOADER's DT_RPATH is used in searching for NAME. + If the object is already opened, returns its existing map. + For preloaded shared objects PRELOADED is set to a non-zero + value to allow additional security checks. */ +extern struct link_map *_dl_map_object (struct link_map *loader, + const char *name, int preloaded, + int type, int trace_mode) + internal_function; + +/* Call _dl_map_object on the dependencies of MAP, and set up + MAP->l_searchlist. PRELOADS points to a vector of NPRELOADS previously + loaded objects that will be inserted into MAP->l_searchlist after MAP + but before its dependencies. */ +extern void _dl_map_object_deps (struct link_map *map, + struct link_map **preloads, + unsigned int npreloads, int trace_mode) + internal_function; + +/* Cache the locations of MAP's hash table. */ +extern void _dl_setup_hash (struct link_map *map) internal_function; + + +/* Search loaded objects' symbol tables for a definition of the symbol + referred to by UNDEF. *SYM is the symbol table entry containing the + reference; it is replaced with the defining symbol, and the base load + address of the defining object is returned. SYMBOL_SCOPE is a + null-terminated list of object scopes to search; each object's + l_searchlist (i.e. the segment of the dependency tree starting at that + object) is searched in turn. REFERENCE_NAME should name the object + containing the reference; it is used in error messages. + RELOC_TYPE is a machine-dependent reloc type, which is passed to + the `elf_machine_lookup_*_p' macros in dl-machine.h to affect which + symbols can be chosen. */ +extern ElfW(Addr) _dl_lookup_symbol (const char *undef, + struct link_map *undef_map, + const ElfW(Sym) **sym, + struct r_scope_elem *symbol_scope[], + int reloc_type) + internal_function; + +/* Lookup versioned symbol. */ +extern ElfW(Addr) _dl_lookup_versioned_symbol (const char *undef, + struct link_map *undef_map, + const ElfW(Sym) **sym, + struct r_scope_elem *symbol_scope[], + const struct r_found_version *version, + int reloc_type) + internal_function; + +/* For handling RTLD_NEXT we must be able to skip shared objects. */ +extern ElfW(Addr) _dl_lookup_symbol_skip (const char *undef, + struct link_map *undef_map, + const ElfW(Sym) **sym, + struct r_scope_elem *symbol_scope[], + struct link_map *skip_this) + internal_function; + +/* For handling RTLD_NEXT with versioned symbols we must be able to + skip shared objects. */ +extern ElfW(Addr) _dl_lookup_versioned_symbol_skip (const char *undef, + struct link_map *undef_map, + const ElfW(Sym) **sym, + struct r_scope_elem *symbol_scope[], + const struct r_found_version *version, + struct link_map *skip_this) + internal_function; + +/* Look up symbol NAME in MAP's scope and return its run-time address. */ +extern ElfW(Addr) _dl_symbol_value (struct link_map *map, const char *name) + internal_function; + + +/* Structure describing the dynamic linker itself. */ +extern struct link_map _dl_rtld_map; +/* And a pointer to the map for the main map. */ +extern struct link_map *_dl_loaded; +/* Array representing global scope. */ +extern struct r_scope_elem *_dl_global_scope[2]; +/* Direct pointer to the searchlist of the main object. */ +extern struct r_scope_elem *_dl_main_searchlist; +/* Copy of the content of `_dl_main_searchlist'. */ +extern struct r_scope_elem _dl_initial_searchlist; +/* This is zero at program start to signal that the global scope map is + allocated by rtld. Later it keeps the size of the map. It might be + reset if in _dl_close if the last global object is removed. */ +extern size_t _dl_global_scope_alloc; + +/* Allocate a `struct link_map' for a new object being loaded, + and enter it into the _dl_main_map list. */ +extern struct link_map *_dl_new_object (char *realname, const char *libname, + int type, struct link_map *loader) + internal_function; + +/* Relocate the given object (if it hasn't already been). + SCOPE is passed to _dl_lookup_symbol in symbol lookups. + If LAZY is nonzero, don't relocate its PLT. */ +extern void _dl_relocate_object (struct link_map *map, + struct r_scope_elem *scope[], + int lazy, int consider_profiling); + +/* Call _dl_signal_error with a message about an unhandled reloc type. + TYPE is the result of ELFW(R_TYPE) (r_info), i.e. an R_<CPU>_* value. + PLT is nonzero if this was a PLT reloc; it just affects the message. */ +extern void _dl_reloc_bad_type (struct link_map *map, + uint_fast8_t type, int plt) + internal_function; + +/* Check the version dependencies of all objects available through + MAP. If VERBOSE print some more diagnostics. */ +extern int _dl_check_all_versions (struct link_map *map, int verbose) + internal_function; + +/* Check the version dependencies for MAP. If VERBOSE print some more + diagnostics. */ +extern int _dl_check_map_versions (struct link_map *map, int verbose) + internal_function; + +/* Return the address of the next initializer function for SCOPE or one of + its dependencies that has not yet been run. When there are no more + initializers to be run, this returns zero. The functions are returned + in the order they should be called. */ +extern ElfW(Addr) _dl_init_next (struct r_scope_elem *scope) internal_function; + +/* Call the finalizer functions of all shared objects whose + initializer functions have completed. */ +extern void _dl_fini (void) internal_function; + +/* The dynamic linker calls this function before and having changing + any shared object mappings. The `r_state' member of `struct r_debug' + says what change is taking place. This function's address is + the value of the `r_brk' member. */ +extern void _dl_debug_state (void); + +/* Initialize `struct r_debug' if it has not already been done. The + argument is the run-time load address of the dynamic linker, to be put + in the `r_ldbase' member. Returns the address of the structure. */ +extern struct r_debug *_dl_debug_initialize (ElfW(Addr) ldbase) + internal_function; + +/* Initialize the basic data structure for the search paths. */ +extern void _dl_init_paths (const char *library_path) internal_function; + +/* Gather the information needed to install the profiling tables and start + the timers. */ +extern void _dl_start_profile (struct link_map *map, const char *output_dir) + internal_function; + +/* The actual functions used to keep book on the calls. */ +extern void _dl_mcount (ElfW(Addr) frompc, ElfW(Addr) selfpc); + +/* This function is simply a wrapper around the _dl_mcount function + which does not require a FROMPC parameter since this is the + calling function. */ +extern void _dl_mcount_wrapper (void *selfpc); + +/* Show the members of the auxiliary array passed up from the kernel. */ +extern void _dl_show_auxv (void) internal_function; + +/* Return all environment variables starting with `LD_', one after the + other. */ +extern char *_dl_next_ld_env_entry (char ***position) internal_function; + +/* Return an array with the names of the important hardware capabilities. */ +extern const struct r_strlenpair *_dl_important_hwcaps (const char *platform, + size_t paltform_len, + size_t *sz, + size_t *max_capstrlen) + internal_function; + +__END_DECLS + +#endif /* ldsodefs.h */ diff --git a/sysdeps/generic/libc-start.c b/sysdeps/generic/libc-start.c index 77f730a027..bcb3cf3f2d 100644 --- a/sysdeps/generic/libc-start.c +++ b/sysdeps/generic/libc-start.c @@ -22,7 +22,7 @@ #include <stdlib.h> #include <unistd.h> #include <sys/ioctl.h> -#include <elf/ldsodefs.h> +#include <ldsodefs.h> extern void __libc_init_first (int argc, char **argv, char **envp); diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h index 3dc178b261..351b82af32 100644 --- a/sysdeps/i386/dl-machine.h +++ b/sysdeps/i386/dl-machine.h @@ -90,7 +90,7 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile) in. Their initial contents will arrange when called to push an offset into the .rel.plt section, push _GLOBAL_OFFSET_TABLE_[1], and then jump to _GLOBAL_OFFSET_TABLE[2]. */ - got = (Elf32_Addr *) l->l_info[DT_PLTGOT]->d_un.d_ptr; + got = (Elf32_Addr *) D_PTR (l, l_info[DT_PLTGOT]); got[1] = (Elf32_Addr) l; /* Identify this shared object. */ /* The got[2] entry contains the address of a function which gets @@ -348,7 +348,7 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc, { const char *strtab; - strtab = (const char *) map->l_info[DT_STRTAB]->d_un.d_ptr; + strtab = (const char *) D_PTR (map, l_info[DT_STRTAB]); _dl_sysdep_error (_dl_argv[0] ?: "<program name unknown>", ": Symbol `", strtab + refsym->st_name, "' has different size in shared object, " diff --git a/sysdeps/mach/hurd/dl-sysdep.c b/sysdeps/mach/hurd/dl-sysdep.c index c79c388b9f..a1f4565869 100644 --- a/sysdeps/mach/hurd/dl-sysdep.c +++ b/sysdeps/mach/hurd/dl-sysdep.c @@ -1,5 +1,5 @@ /* Operating system support for run-time dynamic linker. Hurd version. - Copyright (C) 1995, 96, 97, 98, 99 Free Software Foundation, Inc. + Copyright (C) 1995, 96, 97, 98, 99, 2000 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 @@ -23,7 +23,7 @@ #include <fcntl.h> #include <stdlib.h> #include <sys/mman.h> -#include <elf/ldsodefs.h> +#include <ldsodefs.h> #include <sys/wait.h> #include <assert.h> #include <sysdep.h> diff --git a/sysdeps/mips/elf/ldsodefs.h b/sysdeps/mips/elf/ldsodefs.h new file mode 100644 index 0000000000..2dc783b57e --- /dev/null +++ b/sysdeps/mips/elf/ldsodefs.h @@ -0,0 +1,25 @@ +/* Run-time dynamic linker data structures for loaded ELF shared objects. + Copyright (C) 2000 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 + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + + +/* The MIPS ABI specifies that the dynamic section has to be read-only. */ + +#define DL_RO_DYN_SECTION 1 + +#include <sysdeps/generic/ldsodefs.h> diff --git a/sysdeps/powerpc/dl-machine.c b/sysdeps/powerpc/dl-machine.c index 96f928ab84..fa1895bb35 100644 --- a/sysdeps/powerpc/dl-machine.c +++ b/sysdeps/powerpc/dl-machine.c @@ -1,5 +1,5 @@ /* Machine-dependent ELF dynamic relocation functions. PowerPC version. - Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc. + Copyright (C) 1995,96,97,98,99,2000 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 @@ -22,7 +22,7 @@ #include <sys/param.h> #include <link.h> #include <dl-machine.h> -#include <elf/ldsodefs.h> +#include <ldsodefs.h> #include <elf/dynamic-link.h> /* Because ld.so is now versioned, these functions can be in their own file; diff --git a/sysdeps/powerpc/elf/libc-start.c b/sysdeps/powerpc/elf/libc-start.c index e90553a154..01d695bd93 100644 --- a/sysdeps/powerpc/elf/libc-start.c +++ b/sysdeps/powerpc/elf/libc-start.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998 Free Software Foundation, Inc. +/* Copyright (C) 1998, 2000 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 @@ -18,7 +18,7 @@ #include <stdlib.h> #include <unistd.h> -#include <elf/ldsodefs.h> +#include <ldsodefs.h> extern void __libc_init_first (int argc, char **argv, char **envp); diff --git a/sysdeps/sparc/sparc32/dl-machine.h b/sysdeps/sparc/sparc32/dl-machine.h index 8750791fe0..b5bbec48c3 100644 --- a/sysdeps/sparc/sparc32/dl-machine.h +++ b/sysdeps/sparc/sparc32/dl-machine.h @@ -1,5 +1,5 @@ /* Machine-dependent ELF dynamic relocation inline functions. SPARC version. - Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998, 1999, 2000 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 @@ -21,7 +21,7 @@ #include <string.h> #include <sys/param.h> -#include <elf/ldsodefs.h> +#include <ldsodefs.h> /* Some SPARC opcodes we need to use for self-modifying code. */ diff --git a/sysdeps/sparc/sparc64/dl-machine.h b/sysdeps/sparc/sparc64/dl-machine.h index 855e93acb6..f982e88a60 100644 --- a/sysdeps/sparc/sparc64/dl-machine.h +++ b/sysdeps/sparc/sparc64/dl-machine.h @@ -1,5 +1,5 @@ /* Machine-dependent ELF dynamic relocation inline functions. Sparc64 version. - Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 1999, 2000 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 @@ -21,7 +21,7 @@ #include <string.h> #include <sys/param.h> -#include <elf/ldsodefs.h> +#include <ldsodefs.h> #include <sysdep.h> #define ELF64_R_TYPE_ID(info) ((info) & 0xff) diff --git a/sysdeps/unix/sysv/linux/dl-origin.c b/sysdeps/unix/sysv/linux/dl-origin.c index a69684d99e..e425467eba 100644 --- a/sysdeps/unix/sysv/linux/dl-origin.c +++ b/sysdeps/unix/sysv/linux/dl-origin.c @@ -1,5 +1,5 @@ /* Find path of executable. - Copyright (C) 1998, 1999 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -22,7 +22,7 @@ #include <string.h> #include <unistd.h> #include <sys/param.h> -#include <elf/ldsodefs.h> +#include <ldsodefs.h> #include <dl-dst.h> diff --git a/sysdeps/unix/sysv/linux/i386/dl-librecon.h b/sysdeps/unix/sysv/linux/i386/dl-librecon.h index 84b4396285..3af2ce35a2 100644 --- a/sysdeps/unix/sysv/linux/i386/dl-librecon.h +++ b/sysdeps/unix/sysv/linux/i386/dl-librecon.h @@ -33,7 +33,7 @@ const ElfW(Dyn) *d; \ const char *strtab; \ \ - strtab = (const char *) _dl_loaded->l_info[DT_STRTAB]->d_un.d_ptr; \ + strtab = (const char *) D_PTR (_dl_loaded, l_info[DT_STRTAB]); \ \ for (d = _dl_loaded->l_ld; d->d_tag != DT_NULL; ++d) \ if (d->d_tag == DT_NEEDED \ |