Fix types so that the upper 32 bits of addresses of branches are correct.
Fix types so that the upper 32 bits of addresses of branches are correct.

orumin/openbsd-efivars,orumin/openbsd-efivars,orumin/openbsd-efivars,orumin/openbsd-efivars