Fix ARM asm compilation with Apple assembler
Merge remote-tracking branch 'remotes/origin/master' into 7mod