Merge commit '002c4779'

This is a NOOP.

* commit '002c4779':
  x86inc: Avoid creating unnecessary local labels
  x86inc: Simplify AUTO_REP_RET
  x86inc: Use more consistent indentation
  x86inc: Preserve arguments when allocating stack space
  x86inc: Improve FMA instruction handling
  x86inc: Be more verbose in assertion failures
  x86inc: Make cpuflag() and notcpuflag() return 0 or 1
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>