[SH] Backport PR 33135 fix to 4.7 and 4.6

[Kaz Kojima]

Oleg Endo <oleg.endo@t-online.de> wrote:
> The attached patches fix PR 33135 on the 4.7 and 4.6 branches.
> Tested on both branches with 'make all' and 'make info dvi pdf'.
> 
> OK to install?

OK.

Regards,
	kaz