Adapt to 2.4.6, adding AArch64 support and dropping dead definitions.

Signed-off-by: Andrew John Hughes <gnu_andrew@member.fsf.org>