Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit b5ee395

Browse files
committed
Revert "Remove some symbol exports and cleanup newline warnings (#433)"
This reverts commit a5a0f3c.
1 parent a5a0f3c commit b5ee395

File tree

5 files changed

+6
-29
lines changed

5 files changed

+6
-29
lines changed

generate-darwin-source-and-headers.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class simulator_platform(Platform):
1717
version_min = '-miphoneos-version-min=7.0'
1818

1919
prefix = "#ifdef __i386__\n\n"
20-
suffix = "\n\n#endif\n"
20+
suffix = "\n\n#endif"
2121
src_dir = 'x86'
2222
src_files = ['sysv.S', 'ffi.c', 'internal.h']
2323

@@ -30,7 +30,7 @@ class simulator64_platform(Platform):
3030
version_min = '-miphoneos-version-min=7.0'
3131

3232
prefix = "#ifdef __x86_64__\n\n"
33-
suffix = "\n\n#endif\n"
33+
suffix = "\n\n#endif"
3434
src_dir = 'x86'
3535
src_files = ['unix64.S', 'ffi64.c', 'ffiw64.c', 'win64.S', 'internal64.h', 'asmnames.h']
3636

@@ -43,7 +43,7 @@ class device_platform(Platform):
4343
version_min = '-miphoneos-version-min=7.0'
4444

4545
prefix = "#ifdef __arm__\n\n"
46-
suffix = "\n\n#endif\n"
46+
suffix = "\n\n#endif"
4747
src_dir = 'arm'
4848
src_files = ['sysv.S', 'ffi.c', 'internal.h']
4949

@@ -56,7 +56,7 @@ class device64_platform(Platform):
5656
version_min = '-miphoneos-version-min=7.0'
5757

5858
prefix = "#ifdef __arm64__\n\n"
59-
suffix = "\n\n#endif\n"
59+
suffix = "\n\n#endif"
6060
src_dir = 'aarch64'
6161
src_files = ['sysv.S', 'ffi.c', 'internal.h']
6262

@@ -71,7 +71,7 @@ class desktop32_platform(Platform):
7171
src_files = ['sysv.S', 'ffi.c', 'internal.h']
7272

7373
prefix = "#ifdef __i386__\n\n"
74-
suffix = "\n\n#endif\n"
74+
suffix = "\n\n#endif"
7575

7676

7777
class desktop64_platform(Platform):
@@ -82,7 +82,7 @@ class desktop64_platform(Platform):
8282
version_min = '-mmacosx-version-min=10.6'
8383

8484
prefix = "#ifdef __x86_64__\n\n"
85-
suffix = "\n\n#endif\n"
85+
suffix = "\n\n#endif"
8686
src_dir = 'x86'
8787
src_files = ['unix64.S', 'ffi64.c', 'ffiw64.c', 'win64.S', 'internal64.h', 'asmnames.h']
8888

src/aarch64/sysv.S

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,6 @@ CNAME(ffi_call_SYSV):
198198
cfi_endproc
199199

200200
.globl CNAME(ffi_call_SYSV)
201-
.private_extern CNAME(ffi_call_SYSV)
202201
#ifdef __ELF__
203202
.type CNAME(ffi_call_SYSV), #function
204203
.hidden CNAME(ffi_call_SYSV)
@@ -238,7 +237,6 @@ CNAME(ffi_closure_SYSV_V):
238237
cfi_endproc
239238

240239
.globl CNAME(ffi_closure_SYSV_V)
241-
.private_extern CNAME(ffi_closure_SYSV_V)
242240
#ifdef __ELF__
243241
.type CNAME(ffi_closure_SYSV_V), #function
244242
.hidden CNAME(ffi_closure_SYSV_V)
@@ -351,7 +349,6 @@ CNAME(ffi_closure_SYSV):
351349
cfi_endproc
352350

353351
.globl CNAME(ffi_closure_SYSV)
354-
.private_extern CNAME(ffi_closure_SYSV)
355352
#ifdef __ELF__
356353
.type CNAME(ffi_closure_SYSV), #function
357354
.hidden CNAME(ffi_closure_SYSV)
@@ -372,7 +369,6 @@ CNAME(ffi_closure_trampoline_table_page):
372369
.endr
373370

374371
.globl CNAME(ffi_closure_trampoline_table_page)
375-
.private_extern CNAME(ffi_closure_trampoline_table_page)
376372
#ifdef __ELF__
377373
.type CNAME(ffi_closure_trampoline_table_page), #function
378374
.hidden CNAME(ffi_closure_trampoline_table_page)
@@ -400,7 +396,6 @@ CNAME(ffi_go_closure_SYSV_V):
400396
cfi_endproc
401397

402398
.globl CNAME(ffi_go_closure_SYSV_V)
403-
.private_extern CNAME(ffi_go_closure_SYSV_V)
404399
#ifdef __ELF__
405400
.type CNAME(ffi_go_closure_SYSV_V), #function
406401
.hidden CNAME(ffi_go_closure_SYSV_V)
@@ -430,7 +425,6 @@ CNAME(ffi_go_closure_SYSV):
430425
cfi_endproc
431426

432427
.globl CNAME(ffi_go_closure_SYSV)
433-
.private_extern CNAME(ffi_go_closure_SYSV)
434428
#ifdef __ELF__
435429
.type CNAME(ffi_go_closure_SYSV), #function
436430
.hidden CNAME(ffi_go_closure_SYSV)

src/x86/sysv.S

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@
7676
.text
7777
.balign 16
7878
.globl ffi_call_i386
79-
.private_extern ffi_call_i386
8079
FFI_HIDDEN(ffi_call_i386)
8180

