am 7499cd1d: Merge "x86_64: Fix comp-long"

* commit '7499cd1d4445fd00aa3c9503497a171fae9bf20e':
  x86_64: Fix comp-long