With these changes plus the egcs fix I committed a few minutes ago, "make -DWANT_AOUT world" works again. Most likely, "make upgrade" is fixed too, though I haven't tested that.
files in boot2 directory are copies from legacy biosboot. Submitted by: IMAI Takeshi <take-i@ceres.dti.ne.jp>