glibc/include/ctype.h
Joseph Myers 54412d2061 Use libc_hidden_* for tolower, toupper (bug 15105).
Continuing the fixes for localplt test failures with -Os arising from
functions not being inlined in that case, this patch fixes such
failures for tolower and toupper by using libc_hidden_proto and
libc_hidden_def.

Tested for x86_64 (both that it removes this particular localplt
failure for -Os, and that the testsuite continues to pass without
-Os).

2018-02-22  Joseph Myers  <joseph@codesourcery.com>

	[BZ #15105]
	* ctype/ctype.c (tolower): Use libc_hidden_def.
	(toupper): Likewise.
	* include/ctype.h [!_ISOMAC] (tolower): Use libc_hidden_proto.
	[!_ISOMAC] (toupper): Likewise.
2018-02-23 13:54:53 +00:00

71 lines
2.1 KiB
C

#ifndef _CTYPE_H
#include <ctype/ctype.h>
#ifndef _ISOMAC
/* Initialize ctype locale data. */
extern void __ctype_init (void);
libc_hidden_proto (__ctype_init)
/* ctype/ctype.h defined this as a macro and we don't want to #undef it.
So defeat macro expansion with parens for this declaration. */
extern int (__isctype) (int __c, int __mask);
libc_hidden_proto (tolower)
libc_hidden_proto (toupper)
# if IS_IN (libc)
/* These accessors are used by the optimized macros to find the
thread-local cache of ctype information from the current thread's
locale. For inside libc, define them as inlines using the _NL_CURRENT
accessors. We don't use _NL_CURRENT_LOCALE->__ctype_b here because we
want to cause a link-time ref to _nl_current_LC_CTYPE under
NL_CURRENT_INDIRECT. */
# include "../locale/localeinfo.h"
# include <libc-tsd.h>
# ifndef CTYPE_EXTERN_INLINE /* Used by ctype/ctype-info.c, which see. */
# define CTYPE_EXTERN_INLINE extern inline
# endif
__libc_tsd_define (extern, const uint16_t *, CTYPE_B)
__libc_tsd_define (extern, const int32_t *, CTYPE_TOUPPER)
__libc_tsd_define (extern, const int32_t *, CTYPE_TOLOWER)
CTYPE_EXTERN_INLINE const uint16_t ** __attribute__ ((const))
__ctype_b_loc (void)
{
return __libc_tsd_address (const uint16_t *, CTYPE_B);
}
CTYPE_EXTERN_INLINE const int32_t ** __attribute__ ((const))
__ctype_toupper_loc (void)
{
return __libc_tsd_address (const int32_t *, CTYPE_TOUPPER);
}
CTYPE_EXTERN_INLINE const int32_t ** __attribute__ ((const))
__ctype_tolower_loc (void)
{
return __libc_tsd_address (const int32_t *, CTYPE_TOLOWER);
}
# ifndef __NO_CTYPE
/* The spec says that isdigit must only match the decimal digits. We
can check this without a memory access. */
# undef isdigit
# define isdigit(c) ({ int __c = (c); __c >= '0' && __c <= '9'; })
# undef isdigit_l
# define isdigit_l(c, l) ({ int __c = (c); __c >= '0' && __c <= '9'; })
# undef __isdigit_l
# define __isdigit_l(c, l) ({ int __c = (c); __c >= '0' && __c <= '9'; })
# endif /* Not __NO_CTYPE. */
# endif /* IS_IN (libc). */
#endif /* Not _ISOMAC. */
#endif /* ctype.h */