Fix strfmon_l: Use specified locale for number formatting [BZ #19633]

The commit 985fc132f2
"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.
This commit is contained in:
Stefan Liebler 2016-04-14 12:21:53 +02:00
parent 8a727af925
commit b1b8f5d89d
2 changed files with 12 additions and 6 deletions

View File

@ -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-14 Florian Weimer <fweimer@redhat.com>
Remove malloc hooks from fork handler. They are no longer needed

View File

@ -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)