8281
/* This is declared as
@@ -293,7 +292,6 @@ L(C1(UW,UWN)): \
293292

294293
.balign 16
295294
.globl C(ffi_go_closure_EAX)
296-
.private_extern C(ffi_go_closure_EAX)
297295
FFI_HIDDEN(C(ffi_go_closure_EAX))
298296
C(ffi_go_closure_EAX):
299297
L(UW6):
@@ -314,7 +312,6 @@ ENDF(C(ffi_go_closure_EAX))
314312

315313
.balign 16
316314
.globl C(ffi_go_closure_ECX)
317-
.private_extern C(ffi_go_closure_ECX)
318315
FFI_HIDDEN(C(ffi_go_closure_ECX))
319316
C(ffi_go_closure_ECX):
320317
L(UW9):
@@ -338,7 +335,6 @@ ENDF(C(ffi_go_closure_ECX))
338335

339336
.balign 16
340337
.globl C(ffi_closure_i386)
341-
.private_extern C(ffi_closure_i386)
342338
FFI_HIDDEN(C(ffi_closure_i386))
343339

344340
C(ffi_closure_i386):
@@ -423,7 +419,6 @@ ENDF(C(ffi_closure_i386))
423419

424420
.balign 16
425421
.globl C(ffi_go_closure_STDCALL)
426-
.private_extern C(ffi_go_closure_STDCALL)
427422
FFI_HIDDEN(C(ffi_go_closure_STDCALL))
428423
C(ffi_go_closure_STDCALL):
429424
L(UW21):
@@ -447,7 +442,6 @@ ENDF(C(ffi_go_closure_STDCALL))
447442

448443
.balign 16
449444
.globl C(ffi_closure_REGISTER)
450-
.private_extern C(ffi_closure_REGISTER)
451445
FFI_HIDDEN(C(ffi_closure_REGISTER))
452446
C(ffi_closure_REGISTER):
453447
L(UW24):
@@ -472,7 +466,6 @@ ENDF(C(ffi_closure_REGISTER))
472466

473467
.balign 16
474468
.globl C(ffi_closure_STDCALL)
475-
.private_extern C(ffi_closure_STDCALL)
476469
FFI_HIDDEN(C(ffi_closure_STDCALL))
477470
C(ffi_closure_STDCALL):
478471
L(UW27):
@@ -579,7 +572,6 @@ ENDF(C(ffi_closure_STDCALL))
579572

580573
.balign 16
581574
.globl C(ffi_closure_raw_SYSV)
582-
.private_extern C(ffi_closure_raw_SYSV)
583575
FFI_HIDDEN(C(ffi_closure_raw_SYSV))
584576
C(ffi_closure_raw_SYSV):
585577
L(UW32):
@@ -683,7 +675,6 @@ ENDF(C(ffi_closure_raw_SYSV))
683675

684676
.balign 16
685677
.globl C(ffi_closure_raw_THISCALL)
686-
.private_extern C(ffi_closure_raw_THISCALL)
687678
FFI_HIDDEN(C(ffi_closure_raw_THISCALL))
688679
C(ffi_closure_raw_THISCALL):
689680
L(UW41):

src/x86/unix64.S

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454

5555
.balign 8
5656
.globl C(ffi_call_unix64)
57-
.private_extern C(ffi_call_unix64)
5857
FFI_HIDDEN(C(ffi_call_unix64))
5958

6059
C(ffi_call_unix64):
@@ -224,7 +223,6 @@ ENDF(C(ffi_call_unix64))
224223

225224
.balign 2
226225
.globl C(ffi_closure_unix64_sse)
227-
.private_extern C(ffi_closure_unix64_sse)
228226
FFI_HIDDEN(C(ffi_closure_unix64_sse))
229227

230228
C(ffi_closure_unix64_sse):
@@ -248,7 +246,6 @@ ENDF(C(ffi_closure_unix64_sse))
248246

249247
.balign 2
250248
.globl C(ffi_closure_unix64)
251-
.private_extern C(ffi_closure_unix64)
252249
FFI_HIDDEN(C(ffi_closure_unix64))
253250

254251
C(ffi_closure_unix64):
@@ -357,7 +354,6 @@ ENDF(C(ffi_closure_unix64))
357354

358355
.balign 2
359356
.globl C(ffi_go_closure_unix64_sse)
360-
.private_extern C(ffi_go_closure_unix64_sse)
361357
FFI_HIDDEN(C(ffi_go_closure_unix64_sse))
362358

363359
C(ffi_go_closure_unix64_sse):
@@ -381,7 +377,6 @@ ENDF(C(ffi_go_closure_unix64_sse))
381377

382378
.balign 2
383379
.globl C(ffi_go_closure_unix64)
384-
.private_extern C(ffi_go_closure_unix64)
385380
FFI_HIDDEN(C(ffi_go_closure_unix64))
386381

387382
C(ffi_go_closure_unix64):

src/x86/win64.S

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242

4343
.align 8
4444
.globl C(ffi_call_win64)
45-
.private_extern C(ffi_call_win64)
4645

4746
SEH(.seh_proc ffi_call_win64)
4847
C(ffi_call_win64):
@@ -170,7 +169,6 @@ E(0b, FFI_TYPE_SMALL_STRUCT_4B)
170169

171170
.align 8
172171
.globl C(ffi_go_closure_win64)
173-
.private_extern C(ffi_go_closure_win64)
174172

175173
SEH(.seh_proc ffi_go_closure_win64)
176174
C(ffi_go_closure_win64):
@@ -190,7 +188,6 @@ C(ffi_go_closure_win64):
190188

191189
.align 8
192190
.globl C(ffi_closure_win64)
193-
.private_extern C(ffi_closure_win64)
194191

195192
SEH(.seh_proc ffi_closure_win64)
196193
C(ffi_closure_win64):

0 commit comments

Comments
 (0)