diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-12-07 10:37:25 -0500 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-12-07 10:37:25 -0500 |
| commit | 1a007b1631509b9d72499a8f4402294017ee04dc (patch) | |
| tree | 92f8b0341497c7bd4e53aa82c690346536a244c3 /src/runtime.js | |
| parent | df11c6f1fd1636a355b83a1c48b3a890596e6a32 (diff) | |
| parent | eb083723747a90cb6ab9853fec8d6e8ef54748bc (diff) | |
Merge branch 'incoming'
Diffstat (limited to 'src/runtime.js')
| -rw-r--r-- | src/runtime.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/runtime.js b/src/runtime.js index dedaf5ea..8ba5d08d 100644 --- a/src/runtime.js +++ b/src/runtime.js @@ -185,8 +185,11 @@ var Runtime = { // type can be a native type or a struct (or null, for structs we only look at size here) getAlignSize: function(type, size, vararg) { // we align i64s and doubles on 64-bit boundaries, unlike x86 +#if TARGET_LE32 == 1 + if (vararg) return 8; +#endif #if TARGET_LE32 - if (type == 'i64' || type == 'double' || vararg) return 8; + if (!vararg && (type == 'i64' || type == 'double')) return 8; if (!type) return Math.min(size, 8); // align structures internally to 64 bits #endif return Math.min(size || (type ? Runtime.getNativeFieldSize(type) : 0), Runtime.QUANTUM_SIZE); |