From 5019f90b607c0329613dd43e26be79d82fc8010e Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Fri, 7 May 2021 20:48:45 -0700 Subject: [PATCH] followup #17944, remove other `abi` fields --- lib/posix/posix_linux_amd64.nim | 17 ----------------- lib/posix/posix_nintendoswitch.nim | 16 +--------------- lib/system/ansi_c.nim | 2 +- lib/system/threadlocalstorage.nim | 3 --- 4 files changed, 2 insertions(+), 36 deletions(-) diff --git a/lib/posix/posix_linux_amd64.nim b/lib/posix/posix_linux_amd64.nim index 7f6a589f0850..0c6e3f38ded0 100644 --- a/lib/posix/posix_linux_amd64.nim +++ b/lib/posix/posix_linux_amd64.nim @@ -150,35 +150,24 @@ type Pid* {.importc: "pid_t", header: "".} = cint Pthread_attr* {.importc: "pthread_attr_t", header: "", pure, final.} = object - abi: array[56 div sizeof(clong), clong] - Pthread_barrier* {.importc: "pthread_barrier_t", header: "", pure, final.} = object - abi: array[32 div sizeof(clong), clong] Pthread_barrierattr* {.importc: "pthread_barrierattr_t", header: "", pure, final.} = object - abi: array[4 div sizeof(cint), cint] - Pthread_cond* {.importc: "pthread_cond_t", header: "", pure, final.} = object - abi: array[48 div sizeof(clonglong), clonglong] Pthread_condattr* {.importc: "pthread_condattr_t", header: "", pure, final.} = object - abi: array[4 div sizeof(cint), cint] Pthread_key* {.importc: "pthread_key_t", header: "".} = cuint Pthread_mutex* {.importc: "pthread_mutex_t", header: "", pure, final.} = object - abi: array[48 div sizeof(clong), clong] Pthread_mutexattr* {.importc: "pthread_mutexattr_t", header: "", pure, final.} = object - abi: array[4 div sizeof(cint), cint] Pthread_once* {.importc: "pthread_once_t", header: "".} = cint Pthread_rwlock* {.importc: "pthread_rwlock_t", header: "", pure, final.} = object - abi: array[56 div sizeof(clong), clong] Pthread_rwlockattr* {.importc: "pthread_rwlockattr_t", header: "".} = object - abi: array[8 div sizeof(clong), clong] Pthread_spinlock* {.importc: "pthread_spinlock_t", header: "".} = cint Pthread* {.importc: "pthread_t", header: "".} = culong @@ -201,8 +190,6 @@ type domainname*: array[65, char] Sem* {.importc: "sem_t", header: "", final, pure.} = object - abi: array[32 div sizeof(clong), clong] - Ipc_perm* {.importc: "struct ipc_perm", header: "", final, pure.} = object ## struct ipc_perm key: Key @@ -286,8 +273,6 @@ type ## accessed as an atomic entity, even in the presence of asynchronous ## interrupts. Sigset* {.importc: "sigset_t", header: "", final, pure.} = object - abi: array[1024 div (8 * sizeof(culong)), culong] - SigEvent* {.importc: "struct sigevent", header: "", final, pure.} = object ## struct sigevent sigev_value*: SigVal ## Signal value. @@ -295,7 +280,6 @@ type sigev_notify*: cint ## Notification type. sigev_notify_function*: proc (x: SigVal) {.noconv.} ## Notification func. sigev_notify_attributes*: ptr Pthread_attr ## Notification attributes. - abi: array[12, int] SigVal* {.importc: "union sigval", header: "", final, pure.} = object ## struct sigval @@ -350,7 +334,6 @@ type tv_usec*: Suseconds ## Microseconds. TFdSet* {.importc: "fd_set", header: "", final, pure.} = object - abi: array[1024 div (8 * sizeof(clong)), clong] Mcontext* {.importc: "mcontext_t", header: "", final, pure.} = object diff --git a/lib/posix/posix_nintendoswitch.nim b/lib/posix/posix_nintendoswitch.nim index 44e431437995..40bb16ce17ac 100644 --- a/lib/posix/posix_nintendoswitch.nim +++ b/lib/posix/posix_nintendoswitch.nim @@ -129,35 +129,24 @@ type Pid* {.importc: "pid_t", header: "".} = cint Pthread_attr* {.importc: "pthread_attr_t", header: "", pure, final.} = object - abi: array[56 div sizeof(clong), clong] - Pthread_barrier* {.importc: "pthread_barrier_t", header: "", pure, final.} = object - abi: array[32 div sizeof(clong), clong] Pthread_barrierattr* {.importc: "pthread_barrierattr_t", header: "", pure, final.} = object - abi: array[4 div sizeof(cint), cint] - Pthread_cond* {.importc: "pthread_cond_t", header: "", pure, final.} = object - abi: array[48 div sizeof(clonglong), clonglong] Pthread_condattr* {.importc: "pthread_condattr_t", header: "", pure, final.} = object - abi: array[4 div sizeof(cint), cint] Pthread_key* {.importc: "pthread_key_t", header: "".} = cuint Pthread_mutex* {.importc: "pthread_mutex_t", header: "", pure, final.} = object - abi: array[48 div sizeof(clong), clong] Pthread_mutexattr* {.importc: "pthread_mutexattr_t", header: "", pure, final.} = object - abi: array[4 div sizeof(cint), cint] Pthread_once* {.importc: "pthread_once_t", header: "".} = cint Pthread_rwlock* {.importc: "pthread_rwlock_t", header: "", pure, final.} = object - abi: array[56 div sizeof(clong), clong] Pthread_rwlockattr* {.importc: "pthread_rwlockattr_t", header: "".} = object - abi: array[8 div sizeof(clong), clong] Pthread_spinlock* {.importc: "pthread_spinlock_t", header: "".} = cint Pthread* {.importc: "pthread_t", header: "".} = culong @@ -180,7 +169,6 @@ type domainname*: array[65, char] Sem* {.importc: "sem_t", header: "", final, pure.} = object - abi: array[32 div sizeof(clong), clong] Stat* {.importc: "struct stat", header: "", final, pure.} = object ## struct stat @@ -305,9 +293,7 @@ type final, pure.} = object ## struct timeval tv_sec*: Time ## Seconds. tv_usec*: Suseconds ## Microseconds. - TFdSet* {.importc: "fd_set", header: "", - final, pure.} = object - abi: array[((64+(sizeof(clong) * 8)-1) div (sizeof(clong) * 8)), clong] + TFdSet* {.importc: "fd_set", header: "", final, pure.} = object proc si_pid*(info: SigInfo): Pid = ## This might not be correct behavior. si_pid doesn't exist in Switch's diff --git a/lib/system/ansi_c.nim b/lib/system/ansi_c.nim index e5f26e07036e..eda4373b17a5 100644 --- a/lib/system/ansi_c.nim +++ b/lib/system/ansi_c.nim @@ -34,7 +34,7 @@ proc c_abort*() {. when defined(linux) and defined(amd64): type C_JmpBuf* {.importc: "jmp_buf", header: "", bycopy.} = object - abi: array[200 div sizeof(clong), clong] + # xxx why `bycopy` only here and not in other `C_JmpBuf` declaration? else: type C_JmpBuf* {.importc: "jmp_buf", header: "".} = object diff --git a/lib/system/threadlocalstorage.nim b/lib/system/threadlocalstorage.nim index 30962ef77fcf..5deff14f2c5f 100644 --- a/lib/system/threadlocalstorage.nim +++ b/lib/system/threadlocalstorage.nim @@ -132,7 +132,6 @@ else: header: "" .} = distinct culong Pthread_attr {.importc: "pthread_attr_t", header: "".} = object - abi: array[56 div sizeof(clong), clong] ThreadVarSlot {.importc: "pthread_key_t", header: "".} = distinct cuint elif defined(openbsd) and defined(amd64): @@ -190,8 +189,6 @@ else: result = pthread_getspecific(s) type CpuSet {.importc: "cpu_set_t", header: schedh.} = object - when defined(linux) and defined(amd64): - abi: array[1024 div (8 * sizeof(culong)), culong] proc cpusetZero(s: var CpuSet) {.importc: "CPU_ZERO", header: schedh.} proc cpusetIncl(cpu: cint; s: var CpuSet) {.