mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-21 01:12:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Mark internal functions with attribute_hidden [BZ #18822]

Browse Source 
Mark internal functions with attribute_hidden to allow direct access to
internal functions within libc.so and libc.a without using GOT nor PLT.

Size comparison of libc.so:

On x86-64:
        text	   data	    bss	    dec	    hex
Before: 1728577	  20584	  17088	1766249	 1af369
After : 1728593	  20584	  17088	1766265	 1af379

The only change is __gconv_release_shlib in iconv/gconv_dl.c is inlined
since it is hidden, which increases the code size of gconv_dl.os by 18
bytes.

On i686:
        text	   data	    bss	    dec	    hex
Before: 1869039	  11444	  11112	1891595	 1cdd0b
After : 1868635	  11444	  11112	1891191	 1cdb77

The code size is decreased by avoiding GOT/PLT for hidden functions.

	[BZ #18822]
	* iconv/gconv_int.h (__gconv_open): Add attribute_hidden.
	(__gconv_close): Likewise.
	(__gconv): Likewise.
	(__gconv_find_transform): Likewise.
	(__gconv_lookup_cache): Likewise.
	(__gconv_compare_alias_cache): Likewise.
	(__gconv_load_cache): Likewise.
	(__gconv_get_path): Likewise.
	(__gconv_close_transform): Likewise.
	(__gconv_release_cache): Likewise.
	(__gconv_find_shlib): Likewise.
	(__gconv_release_shlib): Likewise.
	(__gconv_get_builtin_trans): Likewise.
	(__gconv_compare_alias): Likewise.
	* include/dlfcn.h (_dlerror_run): Likewise.
	* include/stdio.h (__fortify_fail_abort): Likewise.
	* include/time.h (__tz_compute): Likewise.
	(__strptime_internal): Likewise.
	* intl/gettextP.h (_nl_find_domain): Likewise.
	(_nl_load_domain): Likewise.
	(_nl_find_msg): Likewise.
	* intl/plural-exp.h (FREE_EXPRESSION): Likewise.
	(EXTRACT_PLURAL_EXPRESSION): Likewise.
	* locale/coll-lookup.h (__collidx_table_lookup): Likewise.
	* resolv/gai_misc.h (__gai_enqueue_request): Likewise.
	(__gai_find_request): Likewise.
	(__gai_remove_request): Likewise.
	(__gai_notify): Likewise.
	(__gai_notify_only): Likewise.
	* sysdeps/generic/aio_misc.h (__aio_sigqueue): Likewise.
	* sysdeps/generic/ldsodefs.h (_dl_fini): Likewise.
	(_dl_non_dynamic_init): Likewise.
	(_dl_aux_init): Likewise.
	* sysdeps/i386/machine-gmon.h (mcount_internal): Likewise.
	* sysdeps/unix/sysv/linux/i386/olddirent.h (__old_getdents64):
	Likewise.
	* wcsmbs/wcsmbsload.h (__wcsmbs_load_conv): Likewise.
	(__wcsmbs_clone_conv): Likewise.
	(__wcsmbs_named_conv): Likewise.
This commit is contained in:
H.J. Lu 2017-10-01 15:07:06 -07:00
parent 8ed3b64330
commit 8bcdb7e0c5
14 changed files with 117 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
ChangeLog
View File

@ -1,3 +1,46 @@
2017-10-01 H.J. Lu <hongjiu.lu@intel.com>
[BZ #18822]
* iconv/gconv_int.h (__gconv_open): Add attribute_hidden.
(__gconv_close): Likewise.
(__gconv): Likewise.
(__gconv_find_transform): Likewise.
(__gconv_lookup_cache): Likewise.
(__gconv_compare_alias_cache): Likewise.
(__gconv_load_cache): Likewise.
(__gconv_get_path): Likewise.
(__gconv_close_transform): Likewise.
(__gconv_release_cache): Likewise.
(__gconv_find_shlib): Likewise.
(__gconv_release_shlib): Likewise.
(__gconv_get_builtin_trans): Likewise.
(__gconv_compare_alias): Likewise.
* include/dlfcn.h (_dlerror_run): Likewise.
* include/stdio.h (__fortify_fail_abort): Likewise.
* include/time.h (__tz_compute): Likewise.
(__strptime_internal): Likewise.
* intl/gettextP.h (_nl_find_domain): Likewise.
(_nl_load_domain): Likewise.
(_nl_find_msg): Likewise.
* intl/plural-exp.h (FREE_EXPRESSION): Likewise.
(EXTRACT_PLURAL_EXPRESSION): Likewise.
* locale/coll-lookup.h (__collidx_table_lookup): Likewise.
* resolv/gai_misc.h (__gai_enqueue_request): Likewise.
(__gai_find_request): Likewise.
(__gai_remove_request): Likewise.
(__gai_notify): Likewise.
(__gai_notify_only): Likewise.
* sysdeps/generic/aio_misc.h (__aio_sigqueue): Likewise.
* sysdeps/generic/ldsodefs.h (_dl_fini): Likewise.
(_dl_non_dynamic_init): Likewise.
(_dl_aux_init): Likewise.
* sysdeps/i386/machine-gmon.h (mcount_internal): Likewise.
* sysdeps/unix/sysv/linux/i386/olddirent.h (__old_getdents64):
Likewise.
* wcsmbs/wcsmbsload.h (__wcsmbs_load_conv): Likewise.
(__wcsmbs_clone_conv): Likewise.
(__wcsmbs_named_conv): Likewise.
2017-10-01 H.J. Lu <hongjiu.lu@intel.com> 2017-10-01 H.J. Lu <hongjiu.lu@intel.com>
[BZ #18822] [BZ #18822]

43
iconv/gconv_int.h
View File

@ -156,10 +156,12 @@ __libc_lock_define (extern, __gconv_lock attribute_hidden)
/* Return in *HANDLE decriptor for transformation from FROMSET to TOSET. */ /* Return in *HANDLE decriptor for transformation from FROMSET to TOSET. */
extern int __gconv_open (const char *toset, const char *fromset, extern int __gconv_open (const char *toset, const char *fromset,
__gconv_t *handle, int flags); __gconv_t *handle, int flags)
attribute_hidden;
/* Free resources associated with transformation descriptor CD. */ /* Free resources associated with transformation descriptor CD. */
extern int __gconv_close (__gconv_t cd); extern int __gconv_close (__gconv_t cd)
attribute_hidden;
/* Transform at most *INBYTESLEFT bytes from buffer starting at *INBUF /* Transform at most *INBYTESLEFT bytes from buffer starting at *INBUF
according to rules described by CD and place up to *OUTBYTESLEFT according to rules described by CD and place up to *OUTBYTESLEFT
@ -167,33 +169,38 @@ extern int __gconv_close (__gconv_t cd);
conversions in *IRREVERSIBLE if this pointer is not null. */ conversions in *IRREVERSIBLE if this pointer is not null. */
extern int __gconv (__gconv_t cd, const unsigned char **inbuf, extern int __gconv (__gconv_t cd, const unsigned char **inbuf,
const unsigned char *inbufend, unsigned char **outbuf, const unsigned char *inbufend, unsigned char **outbuf,
unsigned char *outbufend, size_t *irreversible); unsigned char *outbufend, size_t *irreversible)
attribute_hidden;
/* Return in *HANDLE a pointer to an array with *NSTEPS elements describing /* Return in *HANDLE a pointer to an array with *NSTEPS elements describing
the single steps necessary for transformation from FROMSET to TOSET. */ the single steps necessary for transformation from FROMSET to TOSET. */
extern int __gconv_find_transform (const char *toset, const char *fromset, extern int __gconv_find_transform (const char *toset, const char *fromset,
struct __gconv_step **handle, struct __gconv_step **handle,
size_t *nsteps, int flags); size_t *nsteps, int flags)
attribute_hidden;
/* Search for transformation in cache data. */ /* Search for transformation in cache data. */
extern int __gconv_lookup_cache (const char *toset, const char *fromset, extern int __gconv_lookup_cache (const char *toset, const char *fromset,
struct __gconv_step **handle, size_t *nsteps, struct __gconv_step **handle, size_t *nsteps,
int flags); int flags)
attribute_hidden;
/* Compare the two name for whether they are after alias expansion the /* Compare the two name for whether they are after alias expansion the
same. This function uses the cache and fails if none is same. This function uses the cache and fails if none is
loaded. */ loaded. */
extern int __gconv_compare_alias_cache (const char *name1, const char *name2, extern int __gconv_compare_alias_cache (const char *name1, const char *name2,
int *result); int *result)
attribute_hidden;
/* Free data associated with a step's structure. */ /* Free data associated with a step's structure. */
extern void __gconv_release_step (struct __gconv_step *step); extern void __gconv_release_step (struct __gconv_step *step)
attribute_hidden;
/* Read all the configuration data and cache it. */ /* Read all the configuration data and cache it. */
extern void __gconv_read_conf (void) attribute_hidden; extern void __gconv_read_conf (void) attribute_hidden;
/* Try to read module cache file. */ /* Try to read module cache file. */
extern int __gconv_load_cache (void); extern int __gconv_load_cache (void) attribute_hidden;
/* Retrieve pointer to internal cache. */ /* Retrieve pointer to internal cache. */
extern void *__gconv_get_cache (void); extern void *__gconv_get_cache (void);
@ -205,7 +212,7 @@ extern struct gconv_module *__gconv_get_modules_db (void);
extern void *__gconv_get_alias_db (void); extern void *__gconv_get_alias_db (void);
/* Determine the directories we are looking in. */ /* Determine the directories we are looking in. */
extern void __gconv_get_path (void); extern void __gconv_get_path (void) attribute_hidden;
/* Comparison function to search alias. */ /* Comparison function to search alias. */
extern int __gconv_alias_compare (const void *p1, const void *p2) extern int __gconv_alias_compare (const void *p1, const void *p2)
@ -214,28 +221,34 @@ extern int __gconv_alias_compare (const void *p1, const void *p2)
/* Clear reference to transformation step implementations which might /* Clear reference to transformation step implementations which might
cause the code to be unloaded. */ cause the code to be unloaded. */
extern int __gconv_close_transform (struct __gconv_step *steps, extern int __gconv_close_transform (struct __gconv_step *steps,
size_t nsteps); size_t nsteps)
attribute_hidden;
/* Free all resources allocated for the transformation record when /* Free all resources allocated for the transformation record when
using the cache. */ using the cache. */
extern void __gconv_release_cache (struct __gconv_step *steps, size_t nsteps); extern void __gconv_release_cache (struct __gconv_step *steps, size_t nsteps)
attribute_hidden;
/* Load shared object named by NAME. If already loaded increment reference /* Load shared object named by NAME. If already loaded increment reference
count. */ count. */
extern struct __gconv_loaded_object *__gconv_find_shlib (const char *name); extern struct __gconv_loaded_object *__gconv_find_shlib (const char *name)
attribute_hidden;
/* Release shared object. If no further reference is available unload /* Release shared object. If no further reference is available unload
the object. */ the object. */
extern void __gconv_release_shlib (struct __gconv_loaded_object *handle); extern void __gconv_release_shlib (struct __gconv_loaded_object *handle)
attribute_hidden;
/* Fill STEP with information about builtin module with NAME. */ /* Fill STEP with information about builtin module with NAME. */
extern void __gconv_get_builtin_trans (const char *name, extern void __gconv_get_builtin_trans (const char *name,
struct __gconv_step *step); struct __gconv_step *step)
attribute_hidden;
libc_hidden_proto (__gconv_transliterate) libc_hidden_proto (__gconv_transliterate)
/* If NAME is an codeset alias expand it. */ /* If NAME is an codeset alias expand it. */
extern int __gconv_compare_alias (const char *name1, const char *name2); extern int __gconv_compare_alias (const char *name1, const char *name2)
attribute_hidden;
/* Builtin transformations. */ /* Builtin transformations. */

3
include/dlfcn.h
View File

@ -72,7 +72,8 @@ extern void *_dl_vsym (void *handle, const char *name, const char *version,
_dl_catch_error. Returns zero for success, nonzero for failure; and _dl_catch_error. Returns zero for success, nonzero for failure; and
arranges for `dlerror' to return the error details. arranges for `dlerror' to return the error details.
ARGS is passed as argument to OPERATE. */ ARGS is passed as argument to OPERATE. */
extern int _dlerror_run (void (*operate) (void *), void *args); extern int _dlerror_run (void (*operate) (void *), void *args)
attribute_hidden;
#ifdef SHARED #ifdef SHARED
# define DL_CALLER_DECL /* Nothing */ # define DL_CALLER_DECL /* Nothing */

2
include/stdio.h
View File

@ -100,7 +100,7 @@ extern void __libc_message (enum __libc_message_action action,
const char *__fnt, ...); const char *__fnt, ...);
extern void __fortify_fail (const char *msg) __attribute__ ((__noreturn__)); extern void __fortify_fail (const char *msg) __attribute__ ((__noreturn__));
extern void __fortify_fail_abort (_Bool, const char *msg) extern void __fortify_fail_abort (_Bool, const char *msg)
__attribute__ ((__noreturn__)); __attribute__ ((__noreturn__)) attribute_hidden;
libc_hidden_proto (__fortify_fail) libc_hidden_proto (__fortify_fail)
libc_hidden_proto (__fortify_fail_abort) libc_hidden_proto (__fortify_fail_abort)

4
include/time.h
View File

@ -46,7 +46,7 @@ extern void __tzfile_default (const char *std, const char *dst,
long int stdoff, long int dstoff); long int stdoff, long int dstoff);
extern void __tzset_parse_tz (const char *tz); extern void __tzset_parse_tz (const char *tz);
extern void __tz_compute (time_t timer, struct tm *tm, int use_localtime) extern void __tz_compute (time_t timer, struct tm *tm, int use_localtime)
__THROW; __THROW attribute_hidden;
/* Subroutine of `mktime'. Return the `time_t' representation of TP and /* Subroutine of `mktime'. Return the `time_t' representation of TP and
normalize TP, given that a `struct tm *' maps to a `time_t' as performed normalize TP, given that a `struct tm *' maps to a `time_t' as performed
@ -89,7 +89,7 @@ extern int __getclktck (void);
/* strptime support. */ /* strptime support. */
extern char * __strptime_internal (const char *rp, const char *fmt, extern char * __strptime_internal (const char *rp, const char *fmt,
struct tm *tm, void *statep, struct tm *tm, void *statep,
locale_t locparam); locale_t locparam) attribute_hidden;
extern double __difftime (time_t time1, time_t time0); extern double __difftime (time_t time1, time_t time0);

12
intl/gettextP.h
View File

@ -251,19 +251,23 @@ extern const char *_nl_locale_name_default (void);
struct loaded_l10nfile *_nl_find_domain (const char *__dirname, char *__locale, struct loaded_l10nfile *_nl_find_domain (const char *__dirname, char *__locale,
const char *__domainname, const char *__domainname,
struct binding *__domainbinding); struct binding *__domainbinding)
attribute_hidden;
void _nl_load_domain (struct loaded_l10nfile *__domain, void _nl_load_domain (struct loaded_l10nfile *__domain,
struct binding *__domainbinding); struct binding *__domainbinding)
attribute_hidden;
#ifdef IN_LIBGLOCALE #ifdef IN_LIBGLOCALE
char *_nl_find_msg (struct loaded_l10nfile *domain_file, char *_nl_find_msg (struct loaded_l10nfile *domain_file,
struct binding *domainbinding, const char *encoding, struct binding *domainbinding, const char *encoding,
const char *msgid, const char *msgid,
size_t *lengthp); size_t *lengthp)
attribute_hidden;
#else #else
char *_nl_find_msg (struct loaded_l10nfile *domain_file, char *_nl_find_msg (struct loaded_l10nfile *domain_file,
struct binding *domainbinding, const char *msgid, struct binding *domainbinding, const char *msgid,
int convert, size_t *lengthp); int convert, size_t *lengthp)
attribute_hidden;
#endif #endif
/* The internal variables in the standalone libintl.a must have different /* The internal variables in the standalone libintl.a must have different

5
intl/plural-exp.h
View File

@ -101,12 +101,13 @@ struct parse_args
# define EXTRACT_PLURAL_EXPRESSION extract_plural_expression # define EXTRACT_PLURAL_EXPRESSION extract_plural_expression
#endif #endif
extern void FREE_EXPRESSION (struct expression *exp); extern void FREE_EXPRESSION (struct expression *exp) attribute_hidden;
extern int PLURAL_PARSE (struct parse_args *arg); extern int PLURAL_PARSE (struct parse_args *arg);
extern const struct expression GERMANIC_PLURAL attribute_hidden; extern const struct expression GERMANIC_PLURAL attribute_hidden;
extern void EXTRACT_PLURAL_EXPRESSION (const char *nullentry, extern void EXTRACT_PLURAL_EXPRESSION (const char *nullentry,
const struct expression **pluralp, const struct expression **pluralp,
unsigned long int *npluralsp); unsigned long int *npluralsp)
attribute_hidden;
#if !defined (_LIBC) && !defined (IN_LIBINTL) && !defined (IN_LIBGLOCALE) #if !defined (_LIBC) && !defined (IN_LIBINTL) && !defined (IN_LIBGLOCALE)
extern unsigned long int plural_eval (const struct expression *pexp, extern unsigned long int plural_eval (const struct expression *pexp,

6
locale/coll-lookup.h
View File

@ -19,7 +19,9 @@
#include <stdint.h> #include <stdint.h>
/* Lookup in a table of int32_t, with default value 0. */ /* Lookup in a table of int32_t, with default value 0. */
extern int32_t __collidx_table_lookup (const char *table, uint32_t wc); extern int32_t __collidx_table_lookup (const char *table, uint32_t wc)
attribute_hidden;
/* Lookup in a table of uint32_t, with default value 0xffffffff. */ /* Lookup in a table of uint32_t, with default value 0xffffffff. */
extern uint32_t __collseq_table_lookup (const char *table, uint32_t wc); extern uint32_t __collseq_table_lookup (const char *table, uint32_t wc)
attribute_hidden;

15
resolv/gai_misc.h
View File

@ -75,19 +75,24 @@ extern pthread_mutex_t __gai_requests_mutex;
/* Enqueue request. */ /* Enqueue request. */
extern struct requestlist *__gai_enqueue_request (struct gaicb *gaicbp); extern struct requestlist *__gai_enqueue_request (struct gaicb *gaicbp)
attribute_hidden;
/* Find request on wait list. */ /* Find request on wait list. */
extern struct requestlist *__gai_find_request (const struct gaicb *gaicbp); extern struct requestlist *__gai_find_request (const struct gaicb *gaicbp)
attribute_hidden;
/* Remove request from waitlist. */ /* Remove request from waitlist. */
extern int __gai_remove_request (struct gaicb *gaicbp); extern int __gai_remove_request (struct gaicb *gaicbp)
attribute_hidden;
/* Notify initiator of request and tell this everybody listening. */ /* Notify initiator of request and tell this everybody listening. */
extern void __gai_notify (struct requestlist *req); extern void __gai_notify (struct requestlist *req)
attribute_hidden;
/* Notify initiator of request. */ /* Notify initiator of request. */
extern int __gai_notify_only (struct sigevent *sigev, pid_t caller_pid); extern int __gai_notify_only (struct sigevent *sigev, pid_t caller_pid)
attribute_hidden;
/* Send the signal. */ /* Send the signal. */
extern int __gai_sigqueue (int sig, const union sigval val, pid_t caller_pid); extern int __gai_sigqueue (int sig, const union sigval val, pid_t caller_pid);

3
sysdeps/generic/aio_misc.h
View File

@ -40,7 +40,8 @@ typedef union
/* Send the signal. */ /* Send the signal. */
extern int __aio_sigqueue (int sig, const union sigval val, pid_t caller_pid); extern int __aio_sigqueue (int sig, const union sigval val, pid_t caller_pid)
attribute_hidden;
#endif /* aio_misc.h */ #endif /* aio_misc.h */

8
sysdeps/generic/ldsodefs.h
View File

@ -954,7 +954,7 @@ extern void _dl_init (struct link_map *main_map, int argc, char **argv,
/* Call the finalizer functions of all shared objects whose /* Call the finalizer functions of all shared objects whose
initializer functions have completed. */ initializer functions have completed. */
extern void _dl_fini (void); extern void _dl_fini (void) attribute_hidden;
/* Sort array MAPS according to dependencies of the contained objects. */ /* Sort array MAPS according to dependencies of the contained objects. */
extern void _dl_sort_fini (struct link_map **maps, size_t nmaps, char *used, extern void _dl_sort_fini (struct link_map **maps, size_t nmaps, char *used,
@ -1123,10 +1123,12 @@ extern struct link_map *_dl_find_dso_for_object (const ElfW(Addr) addr);
rtld_hidden_proto (_dl_find_dso_for_object) rtld_hidden_proto (_dl_find_dso_for_object)
/* Initialization which is normally done by the dynamic linker. */ /* Initialization which is normally done by the dynamic linker. */
extern void _dl_non_dynamic_init (void); extern void _dl_non_dynamic_init (void)
attribute_hidden;
/* Used by static binaries to check the auxiliary vector. */ /* Used by static binaries to check the auxiliary vector. */
extern void _dl_aux_init (ElfW(auxv_t) *av); extern void _dl_aux_init (ElfW(auxv_t) *av)
attribute_hidden;
__END_DECLS __END_DECLS

2
sysdeps/i386/machine-gmon.h
View File

@ -30,7 +30,7 @@
#define mcount_internal __mcount_internal #define mcount_internal __mcount_internal
extern void mcount_internal (u_long frompc, u_long selfpc) extern void mcount_internal (u_long frompc, u_long selfpc)
__attribute__ ((regparm (2))); __attribute__ ((regparm (2))) attribute_hidden;
#define _MCOUNT_DECL(frompc, selfpc) \ #define _MCOUNT_DECL(frompc, selfpc) \
__attribute__ ((regparm (2))) \ __attribute__ ((regparm (2))) \

3
sysdeps/unix/sysv/linux/olddirent.h
View File

@ -34,7 +34,8 @@ extern struct __old_dirent64 *__old_readdir64 (DIR *__dirp);
libc_hidden_proto (__old_readdir64); libc_hidden_proto (__old_readdir64);
extern int __old_readdir64_r (DIR *__dirp, struct __old_dirent64 *__entry, extern int __old_readdir64_r (DIR *__dirp, struct __old_dirent64 *__entry,
struct __old_dirent64 **__result); struct __old_dirent64 **__result);
extern __ssize_t __old_getdents64 (int __fd, char *__buf, size_t __nbytes); extern __ssize_t __old_getdents64 (int __fd, char *__buf, size_t __nbytes)
attribute_hidden;
int __old_scandir64 (const char * __dir, int __old_scandir64 (const char * __dir,
struct __old_dirent64 *** __namelist, struct __old_dirent64 *** __namelist,
int (*__selector) (const struct __old_dirent64 *), int (*__selector) (const struct __old_dirent64 *),

9
wcsmbs/wcsmbsload.h
View File

@ -37,13 +37,16 @@ struct gconv_fcts
extern const struct gconv_fcts __wcsmbs_gconv_fcts_c attribute_hidden; extern const struct gconv_fcts __wcsmbs_gconv_fcts_c attribute_hidden;
/* Load conversion functions for the currently selected locale. */ /* Load conversion functions for the currently selected locale. */
extern void __wcsmbs_load_conv (struct __locale_data *new_category); extern void __wcsmbs_load_conv (struct __locale_data *new_category)
attribute_hidden;
/* Clone the current `__wcsmbs_load_conv' value. */ /* Clone the current `__wcsmbs_load_conv' value. */
extern void __wcsmbs_clone_conv (struct gconv_fcts *copy); extern void __wcsmbs_clone_conv (struct gconv_fcts *copy)
attribute_hidden;
/* Find the conversion functions for converting to and from NAME. */ /* Find the conversion functions for converting to and from NAME. */
extern int __wcsmbs_named_conv (struct gconv_fcts *copy, const char *name); extern int __wcsmbs_named_conv (struct gconv_fcts *copy, const char *name)
attribute_hidden;
/* Function used for the `private.cleanup' hook. */ /* Function used for the `private.cleanup' hook. */
extern void _nl_cleanup_ctype (struct __locale_data *) attribute_hidden; extern void _nl_cleanup_ctype (struct __locale_data *) attribute_hidden;