MFC r352065-r352070
Sync with OpenBSD, in particular this adds support for -E flags (GNU compatibility)