Merge r3780 from elftoolchain.

Adjust argc and argv by optind before using them. This slightly
simplifies the code. No functional change intended.

MFC after: 3 days
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D21079