|
 |
c6d234 |
commit b1b8f5d89d06a994773e22ad4b7fe1036b37f8ab
|
|
|
c6d234 |
Author: Stefan Liebler <stli@linux.vnet.ibm.com>
|
|
|
c6d234 |
Date: Thu Apr 14 12:21:53 2016 +0200
|
|
|
c6d234 |
|
|
|
c6d234 |
Fix strfmon_l: Use specified locale for number formatting [BZ #19633]
|
|
|
c6d234 |
|
|
|
c6d234 |
The commit 985fc132f23dbb83de76c5af9e783ef1b5900148
|
|
|
c6d234 |
"strfmon_l: Use specified locale for number formatting [BZ #19633]"
|
|
|
c6d234 |
introduced an elf/check-abi-libc testfailure due to __printf_fp_l
|
|
|
c6d234 |
on architectures which use sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h.
|
|
|
c6d234 |
|
|
|
c6d234 |
This patch uses libc_hidden_def instead of ldbl_hidden_def.
|
|
|
c6d234 |
The ldbl_strong_alias is removed due to the rename of ___printf_fp_l
|
|
|
c6d234 |
to __printf_fp_l.
|
|
|
c6d234 |
|
|
|
c6d234 |
ChangeLog:
|
|
|
c6d234 |
|
|
|
c6d234 |
* stdio-common/printf_fp.c (__printf_fp_l):
|
|
|
c6d234 |
Rename ___printf_fp_l to __printf_fp_l and
|
|
|
c6d234 |
remove strong alias. Use libc_hidden_def instead
|
|
|
c6d234 |
of ldbl_hidden_def macro.
|
|
|
c6d234 |
|
|
|
c6d234 |
Index: b/stdio-common/printf_fp.c
|
|
|
c6d234 |
===================================================================
|
|
|
c6d234 |
--- a/stdio-common/printf_fp.c
|
|
|
c6d234 |
+++ b/stdio-common/printf_fp.c
|
|
|
c6d234 |
@@ -153,9 +153,9 @@ static wchar_t *group_number (wchar_t *b
|
|
|
c6d234 |
|
|
|
c6d234 |
|
|
|
c6d234 |
int
|
|
|
c6d234 |
-___printf_fp_l (FILE *fp, locale_t loc,
|
|
|
c6d234 |
- const struct printf_info *info,
|
|
|
c6d234 |
- const void *const *args)
|
|
|
c6d234 |
+__printf_fp_l (FILE *fp, locale_t loc,
|
|
|
c6d234 |
+ const struct printf_info *info,
|
|
|
c6d234 |
+ const void *const *args)
|
|
|
c6d234 |
{
|
|
|
c6d234 |
/* The floating-point value to output. */
|
|
|
c6d234 |
union
|
|
|
c6d234 |
@@ -1247,14 +1247,13 @@ ___printf_fp_l (FILE *fp, locale_t loc,
|
|
|
c6d234 |
}
|
|
|
c6d234 |
return done;
|
|
|
c6d234 |
}
|
|
|
c6d234 |
-ldbl_hidden_def (___printf_fp_l, __printf_fp_l)
|
|
|
c6d234 |
-ldbl_strong_alias (___printf_fp_l, __printf_fp_l)
|
|
|
c6d234 |
+libc_hidden_def (__printf_fp_l)
|
|
|
c6d234 |
|
|
|
c6d234 |
int
|
|
|
c6d234 |
___printf_fp (FILE *fp, const struct printf_info *info,
|
|
|
c6d234 |
const void *const *args)
|
|
|
c6d234 |
{
|
|
|
c6d234 |
- return ___printf_fp_l (fp, _NL_CURRENT_LOCALE, info, args);
|
|
|
c6d234 |
+ return __printf_fp_l (fp, _NL_CURRENT_LOCALE, info, args);
|
|
|
c6d234 |
}
|
|
|
c6d234 |
ldbl_hidden_def (___printf_fp, __printf_fp)
|
|
|
c6d234 |
ldbl_strong_alias (___printf_fp, __printf_fp)
|