Merge commit '002c47798da0c43a053822c8041144798d49ed84'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 3 Feb 2016 17:07:47 +0000 (17:07 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 3 Feb 2016 17:07:47 +0000 (17:07 +0000)
commit9de85c544aaa0e38f52154e6a6b3a1adc02993c8
treed576518c7a688bbe128a8474fe290c14fec0eee9
parent74f5cb0189d61affc6550723c1f82d4ae76df1d5
parent002c47798da0c43a053822c8041144798d49ed84
Merge commit '002c47798da0c43a053822c8041144798d49ed84'

This is a NOOP.

* commit '002c47798da0c43a053822c8041144798d49ed84':
  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>