forked from beeware/Python-Apple-support
-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathlibffi-3.4.2.patch
320 lines (278 loc) · 11.5 KB
/
libffi-3.4.2.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
diff --git a/generate-darwin-source-and-headers.py b/generate-darwin-source-and-headers.py
index 9921b0d..5b60ccc 100755
--- a/generate-darwin-source-and-headers.py
+++ b/generate-darwin-source-and-headers.py
@@ -11,9 +11,8 @@ class Platform(object):
pass
-class simulator_platform(Platform):
+class i386_platform(Platform):
arch = 'i386'
- triple = 'i386-apple-darwin11'
prefix = "#ifdef __i386__\n\n"
suffix = "\n\n#endif"
@@ -21,9 +20,8 @@ class simulator_platform(Platform):
src_files = ['sysv.S', 'ffi.c', 'internal.h']
-class simulator64_platform(Platform):
+class x86_64_platform(Platform):
arch = 'x86_64'
- triple = 'x86_64-apple-darwin13'
prefix = "#ifdef __x86_64__\n\n"
suffix = "\n\n#endif"
@@ -31,101 +29,146 @@ class simulator64_platform(Platform):
src_files = ['unix64.S', 'ffi64.c', 'ffiw64.c', 'win64.S', 'internal64.h', 'asmnames.h']
-class device_platform(Platform):
- arch = 'armv7'
- triple = 'arm-apple-darwin11'
+class arm64_platform(Platform):
+ arch = 'arm64'
- prefix = "#ifdef __arm__\n\n"
+ prefix = "#ifdef __arm64__\n\n"
suffix = "\n\n#endif"
- src_dir = 'arm'
+ src_dir = 'aarch64'
src_files = ['sysv.S', 'ffi.c', 'internal.h']
-class device64_platform(Platform):
- arch = 'arm64'
- triple = 'aarch64-apple-darwin13'
+class armv7_platform(Platform):
+ arch = 'armv7'
- prefix = "#ifdef __arm64__\n\n"
+ prefix = "#ifdef __arm__\n\n"
suffix = "\n\n#endif"
- src_dir = 'aarch64'
+ src_dir = 'arm'
src_files = ['sysv.S', 'ffi.c', 'internal.h']
-class ios_simulator_platform(simulator_platform):
+class ios_simulator_i386_platform(i386_platform):
+ triple = 'i386-apple-darwin11'
+ target = 'i386-apple-ios-simulator'
+ directory = 'darwin_ios'
+ sdk = 'iphonesimulator'
+ version_min = '-miphoneos-version-min=7.0'
+
+
+class ios_simulator_x86_64_platform(x86_64_platform):
+ triple = 'x86_64-apple-darwin13'
+ target = 'x86_64-apple-ios-simulator'
directory = 'darwin_ios'
sdk = 'iphonesimulator'
version_min = '-miphoneos-version-min=7.0'
-class ios_simulator64_platform(simulator64_platform):
+class ios_simulator_arm64_platform(arm64_platform):
+ triple = 'aarch64-apple-darwin20'
+ target = 'arm64-apple-ios-simulator'
directory = 'darwin_ios'
sdk = 'iphonesimulator'
version_min = '-miphoneos-version-min=7.0'
-class ios_device_platform(device_platform):
+class ios_device_armv7_platform(armv7_platform):
+ triple = 'arm-apple-darwin11'
+ target = 'armv7-apple-ios'
directory = 'darwin_ios'
sdk = 'iphoneos'
version_min = '-miphoneos-version-min=7.0'
-class ios_device64_platform(device64_platform):
+class ios_device_arm64_platform(arm64_platform):
+ triple = 'aarch64-apple-darwin13'
+ target = 'arm64-apple-ios'
directory = 'darwin_ios'
sdk = 'iphoneos'
version_min = '-miphoneos-version-min=7.0'
-class desktop32_platform(Platform):
+class desktop_x86_64_platform(x86_64_platform):
+ triple = 'x86_64-apple-darwin10'
+ target = 'x86_64-apple-macos'
directory = 'darwin_osx'
sdk = 'macosx'
- arch = 'i386'
- triple = 'i386-apple-darwin10'
version_min = '-mmacosx-version-min=10.6'
- src_dir = 'x86'
- src_files = ['sysv.S', 'ffi.c', 'internal.h']
-
- prefix = "#ifdef __i386__\n\n"
- suffix = "\n\n#endif"
-class desktop64_platform(Platform):
+class desktop_arm64_platform(arm64_platform):
+ triple = 'aarch64-apple-darwin20'
+ target = 'arm64-apple-macos'
directory = 'darwin_osx'
sdk = 'macosx'
- arch = 'x86_64'
- triple = 'x86_64-apple-darwin10'
- version_min = '-mmacosx-version-min=10.6'
+ version_min = '-mmacosx-version-min=11.0'
- prefix = "#ifdef __x86_64__\n\n"
- suffix = "\n\n#endif"
- src_dir = 'x86'
- src_files = ['unix64.S', 'ffi64.c', 'ffiw64.c', 'win64.S', 'internal64.h', 'asmnames.h']
+
+class tvos_simulator_x86_64_platform(x86_64_platform):
+ triple = 'x86_64-apple-darwin13'
+ target = 'x86_64-apple-tvos-simulator'
+ directory = 'darwin_tvos'
+ sdk = 'appletvsimulator'
+ version_min = '-mtvos-version-min=9.0'
-class tvos_simulator64_platform(simulator64_platform):
+class tvos_simulator_arm64_platform(arm64_platform):
+ triple = 'aarch64-apple-darwin20'
+ target = 'arm64-apple-tvos-simulator'
directory = 'darwin_tvos'
sdk = 'appletvsimulator'
version_min = '-mtvos-version-min=9.0'
-class tvos_device64_platform(device64_platform):
+class tvos_device_arm64_platform(arm64_platform):
+ triple = 'aarch64-apple-darwin13'
+ target = 'arm64-apple-tvos'
directory = 'darwin_tvos'
sdk = 'appletvos'
version_min = '-mtvos-version-min=9.0'
-class watchos_simulator_platform(simulator_platform):
+class watchos_simulator_i386_platform(i386_platform):
+ triple = 'i386-apple-darwin11'
+ target = 'i386-apple-watchos-simulator'
+ directory = 'darwin_watchos'
+ sdk = 'watchsimulator'
+ version_min = '-mwatchos-version-min=4.0'
+
+
+class watchos_simulator_x86_64_platform(x86_64_platform):
+ triple = 'x86_64-apple-darwin13'
+ target = 'x86_64-apple-watchos-simulator'
+ directory = 'darwin_watchos'
+ sdk = 'watchsimulator'
+ version_min = '-mwatchos-version-min=4.0'
+
+
+class watchos_simulator_arm64_platform(arm64_platform):
+ triple = 'aarch64-apple-darwin20'
+ target = 'arm64-apple-watchos-simulator'
directory = 'darwin_watchos'
sdk = 'watchsimulator'
version_min = '-mwatchos-version-min=4.0'
-class watchos_device_platform(device_platform):
+class watchos_device_armv7k_platform(armv7_platform):
+ triple = 'arm-apple-darwin11'
+ target = 'armv7k-apple-watchos'
directory = 'darwin_watchos'
sdk = 'watchos'
arch = 'armv7k'
version_min = '-mwatchos-version-min=4.0'
+class watchos_device_arm64_32_platform(arm64_platform):
+ triple = 'aarch64-apple-darwin13'
+ target = 'arm64_32-apple-watchos'
+ directory = 'darwin_watchos'
+ sdk = 'watchos'
+ arch = 'arm64_32'
+ version_min = '-mwatchos-version-min=4.0'
+
+
def mkdir_p(path):
try:
os.makedirs(path)
@@ -175,7 +218,7 @@ def copy_src_platform_files(platform):
def build_target(platform, platform_headers):
def xcrun_cmd(cmd):
- return 'xcrun -sdk %s %s -arch %s' % (platform.sdk, cmd, platform.arch)
+ return 'xcrun -sdk %s %s -target %s' % (platform.sdk, cmd, platform.target)
tag='%s-%s' % (platform.sdk, platform.arch)
build_dir = 'build_%s' % tag
@@ -212,34 +255,46 @@ def generate_source_and_headers(
copy_files('include', 'darwin_common/include', pattern='*.h')
if generate_ios:
- copy_src_platform_files(ios_simulator_platform)
- copy_src_platform_files(ios_simulator64_platform)
- copy_src_platform_files(ios_device_platform)
- copy_src_platform_files(ios_device64_platform)
+ # copy_src_platform_files(ios_simulator_i386_platform)
+ copy_src_platform_files(ios_simulator_x86_64_platform)
+ copy_src_platform_files(ios_simulator_arm64_platform)
+ # copy_src_platform_files(ios_device_armv7_platform)
+ copy_src_platform_files(ios_device_arm64_platform)
if generate_osx:
- copy_src_platform_files(desktop64_platform)
+ copy_src_platform_files(desktop_x86_64_platform)
+ copy_src_platform_files(desktop_arm64_platform)
if generate_tvos:
- copy_src_platform_files(tvos_simulator64_platform)
- copy_src_platform_files(tvos_device64_platform)
+ copy_src_platform_files(tvos_simulator_x86_64_platform)
+ copy_src_platform_files(tvos_simulator_arm64_platform)
+ copy_src_platform_files(tvos_device_arm64_platform)
if generate_watchos:
- copy_src_platform_files(watchos_simulator_platform)
- copy_src_platform_files(watchos_device_platform)
+ # copy_src_platform_files(watchos_simulator_i386_platform)
+ copy_src_platform_files(watchos_simulator_x86_64_platform)
+ # copy_src_platform_files(watchos_simulator_arm64_platform)
+ copy_src_platform_files(watchos_device_armv7k_platform)
+ copy_src_platform_files(watchos_device_arm64_32_platform)
platform_headers = collections.defaultdict(set)
if generate_ios:
- build_target(ios_simulator_platform, platform_headers)
- build_target(ios_simulator64_platform, platform_headers)
- build_target(ios_device_platform, platform_headers)
- build_target(ios_device64_platform, platform_headers)
+ # build_target(ios_simulator_i386_platform, platform_headers)
+ build_target(ios_simulator_x86_64_platform, platform_headers)
+ build_target(ios_simulator_arm64_platform, platform_headers)
+ # build_target(ios_device_armv7_platform, platform_headers)
+ build_target(ios_device_arm64_platform, platform_headers)
if generate_osx:
- build_target(desktop64_platform, platform_headers)
+ build_target(desktop_x86_64_platform, platform_headers)
+ build_target(desktop_arm64_platform, platform_headers)
if generate_tvos:
- build_target(tvos_simulator64_platform, platform_headers)
- build_target(tvos_device64_platform, platform_headers)
+ build_target(tvos_simulator_x86_64_platform, platform_headers)
+ build_target(tvos_simulator_arm64_platform, platform_headers)
+ build_target(tvos_device_arm64_platform, platform_headers)
if generate_watchos:
- build_target(watchos_simulator_platform, platform_headers)
- build_target(watchos_device_platform, platform_headers)
+ # build_target(watchos_simulator_i386_platform, platform_headers)
+ build_target(watchos_simulator_x86_64_platform, platform_headers)
+ build_target(watchos_simulator_arm64_platform, platform_headers)
+ # build_target(watchos_device_armv7k_platform, platform_headers)
+ build_target(watchos_device_arm64_32_platform, platform_headers)
mkdir_p('darwin_common/include')
for header_name, tag_tuples in platform_headers.items():
diff --git a/src/closures.c b/src/closures.c
index f7bead6..db7ec94 100644
--- a/src/closures.c
+++ b/src/closures.c
@@ -134,7 +134,7 @@ ffi_tramp_is_present (__attribute__((unused)) void *ptr)
# define HAVE_MNTENT 1
# endif
# if defined(_WIN32) || defined(__OS2__)
-/* Windows systems may have Data Execution Protection (DEP) enabled,
+/* Windows systems may have Data Execution Protection (DEP) enabled,
which requires the use of VirtualMalloc/VirtualFree to alloc/free
executable memory. */
# define FFI_MMAP_EXEC_WRIT 1
@@ -230,12 +230,24 @@ ffi_trampoline_table_alloc (void)
kt = vm_remap (mach_task_self (), &trampoline_page, PAGE_MAX_SIZE, 0x0,
VM_FLAGS_OVERWRITE, mach_task_self (), trampoline_page_template,
FALSE, &cur_prot, &max_prot, VM_INHERIT_SHARE);
- if (kt != KERN_SUCCESS || !(cur_prot & VM_PROT_EXECUTE))
+ if (kt != KERN_SUCCESS)
{
vm_deallocate (mach_task_self (), config_page, PAGE_MAX_SIZE * 2);
return NULL;
}
+ if (!(cur_prot & VM_PROT_EXECUTE))
+ {
+ /* If VM_PROT_EXECUTE isn't set on the remapped trampoline page, set it */
+ kt = vm_protect (mach_task_self (), trampoline_page, PAGE_MAX_SIZE,
+ FALSE, cur_prot | VM_PROT_EXECUTE);
+ if (kt != KERN_SUCCESS)
+ {
+ vm_deallocate (mach_task_self (), config_page, PAGE_MAX_SIZE * 2);
+ return NULL;
+ }
+ }
+
/* We have valid trampoline and config pages */
table = calloc (1, sizeof (ffi_trampoline_table));
table->free_count = FFI_TRAMPOLINE_COUNT;