fix ARM_ARCH stuff

I was so tired when I pushed that last patch I did not notice it was totally
half baked. This is a much better, and actualy tested version.