diff --git a/options/linux/generic/sys-sysinfo.cpp b/options/linux/generic/sys-sysinfo.cpp index 950c38a33d..87bde69d4c 100644 --- a/options/linux/generic/sys-sysinfo.cpp +++ b/options/linux/generic/sys-sysinfo.cpp @@ -13,3 +13,13 @@ int sysinfo(struct sysinfo *info) { } return 0; } + +int get_nprocs(void) { + __ensure(!"Not implemented"); + __builtin_unreachable(); +} + +int get_nprocs_conf(void) { + __ensure(!"Not implemented"); + __builtin_unreachable(); +} diff --git a/options/linux/include/sys/sysinfo.h b/options/linux/include/sys/sysinfo.h index 9f20461ffe..33c87f5708 100644 --- a/options/linux/include/sys/sysinfo.h +++ b/options/linux/include/sys/sysinfo.h @@ -32,6 +32,9 @@ struct sysinfo { int sysinfo(struct sysinfo *__info); +int get_nprocs(void); +int get_nprocs_conf(void); + #endif /* !__MLIBC_ABI_ONLY */ #ifdef __cplusplus diff --git a/sysdeps/managarm/generic/socket.cpp b/sysdeps/managarm/generic/socket.cpp index 06775f0d12..973a3cd7ac 100644 --- a/sysdeps/managarm/generic/socket.cpp +++ b/sysdeps/managarm/generic/socket.cpp @@ -605,6 +605,11 @@ int sys_setsockopt(int fd, int layer, int number, const void *buffer, socklen_t ) << "\e[31mmlibc: setsockopt() call with SOL_SOCKET and SO_PRIORITY is unimplemented\e[39m" << frg::endlog; return 0; + } else if (layer == SOL_SOCKET && number == SO_RCVTIMEO) { + mlibc::infoLogger( + ) << "\e[31mmlibc: setsockopt() call with SOL_SOCKET and SO_RCVTIMEO is unimplemented\e[39m" + << frg::endlog; + return 0; } else { mlibc::panicLogger() << "\e[31mmlibc: Unexpected setsockopt() call, layer: " << layer << " number: " << number << "\e[39m" << frg::endlog;