Modify CFLAGS back to -O2.

  one reg save/restore bug under -O2 fixed also.