diff options
Diffstat (limited to 'elf/dl-load.c')
| -rw-r--r-- | elf/dl-load.c | 45 |
1 files changed, 21 insertions, 24 deletions
diff --git a/elf/dl-load.c b/elf/dl-load.c index f7449bce9c..1ff12836ec 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -220,7 +220,6 @@ _dl_dst_count (const char *name, int is_path) return cnt; } -INTDEF (_dl_dst_count) char * @@ -283,7 +282,6 @@ _dl_dst_substitute (struct link_map *l, const char *name, char *result, return result; } -INTDEF (_dl_dst_substitute) /* Return copy of argument with all recognized dynamic string tokens @@ -317,7 +315,7 @@ expand_dynamic_string_token (struct link_map *l, const char *s) if (result == NULL) return NULL; - return INTUSE(_dl_dst_substitute) (l, s, result, 1); + return _dl_dst_substitute (l, s, result, 1); } @@ -343,8 +341,7 @@ add_name_to_object (struct link_map *l, const char *name) if (newname == NULL) { /* No more memory. */ - INTUSE(_dl_signal_error) (ENOMEM, name, NULL, - N_("cannot allocate name record")); + _dl_signal_error (ENOMEM, name, NULL, N_("cannot allocate name record")); return; } /* The object should have a libname set from _dl_new_object. */ @@ -445,8 +442,8 @@ fillin_rpath (char *rpath, struct r_search_path_elem **result, const char *sep, malloc (sizeof (*dirp) + ncapstr * sizeof (enum r_dir_status) + where_len + len + 1); if (dirp == NULL) - INTUSE(_dl_signal_error) (ENOMEM, NULL, NULL, - N_("cannot create cache for search path")); + _dl_signal_error (ENOMEM, NULL, NULL, + N_("cannot create cache for search path")); dirp->dirname = ((char *) dirp + sizeof (*dirp) + ncapstr * sizeof (enum r_dir_status)); @@ -527,7 +524,7 @@ decompose_rpath (struct r_search_path_struct *sps, signal_error_cache: errstring = N_("cannot create cache for search path"); signal_error: - INTUSE(_dl_signal_error) (ENOMEM, NULL, NULL, errstring); + _dl_signal_error (ENOMEM, NULL, NULL, errstring); } sps->dirs = result; @@ -633,7 +630,7 @@ _dl_init_paths (const char *llp) { errstring = N_("cannot create search path array"); signal_error: - INTUSE(_dl_signal_error) (ENOMEM, NULL, NULL, errstring); + _dl_signal_error (ENOMEM, NULL, NULL, errstring); } round_size = ((2 * sizeof (struct r_search_path_elem) - 1 @@ -786,7 +783,7 @@ lose (int code, int fd, const char *name, char *realname, struct link_map *l, free (l); } free (realname); - INTUSE(_dl_signal_error) (code, name, NULL, msg); + _dl_signal_error (code, name, NULL, msg); } @@ -845,7 +842,7 @@ _dl_map_object_from_fd (const char *name, int fd, struct filebuf *fbp, /* Print debugging message. */ if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0)) - INTUSE(_dl_debug_printf) ("file=%s; generating link map\n", name); + _dl_debug_printf ("file=%s; generating link map\n", name); /* This is the ELF header. We read it in `open_verify'. */ header = (void *) fbp->buf; @@ -858,8 +855,8 @@ _dl_map_object_from_fd (const char *name, int fd, struct filebuf *fbp, if (_dl_zerofd == -1) { __close (fd); - INTUSE(_dl_signal_error) (errno, NULL, NULL, - N_("cannot open zero fill device")); + _dl_signal_error (errno, NULL, NULL, + N_("cannot open zero fill device")); } } #endif @@ -1260,7 +1257,7 @@ cannot allocate TLS data structures for initial thread"); l->l_entry += l->l_addr; if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0)) - INTUSE(_dl_debug_printf) ("\ + _dl_debug_printf ("\ dynamic: 0x%0*lx base: 0x%0*lx size: 0x%0*Zx\n\ entry: 0x%0*lx phdr: 0x%0*lx phnum: %*u\n\n", (int) sizeof (void *) * 2, @@ -1367,7 +1364,7 @@ print_search_path (struct r_search_path_elem **list, char buf[max_dirnamelen + max_capstrlen]; int first = 1; - INTUSE(_dl_debug_printf) (" search path="); + _dl_debug_printf (" search path="); while (*list != NULL && (*list)->what == what) /* Yes, ==. */ { @@ -1638,7 +1635,7 @@ open_path (const char *name, size_t namelen, int preloaded, /* Print name we try if this is wanted. */ if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_LIBS, 0)) - INTUSE(_dl_debug_printf) (" trying file=%s\n", buf); + _dl_debug_printf (" trying file=%s\n", buf); fd = open_verify (buf, fbp); if (this_dir->status[cnt] == unknown) @@ -1772,7 +1769,7 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded, /* Display information if we are debugging. */ if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0) && loader != NULL) - INTUSE(_dl_debug_printf) ("\nfile=%s; needed by %s\n", name, + _dl_debug_printf ("\nfile=%s; needed by %s\n", name, loader->l_name[0] ? loader->l_name : rtld_progname); @@ -1783,7 +1780,7 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded, size_t namelen = strlen (name) + 1; if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_LIBS, 0)) - INTUSE(_dl_debug_printf) ("find library=%s; searching\n", name); + _dl_debug_printf ("find library=%s; searching\n", name); fd = -1; @@ -1888,7 +1885,7 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded, /* Add another newline when we are tracing the library loading. */ if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_LIBS, 0)) - INTUSE(_dl_debug_printf) ("\n"); + _dl_debug_printf ("\n"); } else { @@ -1920,8 +1917,8 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded, /* Enter the new object in the list of loaded objects. */ if ((name_copy = local_strdup (name)) == NULL || (l = _dl_new_object (name_copy, name, type, loader)) == NULL) - INTUSE(_dl_signal_error) (ENOMEM, name, NULL, N_("\ -cannot create shared object descriptor")); + _dl_signal_error (ENOMEM, name, NULL, + N_("cannot create shared object descriptor")); /* Signal that this is a faked entry. */ l->l_faked = 1; /* Since the descriptor is initialized with zero we do not @@ -1934,15 +1931,15 @@ cannot create shared object descriptor")); return l; } else - INTUSE(_dl_signal_error) (errno, name, NULL, - N_("cannot open shared object file")); + _dl_signal_error (errno, name, NULL, + N_("cannot open shared object file")); } void *stack_end = __libc_stack_end; return _dl_map_object_from_fd (name, fd, &fb, realname, loader, type, mode, &stack_end); } -INTDEF (_dl_map_object) + void internal_function |