make check failure in latest cvs of 21.5