From b5ee395710e2db830749c3c95558c91b66ac111f Mon Sep 17 00:00:00 2001 From: Anthony Green Date: Sat, 5 May 2018 07:41:53 -0400 Subject: [PATCH] Revert "Remove some symbol exports and cleanup newline warnings (#433)" This reverts commit a5a0f3cf36dfb4d64316414a872288c3170e6c1d. --- generate-darwin-source-and-headers.py | 12 ++++++------ src/aarch64/sysv.S | 6 ------ src/x86/sysv.S | 9 --------- src/x86/unix64.S | 5 ----- src/x86/win64.S | 3 --- 5 files changed, 6 insertions(+), 29 deletions(-) diff --git a/generate-darwin-source-and-headers.py b/generate-darwin-source-and-headers.py index 0a19582d..f7fc414b 100755 --- a/generate-darwin-source-and-headers.py +++ b/generate-darwin-source-and-headers.py @@ -17,7 +17,7 @@ class simulator_platform(Platform): version_min = '-miphoneos-version-min=7.0' prefix = "#ifdef __i386__\n\n" - suffix = "\n\n#endif\n" + suffix = "\n\n#endif" src_dir = 'x86' src_files = ['sysv.S', 'ffi.c', 'internal.h'] @@ -30,7 +30,7 @@ class simulator64_platform(Platform): version_min = '-miphoneos-version-min=7.0' prefix = "#ifdef __x86_64__\n\n" - suffix = "\n\n#endif\n" + suffix = "\n\n#endif" src_dir = 'x86' src_files = ['unix64.S', 'ffi64.c', 'ffiw64.c', 'win64.S', 'internal64.h', 'asmnames.h'] @@ -43,7 +43,7 @@ class device_platform(Platform): version_min = '-miphoneos-version-min=7.0' prefix = "#ifdef __arm__\n\n" - suffix = "\n\n#endif\n" + suffix = "\n\n#endif" src_dir = 'arm' src_files = ['sysv.S', 'ffi.c', 'internal.h'] @@ -56,7 +56,7 @@ class device64_platform(Platform): version_min = '-miphoneos-version-min=7.0' prefix = "#ifdef __arm64__\n\n" - suffix = "\n\n#endif\n" + suffix = "\n\n#endif" src_dir = 'aarch64' src_files = ['sysv.S', 'ffi.c', 'internal.h'] @@ -71,7 +71,7 @@ class desktop32_platform(Platform): src_files = ['sysv.S', 'ffi.c', 'internal.h'] prefix = "#ifdef __i386__\n\n" - suffix = "\n\n#endif\n" + suffix = "\n\n#endif" class desktop64_platform(Platform): @@ -82,7 +82,7 @@ class desktop64_platform(Platform): version_min = '-mmacosx-version-min=10.6' prefix = "#ifdef __x86_64__\n\n" - suffix = "\n\n#endif\n" + suffix = "\n\n#endif" src_dir = 'x86' src_files = ['unix64.S', 'ffi64.c', 'ffiw64.c', 'win64.S', 'internal64.h', 'asmnames.h'] diff --git a/src/aarch64/sysv.S b/src/aarch64/sysv.S index 99ab1774..d12bf27b 100644 --- a/src/aarch64/sysv.S +++ b/src/aarch64/sysv.S @@ -198,7 +198,6 @@ CNAME(ffi_call_SYSV): cfi_endproc .globl CNAME(ffi_call_SYSV) - .private_extern CNAME(ffi_call_SYSV) #ifdef __ELF__ .type CNAME(ffi_call_SYSV), #function .hidden CNAME(ffi_call_SYSV) @@ -238,7 +237,6 @@ CNAME(ffi_closure_SYSV_V): cfi_endproc .globl CNAME(ffi_closure_SYSV_V) - .private_extern CNAME(ffi_closure_SYSV_V) #ifdef __ELF__ .type CNAME(ffi_closure_SYSV_V), #function .hidden CNAME(ffi_closure_SYSV_V) @@ -351,7 +349,6 @@ CNAME(ffi_closure_SYSV): cfi_endproc .globl CNAME(ffi_closure_SYSV) - .private_extern CNAME(ffi_closure_SYSV) #ifdef __ELF__ .type CNAME(ffi_closure_SYSV), #function .hidden CNAME(ffi_closure_SYSV) @@ -372,7 +369,6 @@ CNAME(ffi_closure_trampoline_table_page): .endr .globl CNAME(ffi_closure_trampoline_table_page) - .private_extern CNAME(ffi_closure_trampoline_table_page) #ifdef __ELF__ .type CNAME(ffi_closure_trampoline_table_page), #function .hidden CNAME(ffi_closure_trampoline_table_page) @@ -400,7 +396,6 @@ CNAME(ffi_go_closure_SYSV_V): cfi_endproc .globl CNAME(ffi_go_closure_SYSV_V) - .private_extern CNAME(ffi_go_closure_SYSV_V) #ifdef __ELF__ .type CNAME(ffi_go_closure_SYSV_V), #function .hidden CNAME(ffi_go_closure_SYSV_V) @@ -430,7 +425,6 @@ CNAME(ffi_go_closure_SYSV): cfi_endproc .globl CNAME(ffi_go_closure_SYSV) - .private_extern CNAME(ffi_go_closure_SYSV) #ifdef __ELF__ .type CNAME(ffi_go_closure_SYSV), #function .hidden CNAME(ffi_go_closure_SYSV) diff --git a/src/x86/sysv.S b/src/x86/sysv.S index 2ce6c9ad..27379a48 100644 --- a/src/x86/sysv.S +++ b/src/x86/sysv.S @@ -76,7 +76,6 @@ .text .balign 16 .globl ffi_call_i386 - .private_extern ffi_call_i386 FFI_HIDDEN(ffi_call_i386) /* This is declared as @@ -293,7 +292,6 @@ L(C1(UW,UWN)): \ .balign 16 .globl C(ffi_go_closure_EAX) - .private_extern C(ffi_go_closure_EAX) FFI_HIDDEN(C(ffi_go_closure_EAX)) C(ffi_go_closure_EAX): L(UW6): @@ -314,7 +312,6 @@ ENDF(C(ffi_go_closure_EAX)) .balign 16 .globl C(ffi_go_closure_ECX) - .private_extern C(ffi_go_closure_ECX) FFI_HIDDEN(C(ffi_go_closure_ECX)) C(ffi_go_closure_ECX): L(UW9): @@ -338,7 +335,6 @@ ENDF(C(ffi_go_closure_ECX)) .balign 16 .globl C(ffi_closure_i386) - .private_extern C(ffi_closure_i386) FFI_HIDDEN(C(ffi_closure_i386)) C(ffi_closure_i386): @@ -423,7 +419,6 @@ ENDF(C(ffi_closure_i386)) .balign 16 .globl C(ffi_go_closure_STDCALL) - .private_extern C(ffi_go_closure_STDCALL) FFI_HIDDEN(C(ffi_go_closure_STDCALL)) C(ffi_go_closure_STDCALL): L(UW21): @@ -447,7 +442,6 @@ ENDF(C(ffi_go_closure_STDCALL)) .balign 16 .globl C(ffi_closure_REGISTER) - .private_extern C(ffi_closure_REGISTER) FFI_HIDDEN(C(ffi_closure_REGISTER)) C(ffi_closure_REGISTER): L(UW24): @@ -472,7 +466,6 @@ ENDF(C(ffi_closure_REGISTER)) .balign 16 .globl C(ffi_closure_STDCALL) - .private_extern C(ffi_closure_STDCALL) FFI_HIDDEN(C(ffi_closure_STDCALL)) C(ffi_closure_STDCALL): L(UW27): @@ -579,7 +572,6 @@ ENDF(C(ffi_closure_STDCALL)) .balign 16 .globl C(ffi_closure_raw_SYSV) - .private_extern C(ffi_closure_raw_SYSV) FFI_HIDDEN(C(ffi_closure_raw_SYSV)) C(ffi_closure_raw_SYSV): L(UW32): @@ -683,7 +675,6 @@ ENDF(C(ffi_closure_raw_SYSV)) .balign 16 .globl C(ffi_closure_raw_THISCALL) - .private_extern C(ffi_closure_raw_THISCALL) FFI_HIDDEN(C(ffi_closure_raw_THISCALL)) C(ffi_closure_raw_THISCALL): L(UW41): diff --git a/src/x86/unix64.S b/src/x86/unix64.S index fd669f9f..db792c0d 100644 --- a/src/x86/unix64.S +++ b/src/x86/unix64.S @@ -54,7 +54,6 @@ .balign 8 .globl C(ffi_call_unix64) - .private_extern C(ffi_call_unix64) FFI_HIDDEN(C(ffi_call_unix64)) C(ffi_call_unix64): @@ -224,7 +223,6 @@ ENDF(C(ffi_call_unix64)) .balign 2 .globl C(ffi_closure_unix64_sse) - .private_extern C(ffi_closure_unix64_sse) FFI_HIDDEN(C(ffi_closure_unix64_sse)) C(ffi_closure_unix64_sse): @@ -248,7 +246,6 @@ ENDF(C(ffi_closure_unix64_sse)) .balign 2 .globl C(ffi_closure_unix64) - .private_extern C(ffi_closure_unix64) FFI_HIDDEN(C(ffi_closure_unix64)) C(ffi_closure_unix64): @@ -357,7 +354,6 @@ ENDF(C(ffi_closure_unix64)) .balign 2 .globl C(ffi_go_closure_unix64_sse) - .private_extern C(ffi_go_closure_unix64_sse) FFI_HIDDEN(C(ffi_go_closure_unix64_sse)) C(ffi_go_closure_unix64_sse): @@ -381,7 +377,6 @@ ENDF(C(ffi_go_closure_unix64_sse)) .balign 2 .globl C(ffi_go_closure_unix64) - .private_extern C(ffi_go_closure_unix64) FFI_HIDDEN(C(ffi_go_closure_unix64)) C(ffi_go_closure_unix64): diff --git a/src/x86/win64.S b/src/x86/win64.S index 5e798d98..10991b4f 100644 --- a/src/x86/win64.S +++ b/src/x86/win64.S @@ -42,7 +42,6 @@ .align 8 .globl C(ffi_call_win64) - .private_extern C(ffi_call_win64) SEH(.seh_proc ffi_call_win64) C(ffi_call_win64): @@ -170,7 +169,6 @@ E(0b, FFI_TYPE_SMALL_STRUCT_4B) .align 8 .globl C(ffi_go_closure_win64) - .private_extern C(ffi_go_closure_win64) SEH(.seh_proc ffi_go_closure_win64) C(ffi_go_closure_win64): @@ -190,7 +188,6 @@ C(ffi_go_closure_win64): .align 8 .globl C(ffi_closure_win64) - .private_extern C(ffi_closure_win64) SEH(.seh_proc ffi_closure_win64) C(ffi_closure_win64):