Skip to content

Commit bd61b62

Browse files
committed
More updates. Disable __pthread_key_atfork.
1 parent cbe0f81 commit bd61b62

File tree

4 files changed

+42
-2
lines changed

4 files changed

+42
-2
lines changed

expected/wasm32-wasip1-threads/predefined-macros.txt

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1950,18 +1950,35 @@
19501950
#define T_AFSDB ns_t_afsdb
19511951
#define T_ANY ns_t_any
19521952
#define T_ATMA ns_t_atma
1953+
#define T_AVC ns_t_avc
19531954
#define T_AXFR ns_t_axfr
1955+
#define T_CAA ns_t_caa
1956+
#define T_CDNSKEY ns_t_cdnskey
1957+
#define T_CDS ns_t_cds
19541958
#define T_CNAME ns_t_cname
1959+
#define T_CSYNC ns_t_csync
1960+
#define T_DHCID ns_t_dhcid
1961+
#define T_DLV ns_t_dlv
19551962
#define T_DNAME ns_t_dname
1963+
#define T_DNSKEY ns_t_dnskey
1964+
#define T_DS ns_t_ds
19561965
#define T_EID ns_t_eid
1966+
#define T_EUI48 ns_t_eui48
1967+
#define T_EUI64 ns_t_eui64
19571968
#define T_FMT 0x2002A
19581969
#define T_FMT_AMPM 0x2002B
1970+
#define T_GID ns_t_gid
19591971
#define T_GPOS ns_t_gpos
19601972
#define T_HINFO ns_t_hinfo
1973+
#define T_HIP ns_t_hip
1974+
#define T_IPSECKEY ns_t_ipseckey
19611975
#define T_ISDN ns_t_isdn
19621976
#define T_IXFR ns_t_ixfr
19631977
#define T_KEY ns_t_key
1978+
#define T_L32 ns_t_l32
1979+
#define T_L64 ns_t_l64
19641980
#define T_LOC ns_t_loc
1981+
#define T_LP ns_t_lp
19651982
#define T_MAILA ns_t_maila
19661983
#define T_MAILB ns_t_mailb
19671984
#define T_MB ns_t_mb
@@ -1972,21 +1989,40 @@
19721989
#define T_MR ns_t_mr
19731990
#define T_MX ns_t_mx
19741991
#define T_NAPTR ns_t_naptr
1992+
#define T_NID ns_t_nid
19751993
#define T_NIMLOC ns_t_nimloc
1994+
#define T_NINFO ns_t_ninfo
19761995
#define T_NS ns_t_ns
19771996
#define T_NSAP ns_t_nsap
19781997
#define T_NSAP_PTR ns_t_nsap_ptr
1998+
#define T_NSEC ns_t_nsec
1999+
#define T_NSEC3 ns_t_nsec3
2000+
#define T_NSEC3PARAM ns_t_nsec3param
19792001
#define T_NULL ns_t_null
19802002
#define T_NXT ns_t_nxt
2003+
#define T_OPENPGPKEY ns_t_openpgpkey
19812004
#define T_PTR ns_t_ptr
19822005
#define T_PX ns_t_px
2006+
#define T_RKEY ns_t_rkey
19832007
#define T_RP ns_t_rp
2008+
#define T_RRSIG ns_t_rrsig
19842009
#define T_RT ns_t_rt
19852010
#define T_SIG ns_t_sig
2011+
#define T_SMIMEA ns_t_smimea
19862012
#define T_SOA ns_t_soa
2013+
#define T_SPF ns_t_spf
19872014
#define T_SRV ns_t_srv
2015+
#define T_SSHFP ns_t_sshfp
2016+
#define T_TA ns_t_ta
2017+
#define T_TALINK ns_t_talink
2018+
#define T_TKEY ns_t_tkey
2019+
#define T_TLSA ns_t_tlsa
19882020
#define T_TSIG ns_t_tsig
19892021
#define T_TXT ns_t_txt
2022+
#define T_UID ns_t_uid
2023+
#define T_UINFO ns_t_uinfo
2024+
#define T_UNSPEC ns_t_unspec
2025+
#define T_URI ns_t_uri
19902026
#define T_WKS ns_t_wks
19912027
#define T_X25 ns_t_x25
19922028
#define UCHAR_MAX 255
@@ -2092,6 +2128,8 @@
20922128
#define _CS_POSIX_V7_LPBIG_OFFBIG_LDFLAGS 1145
20932129
#define _CS_POSIX_V7_LPBIG_OFFBIG_LIBS 1146
20942130
#define _CS_POSIX_V7_LPBIG_OFFBIG_LINTFLAGS 1147
2131+
#define _CS_POSIX_V7_THREADS_CFLAGS 1150
2132+
#define _CS_POSIX_V7_THREADS_LDFLAGS 1151
20952133
#define _CS_POSIX_V7_WIDTH_RESTRICTED_ENVS 5
20962134
#define _CS_V6_ENV 1148
20972135
#define _CS_V7_ENV 1149
@@ -2290,6 +2328,7 @@
22902328
#define _SC_MEMLOCK_RANGE 18
22912329
#define _SC_MEMORY_PROTECTION 19
22922330
#define _SC_MESSAGE_PASSING 20
2331+
#define _SC_MINSIGSTKSZ 249
22932332
#define _SC_MONOTONIC_CLOCK 149
22942333
#define _SC_MQ_OPEN_MAX 27
22952334
#define _SC_MQ_PRIO_MAX 28
@@ -2317,6 +2356,7 @@
23172356
#define _SC_SHARED_MEMORY_OBJECTS 22
23182357
#define _SC_SHELL 157
23192358
#define _SC_SIGQUEUE_MAX 34
2359+
#define _SC_SIGSTKSZ 250
23202360
#define _SC_SPAWN 159
23212361
#define _SC_SPIN_LOCKS 154
23222362
#define _SC_SPORADIC_SERVER 160

expected/wasm32-wasip1/defined-symbols.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,6 @@ __pthread_cond_timedwait
184184
__pthread_create
185185
__pthread_detach
186186
__pthread_join
187-
__pthread_key_atfork
188187
__pthread_key_create
189188
__pthread_key_delete
190189
__pthread_mutex_consistent

expected/wasm32-wasip2/defined-symbols.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,6 @@ __pthread_cond_timedwait
187187
__pthread_create
188188
__pthread_detach
189189
__pthread_join
190-
__pthread_key_atfork
191190
__pthread_key_create
192191
__pthread_key_delete
193192
__pthread_mutex_consistent

libc-top-half/musl/src/thread/pthread_key_create.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,14 @@ static void dummy_0(void)
2121
weak_alias(dummy_0, __tl_lock);
2222
weak_alias(dummy_0, __tl_unlock);
2323

24+
#ifdef __wasilibc_unmodified_upstream // WASI lacks fork
2425
void __pthread_key_atfork(int who)
2526
{
2627
if (who<0) __pthread_rwlock_rdlock(&key_lock);
2728
else if (!who) __pthread_rwlock_unlock(&key_lock);
2829
else key_lock = (pthread_rwlock_t)PTHREAD_RWLOCK_INITIALIZER;
2930
}
31+
#endif
3032

3133
int __pthread_key_create(pthread_key_t *k, void (*dtor)(void *))
3234
{

0 commit comments

Comments
 (0)