Support 64bit_asm field on OSX
Merge branch 'osx-64bit-asm'