Added armv7s support; better gas-preprocessor integration