am 6192eedb: Merge "Fix \'r\' for LP64."

* commit '6192eedb43bfa949569850b5cf4a6550b2c62f08':
  Fix 'r' for LP64.