| author | Ronald Jordan <ron.jordan@oracle.com> |
| Tue, 11 Oct 2016 11:55:12 -0700 | |
| branch | s11u3-sru |
| changeset 7085 | cad8ee01213d |
| permissions | -rw-r--r-- |
|
7085
cad8ee01213d
23206271 Upgrade cffi to 1.5.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
1 |
In-house (for now) patch to allow cffi 1.5.2 to compile with both |
|
cad8ee01213d
23206271 Upgrade cffi to 1.5.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
2 |
Studio and on SPARC. |
|
cad8ee01213d
23206271 Upgrade cffi to 1.5.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
3 |
|
|
cad8ee01213d
23206271 Upgrade cffi to 1.5.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
4 |
--- cffi-1.5.2/c/call_python.c.~1~ 2016-02-13 07:33:29.000000000 -0800 |
|
cad8ee01213d
23206271 Upgrade cffi to 1.5.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
5 |
+++ cffi-1.5.2/c/call_python.c 2016-05-18 10:10:49.505449785 -0700 |
|
cad8ee01213d
23206271 Upgrade cffi to 1.5.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
6 |
@@ -150,7 +150,8 @@ static int _update_cache_to_call_python( |
|
cad8ee01213d
23206271 Upgrade cffi to 1.5.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
7 |
#if (defined(WITH_THREAD) && !defined(_MSC_VER) && \ |
|
cad8ee01213d
23206271 Upgrade cffi to 1.5.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
8 |
!defined(__amd64__) && !defined(__x86_64__) && \ |
|
cad8ee01213d
23206271 Upgrade cffi to 1.5.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
9 |
!defined(__i386__) && !defined(__i386)) |
|
cad8ee01213d
23206271 Upgrade cffi to 1.5.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
10 |
-# define read_barrier() __sync_synchronize() |
|
cad8ee01213d
23206271 Upgrade cffi to 1.5.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
11 |
+# include <mbarrier.h> |
|
cad8ee01213d
23206271 Upgrade cffi to 1.5.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
12 |
+# define read_barrier() __compiler_barrier() |
|
cad8ee01213d
23206271 Upgrade cffi to 1.5.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
13 |
#else |
|
cad8ee01213d
23206271 Upgrade cffi to 1.5.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
14 |
# define read_barrier() (void)0 |
|
cad8ee01213d
23206271 Upgrade cffi to 1.5.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
15 |
#endif |
|
cad8ee01213d
23206271 Upgrade cffi to 1.5.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
16 |
--- cffi-1.5.2/cffi/_embedding.h.~1~ 2016-02-13 07:33:29.000000000 -0800 |
|
cad8ee01213d
23206271 Upgrade cffi to 1.5.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
17 |
+++ cffi-1.5.2/cffi/_embedding.h 2016-05-18 10:15:53.285798295 -0700 |
|
cad8ee01213d
23206271 Upgrade cffi to 1.5.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
18 |
@@ -32,12 +32,14 @@ static _cffi_call_python_fnptr _cffi_cal |
|
cad8ee01213d
23206271 Upgrade cffi to 1.5.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
19 |
|
|
cad8ee01213d
23206271 Upgrade cffi to 1.5.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
20 |
|
|
cad8ee01213d
23206271 Upgrade cffi to 1.5.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
21 |
#ifndef _MSC_VER |
|
cad8ee01213d
23206271 Upgrade cffi to 1.5.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
22 |
- /* --- Assuming a GCC not infinitely old --- */ |
|
cad8ee01213d
23206271 Upgrade cffi to 1.5.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
23 |
-# define cffi_compare_and_swap(l,o,n) __sync_bool_compare_and_swap(l,o,n) |
|
cad8ee01213d
23206271 Upgrade cffi to 1.5.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
24 |
-# define cffi_write_barrier() __sync_synchronize() |
|
cad8ee01213d
23206271 Upgrade cffi to 1.5.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
25 |
+# include <atomic.h> |
|
cad8ee01213d
23206271 Upgrade cffi to 1.5.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
26 |
+# include <mbarrier.h> |
|
cad8ee01213d
23206271 Upgrade cffi to 1.5.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
27 |
+# define cffi_compare_and_swap(l,o,n) \ |
|
cad8ee01213d
23206271 Upgrade cffi to 1.5.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
28 |
+ (atomic_cas_ptr((l), (o), (n)), *(l) == (n)) |
|
cad8ee01213d
23206271 Upgrade cffi to 1.5.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
29 |
+# define cffi_write_barrier() __compiler_barrier() |
|
cad8ee01213d
23206271 Upgrade cffi to 1.5.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
30 |
# if !defined(__amd64__) && !defined(__x86_64__) && \ |
|
cad8ee01213d
23206271 Upgrade cffi to 1.5.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
31 |
!defined(__i386__) && !defined(__i386) |
|
cad8ee01213d
23206271 Upgrade cffi to 1.5.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
32 |
-# define cffi_read_barrier() __sync_synchronize() |
|
cad8ee01213d
23206271 Upgrade cffi to 1.5.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
33 |
+# define cffi_read_barrier() __compiler_barrier() |
|
cad8ee01213d
23206271 Upgrade cffi to 1.5.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
34 |
# else |
|
cad8ee01213d
23206271 Upgrade cffi to 1.5.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
35 |
# define cffi_read_barrier() (void)0 |
|
cad8ee01213d
23206271 Upgrade cffi to 1.5.2
Ronald Jordan <ron.jordan@oracle.com>
parents:
diff
changeset
|
36 |
# endif |