Skip to content

Commit 6a93f7d

Browse files
authored
Update musl to v1.2.3 (#18270)
1 parent 15bf099 commit 6a93f7d

Some content is hidden

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

71 files changed

+417
-206
lines changed

ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ See docs/process.md for more on how version tagging works.
2020

2121
3.1.28 (in development)
2222
-----------------------
23+
- musl libc updated from v1.2.2 to v1.2.3. (#18270)
2324

2425
3.1.27 - 11/29/22
2526
-----------------

system/lib/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1007,7 +1007,7 @@ uptr internal_sigprocmask(int how, __sanitizer_sigset_t *set,
10071007
#if SANITIZER_FREEBSD
10081008
return internal_syscall(SYSCALL(sigprocmask), how, set, oldset);
10091009
#elif SANITIZER_EMSCRIPTEN
1010-
return NULL;
1010+
return 0;
10111011
#else
10121012
__sanitizer_kernel_sigset_t *k_set = (__sanitizer_kernel_sigset_t *)set;
10131013
__sanitizer_kernel_sigset_t *k_oldset = (__sanitizer_kernel_sigset_t *)oldset;

system/lib/libc/musl/VERSION

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

system/lib/libc/musl/WHATSNEW

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2287,3 +2287,43 @@ arch-specific bugs fixed:
22872287
- i386 __set_thread_area fallback for pre-2.6 kernels didn't work
22882288
- missing O_LARGEFILE macro value on x86_64, x32, mips64
22892289
- unpredictable s390x breakage from failure to preserve call-saved registers
2290+
2291+
2292+
2293+
1.2.3 release notes
2294+
2295+
new features:
2296+
- qsort_r function (POSIX-future)
2297+
- pthread_getname_np extension function
2298+
- hard float on SPE FPU for powerpc-sf
2299+
- SEEK_DATA and SEEK_HOLE exposed in unistd.h (Linux extensions)
2300+
2301+
compatibility:
2302+
- free now preserves errno (POSIX-future requirement)
2303+
- setjmp is declared explicitly with returns_twice for non-GCC compilers
2304+
- macro version of isascii is no longer defined for C++
2305+
- dynamic linker now tolerates zero-length LOAD segments
2306+
- epoll_[p]wait is now a cancellation point
2307+
- pwd/grp functions no longer fail on systems without AF_UNIX support
2308+
- POSIX TZ parsing is stricter to allow more names to fallback to files
2309+
- NULL is now defined as nullptr when used in C++11 or later
2310+
- gettext now accepts null pointer as argument
2311+
2312+
bugs fixed:
2313+
- old regression in wcwidth of Hangul combining (vowel/final) letters
2314+
- duplocale used wrong malloc when malloc was replaced (1.2.2 regression)
2315+
- fmaf rounded wrong on archs without FE_TOWARDZERO (all softfloat archs)
2316+
- popen didn't honor requirement not to leak other popen pipe fds to child
2317+
- aligned_alloc and variants crashed on allocation failure
2318+
- dl_iterate_phdr reported incorrect module TLS pointers
2319+
- mishandling of some inputs in acoshf and expm1f and functions using them
2320+
- potentially wrong-sign zero in cproj functions at infinity
2321+
- multiple bugs in legacy function cuserid
2322+
- minor posix_spawn file actions API conformance issues
2323+
- pthread_setname_np fd leak
2324+
- out-of-bound read in zoneinfo handling with distant-past times
2325+
- out-of-tree builds lacked generated debug cfi for x86 asm
2326+
2327+
arch-specific bugs fixed:
2328+
- powerpc (32-bit) struct shmid_ds layout was wrong for some fields
2329+
- time64 struct layout was wrong in sound ioctl fallback (32-bit archs)

system/lib/libc/musl/configure

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ test "$debug" = yes && CFLAGS_AUTO=-g
409409
#
410410
printf "checking whether we should preprocess assembly to add debugging information... "
411411
if fnmatch '-g*|*\ -g*' "$CFLAGS_AUTO $CFLAGS" &&
412-
test -f "tools/add-cfi.$ARCH.awk" &&
412+
test -f "$srcdir/tools/add-cfi.$ARCH.awk" &&
413413
printf ".file 1 \"srcfile.s\"\n.line 1\n.cfi_startproc\n.cfi_endproc" | $CC -g -x assembler -c -o /dev/null 2>/dev/null -
414414
then
415415
ADD_CFI=yes
@@ -671,9 +671,7 @@ trycppif __mips_soft_float "$t" && SUBARCH=${SUBARCH}-sf
671671
fi
672672

673673
if test "$ARCH" = "powerpc" ; then
674-
trycppif "__NO_FPRS__ && !_SOFT_FLOAT" "$t" && fail \
675-
"$0: error: compiler's floating point configuration is unsupported"
676-
trycppif _SOFT_FLOAT "$t" && SUBARCH=${SUBARCH}-sf
674+
trycppif "_SOFT_FLOAT || __NO_FPRS__" "$t" && SUBARCH=${SUBARCH}-sf
677675
printf "checking whether compiler can use 'd' constraint in asm... "
678676
echo 'double f(double x) { __asm__ ("fabs %0, %1" : "=d"(x) : "d"(x)); return x; }' > "$tmpc"
679677
if $CC $CFLAGS_C99FSE $CPPFLAGS $CFLAGS -c -o /dev/null "$tmpc" >/dev/null 2>&1 ; then

system/lib/libc/musl/include/ctype.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,9 @@ int isascii(int);
6464
int toascii(int);
6565
#define _tolower(a) ((a)|0x20)
6666
#define _toupper(a) ((a)&0x5f)
67+
#ifndef __cplusplus
6768
#define isascii(a) (0 ? isascii(a) : (unsigned)(a) < 128)
69+
#endif
6870

6971
#endif
7072

system/lib/libc/musl/include/elf.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -686,6 +686,8 @@ typedef struct {
686686
#define NT_ARM_PAC_MASK 0x406
687687
#define NT_ARM_PACA_KEYS 0x407
688688
#define NT_ARM_PACG_KEYS 0x408
689+
#define NT_ARM_TAGGED_ADDR_CTRL 0x409
690+
#define NT_ARM_PAC_ENABLED_KEYS 0x40a
689691
#define NT_METAG_CBUF 0x500
690692
#define NT_METAG_RPIPE 0x501
691693
#define NT_METAG_TLS 0x502

system/lib/libc/musl/include/locale.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ extern "C" {
77

88
#include <features.h>
99

10-
#ifdef __cplusplus
10+
#if __cplusplus >= 201103L && !defined(__EMSCRIPTEN__)
11+
#define NULL nullptr
12+
#elif defined(__cplusplus)
1113
#define NULL 0L
1214
#else
1315
#define NULL ((void*)0)

system/lib/libc/musl/include/netinet/if_ether.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
#define ETH_P_1588 0x88F7
6767
#define ETH_P_NCSI 0x88F8
6868
#define ETH_P_PRP 0x88FB
69+
#define ETH_P_CFM 0x8902
6970
#define ETH_P_FCOE 0x8906
7071
#define ETH_P_TDLS 0x890D
7172
#define ETH_P_FIP 0x8914

system/lib/libc/musl/include/netinet/in.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ struct ipv6_mreq {
4848
#define INADDR_BROADCAST ((in_addr_t) 0xffffffff)
4949
#define INADDR_NONE ((in_addr_t) 0xffffffff)
5050
#define INADDR_LOOPBACK ((in_addr_t) 0x7f000001)
51+
#define INADDR_DUMMY ((in_addr_t) 0xc0000008)
5152

5253
#define INADDR_UNSPEC_GROUP ((in_addr_t) 0xe0000000)
5354
#define INADDR_ALLHOSTS_GROUP ((in_addr_t) 0xe0000001)

0 commit comments

Comments
 (0)