From 86e4919f574f0b33db8a7de187c1291710d94f0f Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Thu, 31 Aug 2017 16:12:03 +0200 Subject: [PATCH] dlfcn: Remove internal_function attribute --- ChangeLog | 6 ++++++ dlfcn/dlerror.c | 1 - elf/dl-sym.c | 2 -- include/dlfcn.h | 9 +++------ 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index d5bc75dbd8..b2c4378a54 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2017-08-31 Florian Weimer + + * dlfcn/dlerror.c (_dlerror_run): Remove internal_function. + * elf/dl-sym.c (_dl_vsym, _dl_sym): Likewise. + * include/dlfcn.h (_dl_sym, _dl_vsym, _dlerror_run): Likewise. + 2017-08-31 Florian Weimer * resolv/gai_misc.c (__gai_find_request, __gai_remove_request) diff --git a/dlfcn/dlerror.c b/dlfcn/dlerror.c index c0ead7dcb6..fb5012ee85 100644 --- a/dlfcn/dlerror.c +++ b/dlfcn/dlerror.c @@ -120,7 +120,6 @@ strong_alias (__dlerror, dlerror) # endif int -internal_function _dlerror_run (void (*operate) (void *), void *args) { struct dl_action_result *result; diff --git a/elf/dl-sym.c b/elf/dl-sym.c index fb54a91858..97cfcca712 100644 --- a/elf/dl-sym.c +++ b/elf/dl-sym.c @@ -235,7 +235,6 @@ RTLD_NEXT used in code not dynamically loaded")); void * -internal_function _dl_vsym (void *handle, const char *name, const char *version, void *who) { struct r_found_version vers; @@ -252,7 +251,6 @@ _dl_vsym (void *handle, const char *name, const char *version, void *who) void * -internal_function _dl_sym (void *handle, const char *name, void *who) { return do_sym (handle, name, who, NULL, DL_LOOKUP_RETURN_NEWEST); diff --git a/include/dlfcn.h b/include/dlfcn.h index 51cc1dfde8..888e84d4b8 100644 --- a/include/dlfcn.h +++ b/include/dlfcn.h @@ -59,23 +59,20 @@ extern void _dl_close_worker (struct link_map *map, bool force) /* Look up NAME in shared object HANDLE (which may be RTLD_DEFAULT or RTLD_NEXT). WHO is the calling function, for RTLD_NEXT. Returns the symbol value, which may be NULL. */ -extern void *_dl_sym (void *handle, const char *name, void *who) - internal_function; +extern void *_dl_sym (void *handle, const char *name, void *who); /* Look up version VERSION of symbol NAME in shared object HANDLE (which may be RTLD_DEFAULT or RTLD_NEXT). WHO is the calling function, for RTLD_NEXT. Returns the symbol value, which may be NULL. */ extern void *_dl_vsym (void *handle, const char *name, const char *version, - void *who) - internal_function; + void *who); /* Helper function for functions. Runs the OPERATE function via _dl_catch_error. Returns zero for success, nonzero for failure; and arranges for `dlerror' to return the error details. ARGS is passed as argument to OPERATE. */ -extern int _dlerror_run (void (*operate) (void *), void *args) - internal_function; +extern int _dlerror_run (void (*operate) (void *), void *args); #ifdef SHARED # define DL_CALLER_DECL /* Nothing */