Merge "[arch] use non-destructive setting of fpexc register"