Merge "x86_64: Correct fix for cmp-long"