diff options
| author | Stefan Liebler <stli@linux.vnet.ibm.com> | 2016-04-14 12:21:53 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@suse.de> | 2016-05-11 13:33:01 +0200 |
| commit | a37d61a662027a5d92fa54ceb75cd3167d732b5f (patch) | |
| tree | c5b533aa6afab44cc817ed3af6c0eabd6540487a | |
| parent | 1a8a7c12950a0026a3c406a7cb1608f96aa1460e (diff) | |
| download | glibc-a37d61a662027a5d92fa54ceb75cd3167d732b5f.tar.gz glibc-a37d61a662027a5d92fa54ceb75cd3167d732b5f.tar.xz glibc-a37d61a662027a5d92fa54ceb75cd3167d732b5f.zip | |
Fix strfmon_l: Use specified locale for number formatting [BZ #19633]
The commit 985fc132f23dbb83de76c5af9e783ef1b5900148 "strfmon_l: Use specified locale for number formatting [BZ #19633]" introduced an elf/check-abi-libc testfailure due to __printf_fp_l on architectures which use sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h. This patch uses libc_hidden_def instead of ldbl_hidden_def. The ldbl_strong_alias is removed due to the rename of ___printf_fp_l to __printf_fp_l. ChangeLog: * stdio-common/printf_fp.c (__printf_fp_l): Rename ___printf_fp_l to __printf_fp_l and remove strong alias. Use libc_hidden_def instead of ldbl_hidden_def macro. (cherry picked from commit b1b8f5d89d06a994773e22ad4b7fe1036b37f8ab)
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | stdio-common/printf_fp.c | 11 |
2 files changed, 12 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index c3aa01a643..47f0b8a4bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2016-04-14 Stefan Liebler <stli@linux.vnet.ibm.com> + + * stdio-common/printf_fp.c (__printf_fp_l): + Rename ___printf_fp_l to __printf_fp_l and + remove strong alias. Use libc_hidden_def instead + of ldbl_hidden_def macro. + 2016-04-29 Florian Weimer <fweimer@redhat.com> [BZ #20010] diff --git a/stdio-common/printf_fp.c b/stdio-common/printf_fp.c index baada9e038..fdfe06b0a7 100644 --- a/stdio-common/printf_fp.c +++ b/stdio-common/printf_fp.c @@ -209,9 +209,9 @@ hack_digit (struct hack_digit_param *p) } int -___printf_fp_l (FILE *fp, locale_t loc, - const struct printf_info *info, - const void *const *args) +__printf_fp_l (FILE *fp, locale_t loc, + const struct printf_info *info, + const void *const *args) { /* The floating-point value to output. */ union @@ -1248,14 +1248,13 @@ ___printf_fp_l (FILE *fp, locale_t loc, } return done; } -ldbl_hidden_def (___printf_fp_l, __printf_fp_l) -ldbl_strong_alias (___printf_fp_l, __printf_fp_l) +libc_hidden_def (__printf_fp_l) int ___printf_fp (FILE *fp, const struct printf_info *info, const void *const *args) { - return ___printf_fp_l (fp, _NL_CURRENT_LOCALE, info, args); + return __printf_fp_l (fp, _NL_CURRENT_LOCALE, info, args); } ldbl_hidden_def (___printf_fp, __printf_fp) ldbl_strong_alias (___printf_fp, __printf_fp) |