| author | Ann Lai <ann.lai@oracle.com> |
| Fri, 07 Apr 2017 17:54:54 -0700 | |
| changeset 7850 | b1ddd00f19fd |
| parent 7500 | 38effcff0d5d |
| permissions | -rw-r--r-- |
|
7500
38effcff0d5d
17349280 Move ruby cflags disabling raw_size to libffi and disable raw_size when active
Binjih Lin <binjih.lin@oracle.com>
parents:
diff
changeset
|
1 |
Raw API calls are not supported, since they are disabled in the Makefile |
|
38effcff0d5d
17349280 Move ruby cflags disabling raw_size to libffi and disable raw_size when active
Binjih Lin <binjih.lin@oracle.com>
parents:
diff
changeset
|
2 |
for a fix to bug 22535919 which requires API calls to be disabled. |
|
38effcff0d5d
17349280 Move ruby cflags disabling raw_size to libffi and disable raw_size when active
Binjih Lin <binjih.lin@oracle.com>
parents:
diff
changeset
|
3 |
Removes the raw API functions if RAW API is not allowed. |
|
38effcff0d5d
17349280 Move ruby cflags disabling raw_size to libffi and disable raw_size when active
Binjih Lin <binjih.lin@oracle.com>
parents:
diff
changeset
|
4 |
Will attempt to send upstream. |
|
38effcff0d5d
17349280 Move ruby cflags disabling raw_size to libffi and disable raw_size when active
Binjih Lin <binjih.lin@oracle.com>
parents:
diff
changeset
|
5 |
|
|
38effcff0d5d
17349280 Move ruby cflags disabling raw_size to libffi and disable raw_size when active
Binjih Lin <binjih.lin@oracle.com>
parents:
diff
changeset
|
6 |
--- libffi-3.2.1/libffi.pc.in_orig 2016-11-30 13:27:54.465013600 +0000 |
|
38effcff0d5d
17349280 Move ruby cflags disabling raw_size to libffi and disable raw_size when active
Binjih Lin <binjih.lin@oracle.com>
parents:
diff
changeset
|
7 |
+++ libffi-3.2.1/libffi.pc.in 2016-11-30 13:28:43.661349542 +0000 |
|
38effcff0d5d
17349280 Move ruby cflags disabling raw_size to libffi and disable raw_size when active
Binjih Lin <binjih.lin@oracle.com>
parents:
diff
changeset
|
8 |
@@ -8,4 +8,4 @@ |
|
38effcff0d5d
17349280 Move ruby cflags disabling raw_size to libffi and disable raw_size when active
Binjih Lin <binjih.lin@oracle.com>
parents:
diff
changeset
|
9 |
Description: Library supporting Foreign Function Interfaces |
|
38effcff0d5d
17349280 Move ruby cflags disabling raw_size to libffi and disable raw_size when active
Binjih Lin <binjih.lin@oracle.com>
parents:
diff
changeset
|
10 |
Version: @PACKAGE_VERSION@ |
|
38effcff0d5d
17349280 Move ruby cflags disabling raw_size to libffi and disable raw_size when active
Binjih Lin <binjih.lin@oracle.com>
parents:
diff
changeset
|
11 |
Libs: -L${toolexeclibdir} -lffi
|
|
38effcff0d5d
17349280 Move ruby cflags disabling raw_size to libffi and disable raw_size when active
Binjih Lin <binjih.lin@oracle.com>
parents:
diff
changeset
|
12 |
-Cflags: -I${includedir}
|
|
38effcff0d5d
17349280 Move ruby cflags disabling raw_size to libffi and disable raw_size when active
Binjih Lin <binjih.lin@oracle.com>
parents:
diff
changeset
|
13 |
+Cflags: -I${includedir} -DFFI_NO_RAW_API
|
|
38effcff0d5d
17349280 Move ruby cflags disabling raw_size to libffi and disable raw_size when active
Binjih Lin <binjih.lin@oracle.com>
parents:
diff
changeset
|
14 |
--- libffi-3.2.1/include/ffi.h.in.~1~ 2014-11-08 04:47:24.000000000 +0000 |
|
38effcff0d5d
17349280 Move ruby cflags disabling raw_size to libffi and disable raw_size when active
Binjih Lin <binjih.lin@oracle.com>
parents:
diff
changeset
|
15 |
+++ libffi-3.2.1/include/ffi.h.in 2016-11-30 17:29:52.630907951 +0000 |
|
38effcff0d5d
17349280 Move ruby cflags disabling raw_size to libffi and disable raw_size when active
Binjih Lin <binjih.lin@oracle.com>
parents:
diff
changeset
|
16 |
@@ -282,14 +282,16 @@ |
|
38effcff0d5d
17349280 Move ruby cflags disabling raw_size to libffi and disable raw_size when active
Binjih Lin <binjih.lin@oracle.com>
parents:
diff
changeset
|
17 |
#endif |
|
38effcff0d5d
17349280 Move ruby cflags disabling raw_size to libffi and disable raw_size when active
Binjih Lin <binjih.lin@oracle.com>
parents:
diff
changeset
|
18 |
|
|
38effcff0d5d
17349280 Move ruby cflags disabling raw_size to libffi and disable raw_size when active
Binjih Lin <binjih.lin@oracle.com>
parents:
diff
changeset
|
19 |
|
|
38effcff0d5d
17349280 Move ruby cflags disabling raw_size to libffi and disable raw_size when active
Binjih Lin <binjih.lin@oracle.com>
parents:
diff
changeset
|
20 |
-void ffi_raw_call (ffi_cif *cif, |
|
38effcff0d5d
17349280 Move ruby cflags disabling raw_size to libffi and disable raw_size when active
Binjih Lin <binjih.lin@oracle.com>
parents:
diff
changeset
|
21 |
+#if !FFI_NO_RAW_API |
|
38effcff0d5d
17349280 Move ruby cflags disabling raw_size to libffi and disable raw_size when active
Binjih Lin <binjih.lin@oracle.com>
parents:
diff
changeset
|
22 |
+ void ffi_raw_call (ffi_cif *cif, |
|
38effcff0d5d
17349280 Move ruby cflags disabling raw_size to libffi and disable raw_size when active
Binjih Lin <binjih.lin@oracle.com>
parents:
diff
changeset
|
23 |
void (*fn)(void), |
|
38effcff0d5d
17349280 Move ruby cflags disabling raw_size to libffi and disable raw_size when active
Binjih Lin <binjih.lin@oracle.com>
parents:
diff
changeset
|
24 |
void *rvalue, |
|
38effcff0d5d
17349280 Move ruby cflags disabling raw_size to libffi and disable raw_size when active
Binjih Lin <binjih.lin@oracle.com>
parents:
diff
changeset
|
25 |
ffi_raw *avalue); |
|
38effcff0d5d
17349280 Move ruby cflags disabling raw_size to libffi and disable raw_size when active
Binjih Lin <binjih.lin@oracle.com>
parents:
diff
changeset
|
26 |
|
|
38effcff0d5d
17349280 Move ruby cflags disabling raw_size to libffi and disable raw_size when active
Binjih Lin <binjih.lin@oracle.com>
parents:
diff
changeset
|
27 |
-void ffi_ptrarray_to_raw (ffi_cif *cif, void **args, ffi_raw *raw); |
|
38effcff0d5d
17349280 Move ruby cflags disabling raw_size to libffi and disable raw_size when active
Binjih Lin <binjih.lin@oracle.com>
parents:
diff
changeset
|
28 |
-void ffi_raw_to_ptrarray (ffi_cif *cif, ffi_raw *raw, void **args); |
|
38effcff0d5d
17349280 Move ruby cflags disabling raw_size to libffi and disable raw_size when active
Binjih Lin <binjih.lin@oracle.com>
parents:
diff
changeset
|
29 |
-size_t ffi_raw_size (ffi_cif *cif); |
|
38effcff0d5d
17349280 Move ruby cflags disabling raw_size to libffi and disable raw_size when active
Binjih Lin <binjih.lin@oracle.com>
parents:
diff
changeset
|
30 |
+ void ffi_ptrarray_to_raw (ffi_cif *cif, void **args, ffi_raw *raw); |
|
38effcff0d5d
17349280 Move ruby cflags disabling raw_size to libffi and disable raw_size when active
Binjih Lin <binjih.lin@oracle.com>
parents:
diff
changeset
|
31 |
+ void ffi_raw_to_ptrarray (ffi_cif *cif, ffi_raw *raw, void **args); |
|
38effcff0d5d
17349280 Move ruby cflags disabling raw_size to libffi and disable raw_size when active
Binjih Lin <binjih.lin@oracle.com>
parents:
diff
changeset
|
32 |
+ size_t ffi_raw_size (ffi_cif *cif); |
|
38effcff0d5d
17349280 Move ruby cflags disabling raw_size to libffi and disable raw_size when active
Binjih Lin <binjih.lin@oracle.com>
parents:
diff
changeset
|
33 |
+#endif |
|
38effcff0d5d
17349280 Move ruby cflags disabling raw_size to libffi and disable raw_size when active
Binjih Lin <binjih.lin@oracle.com>
parents:
diff
changeset
|
34 |
|
|
38effcff0d5d
17349280 Move ruby cflags disabling raw_size to libffi and disable raw_size when active
Binjih Lin <binjih.lin@oracle.com>
parents:
diff
changeset
|
35 |
/* This is analogous to the raw API, except it uses Java parameter */ |
|
38effcff0d5d
17349280 Move ruby cflags disabling raw_size to libffi and disable raw_size when active
Binjih Lin <binjih.lin@oracle.com>
parents:
diff
changeset
|
36 |
/* packing, even on 64-bit machines. I.e. on 64-bit machines */ |