Make sure only NEON enabled devices save/restore D16+ registers