[3.1.1] x86-64 fixes

[Mark Mitchell]

> OK, for next time I will allways prepare two versions, one with moving
> the macro offline for mainline and one into macro for the branch. There
> ar at least two other macros (for profiling) that needs to be fixed.
> THanks!

No; thank you.  I know it's more work to do things in different ways.

Yours,

--
Mark Mitchell                   mark@codesourcery.com
CodeSourcery, LLC               http://www.codesourcery.com