> emacs-24 should get some form of band-aid "do not merge to trunk"
> fix for this, just in case.

I've now applied a somewhat different solution to the Gentoo package,
namely patching the m/amdx86-64.h file, see attached patch. (This
should also ensure that it isn't accidentally merged to trunk, because
the file doesn't exist there any more.)