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

Skip to content

Commit a5a0f3c

Browse files
jeremyhuatgreen
jeremyhu
authored and
atgreen
committed
Remove some symbol exports and cleanup newline warnings (#433)
* build: Ensure darwin generated sources end with a new line Signed-off-by: Jeremy Huddleston Sequoia <[email protected]> * build: Use .private_extern where missing to prevent exporting symbols that are not API Signed-off-by: Jeremy Huddleston Sequoia <[email protected]>
1 parent d3c54cf commit a5a0f3c

File tree

5 files changed

+29
-6
lines changed

5 files changed

+29
-6
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"
20+
suffix = "\n\n#endif\n"
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"
33+
suffix = "\n\n#endif\n"
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"
46+
suffix = "\n\n#endif\n"
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"
59+
suffix = "\n\n#endif\n"
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"
74+
suffix = "\n\n#endif\n"
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"
85+
suffix = "\n\n#endif\n"
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: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ CNAME(ffi_call_SYSV):
198198
cfi_endproc
199199

200200
.globl CNAME(ffi_call_SYSV)
201+
.private_extern CNAME(ffi_call_SYSV)
201202
#ifdef __ELF__
202203
.type CNAME(ffi_call_SYSV), #function
203204
.hidden CNAME(ffi_call_SYSV)
@@ -237,6 +238,7 @@ CNAME(ffi_closure_SYSV_V):
237238
cfi_endproc
238239

239240
.globl CNAME(ffi_closure_SYSV_V)
241+
.private_extern CNAME(ffi_closure_SYSV_V)
240242
#ifdef __ELF__
241243
.type CNAME(ffi_closure_SYSV_V), #function
242244
.hidden CNAME(ffi_closure_SYSV_V)
@@ -349,6 +351,7 @@ CNAME(ffi_closure_SYSV):
349351
cfi_endproc
350352

351353
.globl CNAME(ffi_closure_SYSV)
354+
.private_extern CNAME(ffi_closure_SYSV)
352355
#ifdef __ELF__
353356
.type CNAME(ffi_closure_SYSV), #function
354357
.hidden CNAME(ffi_closure_SYSV)
@@ -369,6 +372,7 @@ CNAME(ffi_closure_trampoline_table_page):
369372
.endr
370373

371374
.globl CNAME(ffi_closure_trampoline_table_page)
375+
.private_extern CNAME(ffi_closure_trampoline_table_page)
372376
#ifdef __ELF__
373377
.type CNAME(ffi_closure_trampoline_table_page), #function
374378
.hidden CNAME(ffi_closure_trampoline_table_page)
@@ -396,6 +400,7 @@ CNAME(ffi_go_closure_SYSV_V):
396400
cfi_endproc
397401

398402
.globl CNAME(ffi_go_closure_SYSV_V)
403+
.private_extern CNAME(ffi_go_closure_SYSV_V)
399404
#ifdef __ELF__
400405
.type CNAME(ffi_go_closure_SYSV_V), #function
401406
.hidden CNAME(ffi_go_closure_SYSV_V)
@@ -425,6 +430,7 @@ CNAME(ffi_go_closure_SYSV):
425430
cfi_endproc
426431

427432
.globl CNAME(ffi_go_closure_SYSV)
433+
.private_extern CNAME(ffi_go_closure_SYSV)
428434
#ifdef __ELF__
429435
.type CNAME(ffi_go_closure_SYSV), #function
430436
.hidden CNAME(ffi_go_closure_SYSV)

‎src/x86/sysv.S

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

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

293294
.balign 16
294295
.globl C(ffi_go_closure_EAX)
296+
.private_extern C(ffi_go_closure_EAX)
295297
FFI_HIDDEN(C(ffi_go_closure_EAX))
296298
C(ffi_go_closure_EAX):
297299
L(UW6):
@@ -312,6 +314,7 @@ ENDF(C(ffi_go_closure_EAX))
312314

313315
.balign 16
314316
.globl C(ffi_go_closure_ECX)
317+
.private_extern C(ffi_go_closure_ECX)
315318
FFI_HIDDEN(C(ffi_go_closure_ECX))
316319
C(ffi_go_closure_ECX):
317320
L(UW9):
@@ -335,6 +338,7 @@ ENDF(C(ffi_go_closure_ECX))
335338

336339
.balign 16
337340
.globl C(ffi_closure_i386)
341+
.private_extern C(ffi_closure_i386)
338342
FFI_HIDDEN(C(ffi_closure_i386))
339343

340344
C(ffi_closure_i386):
@@ -419,6 +423,7 @@ ENDF(C(ffi_closure_i386))
419423

420424
.balign 16
421425
.globl C(ffi_go_closure_STDCALL)
426+
.private_extern C(ffi_go_closure_STDCALL)
422427
FFI_HIDDEN(C(ffi_go_closure_STDCALL))
423428
C(ffi_go_closure_STDCALL):
424429
L(UW21):
@@ -442,6 +447,7 @@ ENDF(C(ffi_go_closure_STDCALL))
442447

443448
.balign 16
444449
.globl C(ffi_closure_REGISTER)
450+
.private_extern C(ffi_closure_REGISTER)
445451
FFI_HIDDEN(C(ffi_closure_REGISTER))
446452
C(ffi_closure_REGISTER):
447453
L(UW24):
@@ -466,6 +472,7 @@ ENDF(C(ffi_closure_REGISTER))
466472

467473
.balign 16
468474
.globl C(ffi_closure_STDCALL)
475+
.private_extern C(ffi_closure_STDCALL)
469476
FFI_HIDDEN(C(ffi_closure_STDCALL))
470477
C(ffi_closure_STDCALL):
471478
L(UW27):
@@ -572,6 +579,7 @@ ENDF(C(ffi_closure_STDCALL))
572579

573580
.balign 16
574581
.globl C(ffi_closure_raw_SYSV)
582+
.private_extern C(ffi_closure_raw_SYSV)
575583
FFI_HIDDEN(C(ffi_closure_raw_SYSV))
576584
C(ffi_closure_raw_SYSV):
577585
L(UW32):
@@ -675,6 +683,7 @@ ENDF(C(ffi_closure_raw_SYSV))
675683

676684
.balign 16
677685
.globl C(ffi_closure_raw_THISCALL)
686+
.private_extern C(ffi_closure_raw_THISCALL)
678687
FFI_HIDDEN(C(ffi_closure_raw_THISCALL))
679688
C(ffi_closure_raw_THISCALL):
680689
L(UW41):

‎src/x86/unix64.S

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

5555
.balign 8
5656
.globl C(ffi_call_unix64)
57+
.private_extern C(ffi_call_unix64)
5758
FFI_HIDDEN(C(ffi_call_unix64))
5859

5960
C(ffi_call_unix64):
@@ -223,6 +224,7 @@ ENDF(C(ffi_call_unix64))
223224

224225
.balign 2
225226
.globl C(ffi_closure_unix64_sse)
227+
.private_extern C(ffi_closure_unix64_sse)
226228
FFI_HIDDEN(C(ffi_closure_unix64_sse))
227229

228230
C(ffi_closure_unix64_sse):
@@ -246,6 +248,7 @@ ENDF(C(ffi_closure_unix64_sse))
246248

247249
.balign 2
248250
.globl C(ffi_closure_unix64)
251+
.private_extern C(ffi_closure_unix64)
249252
FFI_HIDDEN(C(ffi_closure_unix64))
250253

251254
C(ffi_closure_unix64):
@@ -354,6 +357,7 @@ ENDF(C(ffi_closure_unix64))
354357

355358
.balign 2
356359
.globl C(ffi_go_closure_unix64_sse)
360+
.private_extern C(ffi_go_closure_unix64_sse)
357361
FFI_HIDDEN(C(ffi_go_closure_unix64_sse))
358362

359363
C(ffi_go_closure_unix64_sse):
@@ -377,6 +381,7 @@ ENDF(C(ffi_go_closure_unix64_sse))
377381

378382
.balign 2
379383
.globl C(ffi_go_closure_unix64)
384+
.private_extern C(ffi_go_closure_unix64)
380385
FFI_HIDDEN(C(ffi_go_closure_unix64))
381386

382387
C(ffi_go_closure_unix64):

‎src/x86/win64.S

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

4343
.align 8
4444
.globl C(ffi_call_win64)
45+
.private_extern C(ffi_call_win64)
4546

4647
SEH(.seh_proc ffi_call_win64)
4748
C(ffi_call_win64):
@@ -169,6 +170,7 @@ E(0b, FFI_TYPE_SMALL_STRUCT_4B)
169170

170171
.align 8
171172
.globl C(ffi_go_closure_win64)
173+
.private_extern C(ffi_go_closure_win64)
172174

173175
SEH(.seh_proc ffi_go_closure_win64)
174176
C(ffi_go_closure_win64):
@@ -188,6 +190,7 @@ C(ffi_go_closure_win64):
188190

189191
.align 8
190192
.globl C(ffi_closure_win64)
193+
.private_extern C(ffi_closure_win64)
191194

192195
SEH(.seh_proc ffi_closure_win64)
193196
C(ffi_closure_win64):

0 commit comments

Comments
 (0)