Merge "x86_64: Fix comp-long"