Also use x86-64 instead of x86_64 for consistency and fix a few other nits.
rebased onto 8981896f9ebe9209bf097e3ac764775042bfc1ed
lgtm, there is still some inconsistency between arm64 and aarch64 and the change switches to the latter in one case although arm64 seems to be more common. This nit can be fixed later.
arm64
aarch64
Pull-Request has been merged by jannau
Also use x86-64 instead of x86_64 for consistency and fix a few other
nits.