* stdio-common/printf.h: Add missing const to register_printf_modifier.

* stdio-common/reg-modifier.c: Likewise.

2009-04-22  Andrew Stubbs  <ams@codesourcery.com>

	* sysdeps/sh/sh4/setjmp.S (__sigsetjmp): Adjust JB_SIZE when there
	is no FPU.
This commit is contained in:
Ulrich Drepper 2009-04-23 01:14:33 +00:00
parent d43f10e715
commit debafa10bc
4 changed files with 16 additions and 4 deletions

View File

@ -1,3 +1,13 @@
2009-04-22 Ulrich Drepper <drepper@redhat.com>
* stdio-common/printf.h: Add missing const to register_printf_modifier.
* stdio-common/reg-modifier.c: Likewise.
2009-04-22 Andrew Stubbs <ams@codesourcery.com>
* sysdeps/sh/sh4/setjmp.S (__sigsetjmp): Adjust JB_SIZE when there
is no FPU.
2009-04-20 Ulrich Drepper <drepper@redhat.com> 2009-04-20 Ulrich Drepper <drepper@redhat.com>
[BZ #10086] [BZ #10086]

View File

@ -113,7 +113,7 @@ extern int register_printf_function (int __spec, printf_function __func,
it returns a positive value representing the bit set in the USER it returns a positive value representing the bit set in the USER
field in 'struct printf_info'. */ field in 'struct printf_info'. */
extern int register_printf_modifier (wchar_t *__str) __wur __THROW; extern int register_printf_modifier (__const wchar_t *__str) __wur __THROW;
/* Register variable argument handler for user type. The return value /* Register variable argument handler for user type. The return value

View File

@ -39,7 +39,7 @@ static int next_bit;
int int
__register_printf_modifier (wchar_t *str) __register_printf_modifier (const wchar_t *str)
{ {
if (str[0] == L'\0') if (str[0] == L'\0')
{ {
@ -48,7 +48,7 @@ __register_printf_modifier (wchar_t *str)
return -1; return -1;
} }
wchar_t *wc = str; const wchar_t *wc = str;
while (*wc != L'\0') while (*wc != L'\0')
if (*wc < 0 || *wc > (wchar_t) UCHAR_MAX) if (*wc < 0 || *wc > (wchar_t) UCHAR_MAX)
goto einval; goto einval;

View File

@ -22,13 +22,15 @@
ENTRY (__sigsetjmp) ENTRY (__sigsetjmp)
/* Save registers */ /* Save registers */
add #JB_SIZE, r4
#ifdef __SH_FPU_ANY__ #ifdef __SH_FPU_ANY__
add #JB_SIZE, r4
fmov.s fr15, @-r4 fmov.s fr15, @-r4
fmov.s fr14, @-r4 fmov.s fr14, @-r4
fmov.s fr13, @-r4 fmov.s fr13, @-r4
fmov.s fr12, @-r4 fmov.s fr12, @-r4
sts.l fpscr, @-r4 sts.l fpscr, @-r4
#else
add #(JB_SIZE - 4 * 5), r4
#endif /* __SH_FPU_ANY__ */ #endif /* __SH_FPU_ANY__ */
stc.l gbr, @-r4 stc.l gbr, @-r4
#ifdef PTR_MANGLE #ifdef PTR_MANGLE