Bug 1496591 - Make aarch64/ffitarget.h work under LLP64 on Windows. r=froydnj
authorDavid Major <dmajor@mozilla.com>
Fri, 05 Oct 2018 16:23:51 -0400
changeset 495626 cf34f11480ae7a1cd5db9b915011b2a6fc3b18f7
parent 495625 859cf0f7d17c9571445b4ee2a17d49083c983615
child 495627 62a73eefbaac08eb73951548547eeb2f0847fc9a
push id9984
push userffxbld-merge
push dateMon, 15 Oct 2018 21:07:35 +0000
treeherdermozilla-beta@183d27ea8570 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1496591
milestone64.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1496591 - Make aarch64/ffitarget.h work under LLP64 on Windows. r=froydnj
js/src/ctypes/libffi/src/aarch64/ffitarget.h
--- a/js/src/ctypes/libffi/src/aarch64/ffitarget.h
+++ b/js/src/ctypes/libffi/src/aarch64/ffitarget.h
@@ -22,18 +22,24 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #ifndef LIBFFI_TARGET_H
 #define LIBFFI_TARGET_H
 
 #ifndef LIBFFI_H
 #error "Please do not include ffitarget.h directly into your source.  Use ffi.h instead."
 #endif
 
 #ifndef LIBFFI_ASM
+#ifdef _MSC_VER
+typedef unsigned long long ffi_arg;
+typedef signed long long ffi_sarg;
+#define FFI_SIZEOF_ARG 8
+#else
 typedef unsigned long ffi_arg;
 typedef signed long ffi_sarg;
+#endif
 
 typedef enum ffi_abi
   {
     FFI_FIRST_ABI = 0,
     FFI_SYSV,
     FFI_LAST_ABI,
     FFI_DEFAULT_ABI = FFI_SYSV
   } ffi_abi;