diff options
author | Mike Pall <mike> | 2015-01-07 21:14:43 +0100 |
---|---|---|
committer | Mike Pall <mike> | 2015-01-07 21:14:43 +0100 |
commit | 962d2aaa9f0bfe3d2b374b23e6916e992975e2e7 (patch) | |
tree | 3ffe4aa7fc49711a0bb88f2f6531ea780985ad72 | |
parent | 33f0c24f06d38ea618429c2ea2f7a849e8d7439c (diff) | |
download | luajit-962d2aaa9f0bfe3d2b374b23e6916e992975e2e7.tar.gz luajit-962d2aaa9f0bfe3d2b374b23e6916e992975e2e7.tar.bz2 luajit-962d2aaa9f0bfe3d2b374b23e6916e992975e2e7.zip |
LJ_GC64: Return true for ffi.abi("gc64").
-rw-r--r-- | doc/ext_ffi_api.html | 2 | ||||
-rw-r--r-- | src/lib_ffi.c | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/doc/ext_ffi_api.html b/doc/ext_ffi_api.html index 4289c190..8cf48dc3 100644 --- a/doc/ext_ffi_api.html +++ b/doc/ext_ffi_api.html | |||
@@ -468,6 +468,8 @@ otherwise. The following parameters are currently defined: | |||
468 | <td class="abiparam">eabi</td><td class="abidesc">EABI variant of the standard ABI</td></tr> | 468 | <td class="abiparam">eabi</td><td class="abidesc">EABI variant of the standard ABI</td></tr> |
469 | <tr class="odd"> | 469 | <tr class="odd"> |
470 | <td class="abiparam">win</td><td class="abidesc">Windows variant of the standard ABI</td></tr> | 470 | <td class="abiparam">win</td><td class="abidesc">Windows variant of the standard ABI</td></tr> |
471 | <tr class="even"> | ||
472 | <td class="abiparam">gc64</td><td class="abidesc">64 bit GC references</td></tr> | ||
471 | </table> | 473 | </table> |
472 | 474 | ||
473 | <h3 id="ffi_os"><tt>ffi.os</tt></h3> | 475 | <h3 id="ffi_os"><tt>ffi.os</tt></h3> |
diff --git a/src/lib_ffi.c b/src/lib_ffi.c index 6e601539..b2b2d37f 100644 --- a/src/lib_ffi.c +++ b/src/lib_ffi.c | |||
@@ -751,6 +751,9 @@ LJLIB_CF(ffi_abi) LJLIB_REC(.) | |||
751 | case H_(4ab624a8,4ab624a8): b = 1; break; /* win */ | 751 | case H_(4ab624a8,4ab624a8): b = 1; break; /* win */ |
752 | #endif | 752 | #endif |
753 | case H_(3af93066,1f001464): b = 1; break; /* le/be */ | 753 | case H_(3af93066,1f001464): b = 1; break; /* le/be */ |
754 | #if LJ_GC64 | ||
755 | case H_(9e89d2c9,13c83c92): b = 1; break; /* gc64 */ | ||
756 | #endif | ||
754 | default: | 757 | default: |
755 | break; | 758 | break; |
756 | } | 759 | } |