diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | stdio-common/printf.h | 2 | ||||
| -rw-r--r-- | stdio-common/reg-modifier.c | 4 | ||||
| -rw-r--r-- | sysdeps/sh/sh4/setjmp.S | 4 |
4 files changed, 16 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index c31fc96cad..744832a98c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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> [BZ #10086] diff --git a/stdio-common/printf.h b/stdio-common/printf.h index a11af02274..af8cf34fcc 100644 --- a/stdio-common/printf.h +++ b/stdio-common/printf.h @@ -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 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 diff --git a/stdio-common/reg-modifier.c b/stdio-common/reg-modifier.c index 69bb2ef3d5..ea3bdada13 100644 --- a/stdio-common/reg-modifier.c +++ b/stdio-common/reg-modifier.c @@ -39,7 +39,7 @@ static int next_bit; int -__register_printf_modifier (wchar_t *str) +__register_printf_modifier (const wchar_t *str) { if (str[0] == L'\0') { @@ -48,7 +48,7 @@ __register_printf_modifier (wchar_t *str) return -1; } - wchar_t *wc = str; + const wchar_t *wc = str; while (*wc != L'\0') if (*wc < 0 || *wc > (wchar_t) UCHAR_MAX) goto einval; diff --git a/sysdeps/sh/sh4/setjmp.S b/sysdeps/sh/sh4/setjmp.S index 03f0b08dcd..9d8fab7a99 100644 --- a/sysdeps/sh/sh4/setjmp.S +++ b/sysdeps/sh/sh4/setjmp.S @@ -22,13 +22,15 @@ ENTRY (__sigsetjmp) /* Save registers */ - add #JB_SIZE, r4 #ifdef __SH_FPU_ANY__ + add #JB_SIZE, r4 fmov.s fr15, @-r4 fmov.s fr14, @-r4 fmov.s fr13, @-r4 fmov.s fr12, @-r4 sts.l fpscr, @-r4 +#else + add #(JB_SIZE - 4 * 5), r4 #endif /* __SH_FPU_ANY__ */ stc.l gbr, @-r4 #ifdef PTR_MANGLE |