Merge pull request #7189 from pgavlin/x86-cmp-long