What is one whose occupation is to make or repair small firearms; an armorer called?

gunsmith — One whose occupation is to make or repair small firearms; an armorer. (Webster's 1913.)

Sources