Skip to content

Commit 4720b34

Browse files
sunfishcodesunfishcode
authored
Update to musl 1.2.5. (WebAssembly#557)
See the WHATSNEW file for details. As described on the [musl homepage](https://musl.libc.org/), this also includes the two patches ([1](https://www.openwall.com/lists/musl/2025/02/13/1/1), [2](https://www.openwall.com/lists/musl/2025/02/13/1/2)) fixing CVE-2025-26519. This fixes WebAssembly#577.
1 parent e0bc5c2 commit 4720b34

File tree

240 files changed

+3955
-408
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

240 files changed

+3955
-408
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ LIBC_TOP_HALF_MUSL_SOURCES = \
223223
legacy/getpagesize.c \
224224
thread/thrd_sleep.c \
225225
) \
226-
$(filter-out %/procfdname.c %/syscall.c %/syscall_ret.c %/vdso.c %/version.c, \
226+
$(filter-out %/procfdname.c %/syscall.c %/syscall_ret.c %/vdso.c %/version.c %/emulate_wait4.c, \
227227
$(wildcard $(LIBC_TOP_HALF_MUSL_SRC_DIR)/internal/*.c)) \
228228
$(filter-out %/flockfile.c %/funlockfile.c %/__lockfile.c %/ftrylockfile.c \
229229
%/rename.c \

‎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/predefined-macros.txt‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1948,18 +1948,35 @@
19481948
#define T_AFSDB ns_t_afsdb
19491949
#define T_ANY ns_t_any
19501950
#define T_ATMA ns_t_atma
1951+
#define T_AVC ns_t_avc
19511952
#define T_AXFR ns_t_axfr
1953+
#define T_CAA ns_t_caa
1954+
#define T_CDNSKEY ns_t_cdnskey
1955+
#define T_CDS ns_t_cds
19521956
#define T_CNAME ns_t_cname
1957+
#define T_CSYNC ns_t_csync
1958+
#define T_DHCID ns_t_dhcid
1959+
#define T_DLV ns_t_dlv
19531960
#define T_DNAME ns_t_dname
1961+
#define T_DNSKEY ns_t_dnskey
1962+
#define T_DS ns_t_ds
19541963
#define T_EID ns_t_eid
1964+
#define T_EUI48 ns_t_eui48
1965+
#define T_EUI64 ns_t_eui64
19551966
#define T_FMT 0x2002A
19561967
#define T_FMT_AMPM 0x2002B
1968+
#define T_GID ns_t_gid
19571969
#define T_GPOS ns_t_gpos
19581970
#define T_HINFO ns_t_hinfo
1971+
#define T_HIP ns_t_hip
1972+
#define T_IPSECKEY ns_t_ipseckey
19591973
#define T_ISDN ns_t_isdn
19601974
#define T_IXFR ns_t_ixfr
19611975
#define T_KEY ns_t_key
1976+
#define T_L32 ns_t_l32
1977+
#define T_L64 ns_t_l64
19621978
#define T_LOC ns_t_loc
1979+
#define T_LP ns_t_lp
19631980
#define T_MAILA ns_t_maila
19641981
#define T_MAILB ns_t_mailb
19651982
#define T_MB ns_t_mb
@@ -1970,21 +1987,40 @@
19701987
#define T_MR ns_t_mr
19711988
#define T_MX ns_t_mx
19721989
#define T_NAPTR ns_t_naptr
1990+
#define T_NID ns_t_nid
19731991
#define T_NIMLOC ns_t_nimloc
1992+
#define T_NINFO ns_t_ninfo
19741993
#define T_NS ns_t_ns
19751994
#define T_NSAP ns_t_nsap
19761995
#define T_NSAP_PTR ns_t_nsap_ptr
1996+
#define T_NSEC ns_t_nsec
1997+
#define T_NSEC3 ns_t_nsec3
1998+
#define T_NSEC3PARAM ns_t_nsec3param
19771999
#define T_NULL ns_t_null
19782000
#define T_NXT ns_t_nxt
2001+
#define T_OPENPGPKEY ns_t_openpgpkey
19792002
#define T_PTR ns_t_ptr
19802003
#define T_PX ns_t_px
2004+
#define T_RKEY ns_t_rkey
19812005
#define T_RP ns_t_rp
2006+
#define T_RRSIG ns_t_rrsig
19822007
#define T_RT ns_t_rt
19832008
#define T_SIG ns_t_sig
2009+
#define T_SMIMEA ns_t_smimea
19842010
#define T_SOA ns_t_soa
2011+
#define T_SPF ns_t_spf
19852012
#define T_SRV ns_t_srv
2013+
#define T_SSHFP ns_t_sshfp
2014+
#define T_TA ns_t_ta
2015+
#define T_TALINK ns_t_talink
2016+
#define T_TKEY ns_t_tkey
2017+
#define T_TLSA ns_t_tlsa
19862018
#define T_TSIG ns_t_tsig
19872019
#define T_TXT ns_t_txt
2020+
#define T_UID ns_t_uid
2021+
#define T_UINFO ns_t_uinfo
2022+
#define T_UNSPEC ns_t_unspec
2023+
#define T_URI ns_t_uri
19882024
#define T_WKS ns_t_wks
19892025
#define T_X25 ns_t_x25
19902026
#define UCHAR_MAX 255
@@ -2090,6 +2126,8 @@
20902126
#define _CS_POSIX_V7_LPBIG_OFFBIG_LDFLAGS 1145
20912127
#define _CS_POSIX_V7_LPBIG_OFFBIG_LIBS 1146
20922128
#define _CS_POSIX_V7_LPBIG_OFFBIG_LINTFLAGS 1147
2129+
#define _CS_POSIX_V7_THREADS_CFLAGS 1150
2130+
#define _CS_POSIX_V7_THREADS_LDFLAGS 1151
20932131
#define _CS_POSIX_V7_WIDTH_RESTRICTED_ENVS 5
20942132
#define _CS_V6_ENV 1148
20952133
#define _CS_V7_ENV 1149
@@ -2283,6 +2321,7 @@
22832321
#define _SC_MEMLOCK_RANGE 18
22842322
#define _SC_MEMORY_PROTECTION 19
22852323
#define _SC_MESSAGE_PASSING 20
2324+
#define _SC_MINSIGSTKSZ 249
22862325
#define _SC_MONOTONIC_CLOCK 149
22872326
#define _SC_MQ_OPEN_MAX 27
22882327
#define _SC_MQ_PRIO_MAX 28
@@ -2310,6 +2349,7 @@
23102349
#define _SC_SHARED_MEMORY_OBJECTS 22
23112350
#define _SC_SHELL 157
23122351
#define _SC_SIGQUEUE_MAX 34
2352+
#define _SC_SIGSTKSZ 250
23132353
#define _SC_SPAWN 159
23142354
#define _SC_SPIN_LOCKS 154
23152355
#define _SC_SPORADIC_SERVER 160

‎expected/wasm32-wasip2/predefined-macros.txt‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2098,18 +2098,35 @@
20982098
#define T_AFSDB ns_t_afsdb
20992099
#define T_ANY ns_t_any
21002100
#define T_ATMA ns_t_atma
2101+
#define T_AVC ns_t_avc
21012102
#define T_AXFR ns_t_axfr
2103+
#define T_CAA ns_t_caa
2104+
#define T_CDNSKEY ns_t_cdnskey
2105+
#define T_CDS ns_t_cds
21022106
#define T_CNAME ns_t_cname
2107+
#define T_CSYNC ns_t_csync
2108+
#define T_DHCID ns_t_dhcid
2109+
#define T_DLV ns_t_dlv
21032110
#define T_DNAME ns_t_dname
2111+
#define T_DNSKEY ns_t_dnskey
2112+
#define T_DS ns_t_ds
21042113
#define T_EID ns_t_eid
2114+
#define T_EUI48 ns_t_eui48
2115+
#define T_EUI64 ns_t_eui64
21052116
#define T_FMT 0x2002A
21062117
#define T_FMT_AMPM 0x2002B
2118+
#define T_GID ns_t_gid
21072119
#define T_GPOS ns_t_gpos
21082120
#define T_HINFO ns_t_hinfo
2121+
#define T_HIP ns_t_hip
2122+
#define T_IPSECKEY ns_t_ipseckey
21092123
#define T_ISDN ns_t_isdn
21102124
#define T_IXFR ns_t_ixfr
21112125
#define T_KEY ns_t_key
2126+
#define T_L32 ns_t_l32
2127+
#define T_L64 ns_t_l64
21122128
#define T_LOC ns_t_loc
2129+
#define T_LP ns_t_lp
21132130
#define T_MAILA ns_t_maila
21142131
#define T_MAILB ns_t_mailb
21152132
#define T_MB ns_t_mb
@@ -2120,21 +2137,40 @@
21202137
#define T_MR ns_t_mr
21212138
#define T_MX ns_t_mx
21222139
#define T_NAPTR ns_t_naptr
2140+
#define T_NID ns_t_nid
21232141
#define T_NIMLOC ns_t_nimloc
2142+
#define T_NINFO ns_t_ninfo
21242143
#define T_NS ns_t_ns
21252144
#define T_NSAP ns_t_nsap
21262145
#define T_NSAP_PTR ns_t_nsap_ptr
2146+
#define T_NSEC ns_t_nsec
2147+
#define T_NSEC3 ns_t_nsec3
2148+
#define T_NSEC3PARAM ns_t_nsec3param
21272149
#define T_NULL ns_t_null
21282150
#define T_NXT ns_t_nxt
2151+
#define T_OPENPGPKEY ns_t_openpgpkey
21292152
#define T_PTR ns_t_ptr
21302153
#define T_PX ns_t_px
2154+
#define T_RKEY ns_t_rkey
21312155
#define T_RP ns_t_rp
2156+
#define T_RRSIG ns_t_rrsig
21322157
#define T_RT ns_t_rt
21332158
#define T_SIG ns_t_sig
2159+
#define T_SMIMEA ns_t_smimea
21342160
#define T_SOA ns_t_soa
2161+
#define T_SPF ns_t_spf
21352162
#define T_SRV ns_t_srv
2163+
#define T_SSHFP ns_t_sshfp
2164+
#define T_TA ns_t_ta
2165+
#define T_TALINK ns_t_talink
2166+
#define T_TKEY ns_t_tkey
2167+
#define T_TLSA ns_t_tlsa
21362168
#define T_TSIG ns_t_tsig
21372169
#define T_TXT ns_t_txt
2170+
#define T_UID ns_t_uid
2171+
#define T_UINFO ns_t_uinfo
2172+
#define T_UNSPEC ns_t_unspec
2173+
#define T_URI ns_t_uri
21382174
#define T_WKS ns_t_wks
21392175
#define T_X25 ns_t_x25
21402176
#define UCHAR_MAX 255
@@ -2240,6 +2276,8 @@
22402276
#define _CS_POSIX_V7_LPBIG_OFFBIG_LDFLAGS 1145
22412277
#define _CS_POSIX_V7_LPBIG_OFFBIG_LIBS 1146
22422278
#define _CS_POSIX_V7_LPBIG_OFFBIG_LINTFLAGS 1147
2279+
#define _CS_POSIX_V7_THREADS_CFLAGS 1150
2280+
#define _CS_POSIX_V7_THREADS_LDFLAGS 1151
22432281
#define _CS_POSIX_V7_WIDTH_RESTRICTED_ENVS 5
22442282
#define _CS_V6_ENV 1148
22452283
#define _CS_V7_ENV 1149
@@ -2434,6 +2472,7 @@
24342472
#define _SC_MEMLOCK_RANGE 18
24352473
#define _SC_MEMORY_PROTECTION 19
24362474
#define _SC_MESSAGE_PASSING 20
2475+
#define _SC_MINSIGSTKSZ 249
24372476
#define _SC_MONOTONIC_CLOCK 149
24382477
#define _SC_MQ_OPEN_MAX 27
24392478
#define _SC_MQ_PRIO_MAX 28
@@ -2461,6 +2500,7 @@
24612500
#define _SC_SHARED_MEMORY_OBJECTS 22
24622501
#define _SC_SHELL 157
24632502
#define _SC_SIGQUEUE_MAX 34
2503+
#define _SC_SIGSTKSZ 250
24642504
#define _SC_SPAWN 159
24652505
#define _SC_SPIN_LOCKS 154
24662506
#define _SC_SPORADIC_SERVER 160

‎libc-top-half/musl/INSTALL‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,16 @@ and ABI combinations:
9797

9898
* OpenRISC 1000 (or1k)
9999

100-
* RISC-V 64
100+
* RISC-V
101+
* 32-bit and 64-bit
101102
* Little endian
102103
* Hard, soft, and hard-single/soft-double floating point ABIs
103104
* Standard ELF; no shared-text NOMMU support
104105

106+
* LoongArch
107+
* 64-bit ISA
108+
* Hard, soft, and hard-single/soft-double floating point ABIs
109+
105110

106111

107112
Build and Installation Procedure

‎libc-top-half/musl/VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.2.3
1+
1.2.5

0 commit comments

Comments
 (0)