mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
ec999b8e5e
It was noted in <https://sourceware.org/ml/libc-alpha/2012-09/msg00305.html> that the bits/*.h naming scheme should only be used for installed headers. This patch renames bits/libc-lock.h to plain libc-lock.h and bits/libc-lockP.h to plain libc-lockP.h to follow that convention. Note that I don't know where libc-lockP.h comes from for Hurd (the Hurd libc-lock.h includes libc-lockP.h, but the only libc-lockP.h in the glibc source tree is for NPTL) - some unmerged patch? - but I updated the #include in the Hurd libc-lock.h anyway. Tested for x86_64 (testsuite, and that installed stripped shared libraries are unchanged by the patch). [BZ #14912] * bits/libc-lock.h: Move to ... * sysdeps/generic/libc-lock.h: ...here. (_BITS_LIBC_LOCK_H): Rename macro to _LIBC_LOCK_H. * sysdeps/mach/hurd/bits/libc-lock.h: Move to ... * sysdeps/mach/hurd/libc-lock.h: ...here. (_BITS_LIBC_LOCK_H): Rename macro to _LIBC_LOCK_H. [_LIBC]: Include <libc-lockP.h> instead of <bits/libc-lockP.h>. * sysdeps/mach/bits/libc-lock.h: Move to ... * sysdeps/mach/libc-lock.h: ...here. (_BITS_LIBC_LOCK_H): Rename macro to _LIBC_LOCK_H. * sysdeps/nptl/bits/libc-lock.h: Move to ... * sysdeps/nptl/libc-lock.h: ...here. (_BITS_LIBC_LOCK_H): Rename macro to _LIBC_LOCK_H. * sysdeps/nptl/bits/libc-lockP.h: Move to ... * sysdeps/nptl/libc-lockP.h: ...here. (_BITS_LIBC_LOCKP_H): Rename macro to _LIBC_LOCKP_H. * crypt/crypt_util.c: Include <libc-lock.h> instead of <bits/libc-lock.h>. * dirent/scandir-tail.c: Likewise. * dlfcn/dlerror.c: Likewise. * elf/dl-close.c: Likewise. * elf/dl-iteratephdr.c: Likewise. * elf/dl-lookup.c: Likewise. * elf/dl-open.c: Likewise. * elf/dl-support.c: Likewise. * elf/dl-writev.h: Likewise. * elf/rtld.c: Likewise. * grp/fgetgrent.c: Likewise. * gshadow/fgetsgent.c: Likewise. * gshadow/sgetsgent.c: Likewise. * iconv/gconv_conf.c: Likewise. * iconv/gconv_db.c: Likewise. * iconv/gconv_dl.c: Likewise. * iconv/gconv_int.h: Likewise. * iconv/gconv_trans.c: Likewise. * include/link.h: Likewise. * inet/getnameinfo.c: Likewise. * inet/getnetgrent.c: Likewise. * inet/getnetgrent_r.c: Likewise. * intl/bindtextdom.c: Likewise. * intl/dcigettext.c: Likewise. * intl/finddomain.c: Likewise. * intl/gettextP.h: Likewise. * intl/loadmsgcat.c: Likewise. * intl/localealias.c: Likewise. * intl/textdomain.c: Likewise. * libidn/idn-stub.c: Likewise. * libio/libioP.h: Likewise. * locale/duplocale.c: Likewise. * locale/freelocale.c: Likewise. * locale/newlocale.c: Likewise. * locale/setlocale.c: Likewise. * login/getutent_r.c: Likewise. * login/getutid_r.c: Likewise. * login/getutline_r.c: Likewise. * login/utmp-private.h: Likewise. * login/utmpname.c: Likewise. * malloc/mtrace.c: Likewise. * misc/efgcvt.c: Likewise. * misc/error.c: Likewise. * misc/fstab.c: Likewise. * misc/getpass.c: Likewise. * misc/mntent.c: Likewise. * misc/syslog.c: Likewise. * nis/nis_call.c: Likewise. * nis/nis_callback.c: Likewise. * nis/nss-default.c: Likewise. * nis/nss_compat/compat-grp.c: Likewise. * nis/nss_compat/compat-initgroups.c: Likewise. * nis/nss_compat/compat-pwd.c: Likewise. * nis/nss_compat/compat-spwd.c: Likewise. * nis/nss_nis/nis-alias.c: Likewise. * nis/nss_nis/nis-ethers.c: Likewise. * nis/nss_nis/nis-grp.c: Likewise. * nis/nss_nis/nis-hosts.c: Likewise. * nis/nss_nis/nis-network.c: Likewise. * nis/nss_nis/nis-proto.c: Likewise. * nis/nss_nis/nis-pwd.c: Likewise. * nis/nss_nis/nis-rpc.c: Likewise. * nis/nss_nis/nis-service.c: Likewise. * nis/nss_nis/nis-spwd.c: Likewise. * nis/nss_nisplus/nisplus-alias.c: Likewise. * nis/nss_nisplus/nisplus-ethers.c: Likewise. * nis/nss_nisplus/nisplus-grp.c: Likewise. * nis/nss_nisplus/nisplus-hosts.c: Likewise. * nis/nss_nisplus/nisplus-initgroups.c: Likewise. * nis/nss_nisplus/nisplus-network.c: Likewise. * nis/nss_nisplus/nisplus-proto.c: Likewise. * nis/nss_nisplus/nisplus-pwd.c: Likewise. * nis/nss_nisplus/nisplus-rpc.c: Likewise. * nis/nss_nisplus/nisplus-service.c: Likewise. * nis/nss_nisplus/nisplus-spwd.c: Likewise. * nis/ypclnt.c: Likewise. * nptl/libc_pthread_init.c: Likewise. * nss/getXXbyYY.c: Likewise. * nss/getXXent.c: Likewise. * nss/getXXent_r.c: Likewise. * nss/nss_db/db-XXX.c: Likewise. * nss/nss_db/db-netgrp.c: Likewise. * nss/nss_db/nss_db.h: Likewise. * nss/nss_files/files-XXX.c: Likewise. * nss/nss_files/files-alias.c: Likewise. * nss/nsswitch.c: Likewise. * posix/regex_internal.h: Likewise. * posix/wordexp.c: Likewise. * pwd/fgetpwent.c: Likewise. * resolv/res_hconf.c: Likewise. * resolv/res_libc.c: Likewise. * shadow/fgetspent.c: Likewise. * shadow/lckpwdf.c: Likewise. * shadow/sgetspent.c: Likewise. * socket/opensock.c: Likewise. * stdio-common/reg-modifier.c: Likewise. * stdio-common/reg-printf.c: Likewise. * stdio-common/reg-type.c: Likewise. * stdio-common/vfprintf.c: Likewise. * stdio-common/vfscanf.c: Likewise. * stdlib/abort.c: Likewise. * stdlib/cxa_atexit.c: Likewise. * stdlib/fmtmsg.c: Likewise. * stdlib/random.c: Likewise. * stdlib/setenv.c: Likewise. * string/strsignal.c: Likewise. * sunrpc/auth_none.c: Likewise. * sunrpc/bindrsvprt.c: Likewise. * sunrpc/create_xid.c: Likewise. * sunrpc/key_call.c: Likewise. * sunrpc/rpc_thread.c: Likewise. * sysdeps/arm/backtrace.c: Likewise. * sysdeps/generic/ldsodefs.h: Likewise. * sysdeps/generic/stdio-lock.h: Likewise. * sysdeps/generic/unwind-dw2-fde.c: Likewise. * sysdeps/i386/backtrace.c: Likewise. * sysdeps/ieee754/ldbl-opt/nldbl-compat.c: Likewise. * sysdeps/m68k/backtrace.c: Likewise. * sysdeps/mach/hurd/cthreads.c: Likewise. * sysdeps/mach/hurd/dirstream.h: Likewise. * sysdeps/mach/hurd/malloc-machine.h: Likewise. * sysdeps/nptl/malloc-machine.h: Likewise. * sysdeps/nptl/stdio-lock.h: Likewise. * sysdeps/posix/dirstream.h: Likewise. * sysdeps/posix/getaddrinfo.c: Likewise. * sysdeps/posix/system.c: Likewise. * sysdeps/pthread/aio_suspend.c: Likewise. * sysdeps/s390/s390-32/backtrace.c: Likewise. * sysdeps/s390/s390-64/backtrace.c: Likewise. * sysdeps/unix/sysv/linux/check_pf.c: Likewise. * sysdeps/unix/sysv/linux/if_index.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/getutent_r.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/getutid_r.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/getutline_r.c: Likewise. * sysdeps/unix/sysv/linux/shm-directory.c: Likewise. * sysdeps/unix/sysv/linux/system.c: Likewise. * sysdeps/x86_64/backtrace.c: Likewise. * time/alt_digit.c: Likewise. * time/era.c: Likewise. * time/tzset.c: Likewise. * wcsmbs/wcsmbsload.c: Likewise. * nptl/tst-initializers1.c (do_test): Refer to <libc-lock.h> instead of <bits/libc-lock.h> in comment.
132 lines
3.8 KiB
C
132 lines
3.8 KiB
C
/* Compatibility functions for floating point formatting.
|
|
Copyright (C) 1995-2015 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <math.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <sys/param.h>
|
|
#include <float.h>
|
|
#include <libc-lock.h>
|
|
#include <math_ldbl_opt.h>
|
|
|
|
#ifndef FLOAT_TYPE
|
|
# define FLOAT_TYPE double
|
|
# define FUNC_PREFIX
|
|
# define FLOAT_FMT_FLAG
|
|
/* Actually we have to write (DBL_DIG + log10 (DBL_MAX_10_EXP)) but we
|
|
don't have log10 available in the preprocessor. */
|
|
# define MAXDIG (NDIGIT_MAX + 3)
|
|
# define FCVT_MAXDIG (DBL_MAX_10_EXP + MAXDIG)
|
|
# if DBL_MANT_DIG == 53
|
|
# define NDIGIT_MAX 17
|
|
# elif DBL_MANT_DIG == 24
|
|
# define NDIGIT_MAX 9
|
|
# elif DBL_MANT_DIG == 56
|
|
# define NDIGIT_MAX 18
|
|
# else
|
|
/* See IEEE 854 5.6, table 2 for this formula. Unfortunately we need a
|
|
compile time constant here, so we cannot use it. */
|
|
# error "NDIGIT_MAX must be precomputed"
|
|
# define NDIGIT_MAX (lrint (ceil (M_LN2 / M_LN10 * DBL_MANT_DIG + 1.0)))
|
|
# endif
|
|
#else
|
|
# define LONG_DOUBLE_CVT
|
|
#endif
|
|
|
|
#define APPEND(a, b) APPEND2 (a, b)
|
|
#define APPEND2(a, b) a##b
|
|
#define __APPEND(a, b) __APPEND2 (a, b)
|
|
#define __APPEND2(a, b) __##a##b
|
|
|
|
|
|
#define FCVT_BUFFER APPEND (FUNC_PREFIX, fcvt_buffer)
|
|
#define FCVT_BUFPTR APPEND (FUNC_PREFIX, fcvt_bufptr)
|
|
#define ECVT_BUFFER APPEND (FUNC_PREFIX, ecvt_buffer)
|
|
|
|
|
|
static char FCVT_BUFFER[MAXDIG];
|
|
static char ECVT_BUFFER[MAXDIG];
|
|
libc_freeres_ptr (static char *FCVT_BUFPTR);
|
|
|
|
char *
|
|
__APPEND (FUNC_PREFIX, fcvt) (value, ndigit, decpt, sign)
|
|
FLOAT_TYPE value;
|
|
int ndigit, *decpt, *sign;
|
|
{
|
|
if (FCVT_BUFPTR == NULL)
|
|
{
|
|
if (__APPEND (FUNC_PREFIX, fcvt_r) (value, ndigit, decpt, sign,
|
|
FCVT_BUFFER, MAXDIG) != -1)
|
|
return FCVT_BUFFER;
|
|
|
|
FCVT_BUFPTR = (char *) malloc (FCVT_MAXDIG);
|
|
if (FCVT_BUFPTR == NULL)
|
|
return FCVT_BUFFER;
|
|
}
|
|
|
|
(void) __APPEND (FUNC_PREFIX, fcvt_r) (value, ndigit, decpt, sign,
|
|
FCVT_BUFPTR, FCVT_MAXDIG);
|
|
|
|
return FCVT_BUFPTR;
|
|
}
|
|
|
|
|
|
char *
|
|
__APPEND (FUNC_PREFIX, ecvt) (value, ndigit, decpt, sign)
|
|
FLOAT_TYPE value;
|
|
int ndigit, *decpt, *sign;
|
|
{
|
|
(void) __APPEND (FUNC_PREFIX, ecvt_r) (value, ndigit, decpt, sign,
|
|
ECVT_BUFFER, MAXDIG);
|
|
|
|
return ECVT_BUFFER;
|
|
}
|
|
|
|
char *
|
|
__APPEND (FUNC_PREFIX, gcvt) (value, ndigit, buf)
|
|
FLOAT_TYPE value;
|
|
int ndigit;
|
|
char *buf;
|
|
{
|
|
sprintf (buf, "%.*" FLOAT_FMT_FLAG "g", MIN (ndigit, NDIGIT_MAX), value);
|
|
return buf;
|
|
}
|
|
|
|
#if LONG_DOUBLE_COMPAT (libc, GLIBC_2_0)
|
|
# ifdef LONG_DOUBLE_CVT
|
|
# define cvt_symbol(symbol) \
|
|
cvt_symbol_1 (libc, __APPEND (FUNC_PREFIX, symbol), \
|
|
APPEND (FUNC_PREFIX, symbol), GLIBC_2_4)
|
|
# define cvt_symbol_1(lib, local, symbol, version) \
|
|
versioned_symbol (lib, local, symbol, version)
|
|
# else
|
|
# define cvt_symbol(symbol) \
|
|
cvt_symbol_1 (libc, __APPEND (FUNC_PREFIX, symbol), \
|
|
APPEND (q, symbol), GLIBC_2_0); \
|
|
strong_alias (__APPEND (FUNC_PREFIX, symbol), APPEND (FUNC_PREFIX, symbol))
|
|
# define cvt_symbol_1(lib, local, symbol, version) \
|
|
compat_symbol (lib, local, symbol, version)
|
|
# endif
|
|
#else
|
|
# define cvt_symbol(symbol) \
|
|
strong_alias (__APPEND (FUNC_PREFIX, symbol), APPEND (FUNC_PREFIX, symbol))
|
|
#endif
|
|
cvt_symbol(fcvt);
|
|
cvt_symbol(ecvt);
|
|
cvt_symbol(gcvt);
|