diff options
| author | Mike Pall <mike> | 2011-05-04 23:30:37 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2011-05-04 23:30:37 +0200 |
| commit | 704752c61274c5f50b1e37a01eb7db27e5d665dc (patch) | |
| tree | 3e4a3a0d6b11f1697a9a81f4cddc7cf845abc96c /src | |
| parent | fb8b87e818480c3a16dba9b542d1f1e29d3d24c6 (diff) | |
| download | luajit-704752c61274c5f50b1e37a01eb7db27e5d665dc.tar.gz luajit-704752c61274c5f50b1e37a01eb7db27e5d665dc.tar.bz2 luajit-704752c61274c5f50b1e37a01eb7db27e5d665dc.zip | |
FFI: Fix field alignment for iOS.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lj_cparse.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lj_cparse.c b/src/lj_cparse.c index eadb38bb..f302080f 100644 --- a/src/lj_cparse.c +++ b/src/lj_cparse.c | |||
| @@ -1202,8 +1202,8 @@ static CTSize cp_field_align(CPState *cp, CType *ct, CTInfo info) | |||
| 1202 | { | 1202 | { |
| 1203 | CTSize align = ctype_align(info); | 1203 | CTSize align = ctype_align(info); |
| 1204 | UNUSED(cp); UNUSED(ct); | 1204 | UNUSED(cp); UNUSED(ct); |
| 1205 | #if LJ_TARGET_X86 && !LJ_ABI_WIN | 1205 | #if (LJ_TARGET_X86 && !LJ_ABI_WIN) || (LJ_TARGET_ARM && __APPLE__) |
| 1206 | /* The SYSV i386 ABI limits alignment of non-vector fields to 4 bytes. */ | 1206 | /* The SYSV i386 and iOS ABIs limit alignment of non-vector fields to 2^2. */ |
| 1207 | if (align > 2 && !(info & CTFP_ALIGNED)) { | 1207 | if (align > 2 && !(info & CTFP_ALIGNED)) { |
| 1208 | if (ctype_isarray(info) && !(info & CTF_VECTOR)) { | 1208 | if (ctype_isarray(info) && !(info & CTF_VECTOR)) { |
| 1209 | do { | 1209 | do { |