Merge branch 'master' into v2.1

This commit is contained in:
Mike Pall
2013-12-25 00:27:55 +01:00

View File

@@ -2120,7 +2120,7 @@ static void build_subroutines(BuildCtx *ctx)
|2: |2:
| addiu RC, MULTRES, -8 | addiu RC, MULTRES, -8
| jr AT | jr AT
|. add RA, RA, BASE |. addu RA, RA, BASE
| |
|3: // Rethrow error from the right C frame. |3: // Rethrow error from the right C frame.
| load_got lj_err_throw | load_got lj_err_throw