I _think_ I fixed all the outstanding branch build issues
as of a week ago or so.

Could you try manually rm'ing your obj tree? Some types
of source-tree changes just aren't automatically handled.

The last tgm build was ok, see
        http://releng.netbsd.org/ab/B_netbsd-2-0/arch.html

Let us know...