diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2004-03-05 04:24:45 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2004-03-05 04:24:45 +0000 |
| commit | dd272e5774a6a64a0380c4dab5f0424c3ca66897 (patch) | |
| tree | 062c52a5f81229a4d7faa6847a10369d7efa906c /sysdeps | |
| parent | f213ef02800eba75bcc5d4c5aaa5a19f5f6235fe (diff) | |
| download | glibc-dd272e5774a6a64a0380c4dab5f0424c3ca66897.tar glibc-dd272e5774a6a64a0380c4dab5f0424c3ca66897.tar.gz glibc-dd272e5774a6a64a0380c4dab5f0424c3ca66897.tar.bz2 glibc-dd272e5774a6a64a0380c4dab5f0424c3ca66897.zip | |
Update.
* sysdeps/generic/ldsodefs.h: Don't define _dl_name_match_p as inline.
* elf/dl-misc.c: Define _dl_name_match_p here.
* elf/dl-open.c (check_libc_caller): Don't use _dl_name_match_p.
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/generic/ldsodefs.h | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index a3d7935ee2..d7a6093b21 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -172,21 +172,8 @@ struct libname_list /* Test whether given NAME matches any of the names of the given object. */ -static __inline int -__attribute__ ((unused, always_inline)) -_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; -} +extern int _dl_name_match_p (const char *__name, struct link_map *__map) + internal_function; /* Function used as argument for `_dl_receive_error' function. The arguments are the error code, error string, and the objname the |