The first paragraph in the ChangeLog entry is for infrastructure that is shared among the three accessor macro patches. After doing a global replace of cfun->machine in config and adjusting formatting, I grepped for '\' to check if there was some other kind of reference. I've found lots of comments, a few instances of a variable 'machine' set to MACHINE_FUNCTION (*cfun), some stuff regarding the software-floating point includes and preprocessor assertions etc, but nothing really relevant. Bootstrapped in trunk revision 161310; currently undergoing regression testing.