Merge "workaround stack bashing by asm on 32-bit OpenBSD"