mirrors/Astral
1
0
Fork 0
mirror of https://github.com/Mathewnd/Astral.git synced 2026-11-01 23:18:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

update mlibc

Browse Source
This commit is contained in:
Matheus
2025-09-10 19:46:28 -03:00
parent cf62c64b2d
commit 20f9213dff
7 changed files with 63 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
distro-files/etc/rc
+1
View File
@@ -14,6 +14,7 @@ chmod 1777 /tmp
chmod 0755 /dev/pts chmod 0755 /dev/pts
mkdir -p /var/log mkdir -p /var/log
mkdir -p /var/run
# required to be owned by root and sticky for rootless Xorg. # required to be owned by root and sticky for rootless Xorg.
mkdir -p /tmp/.X11-unix mkdir -p /tmp/.X11-unix
patches/gcc/jinx-working-patch.patch
+3 -3
View File
@@ -40,7 +40,7 @@ index 0000000..fe6e2e1
+#define LINK_SPEC "%{shared:-shared} %{static:-static} %{!shared: %{!static: %{rdynamic:-export-dynamic}}} %{!dynamic-linker:-dynamic-linker /usr/lib/ld.so}" +#define LINK_SPEC "%{shared:-shared} %{static:-static} %{!shared: %{!static: %{rdynamic:-export-dynamic}}} %{!dynamic-linker:-dynamic-linker /usr/lib/ld.so}"
+ +
+#undef STARTFILE_SPEC +#undef STARTFILE_SPEC
+#define STARTFILE_SPEC "%{!shared:crt0.o%s} crti.o%s %{shared:crtbeginS.o%s;:crtbegin.o%s}" +#define STARTFILE_SPEC "%{!shared:crt1.o%s} crti.o%s %{shared:crtbeginS.o%s;:crtbegin.o%s}"
+ +
+#undef ENDFILE_SPEC +#undef ENDFILE_SPEC
+#define ENDFILE_SPEC "%{shared:crtendS.o%s;:crtend.o%s} crtn.o%s" +#define ENDFILE_SPEC "%{shared:crtendS.o%s;:crtend.o%s} crtn.o%s"
@@ -78,7 +78,7 @@ index c5064dd..e151646 100644
case ${target} in case ${target} in
+x86_64-*-astral*) +x86_64-*-astral*)
+ tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h glibc-stdint.h i386/i386elf.h i386/x86-64.h astral.h" + tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h glibc-stdint.h i386/i386elf.h i386/x86-64.h astral.h gnu-user.h"
+ ;; + ;;
aarch64*-*-elf | aarch64*-*-fuchsia* | aarch64*-*-rtems*) aarch64*-*-elf | aarch64*-*-fuchsia* | aarch64*-*-rtems*)
tm_file="${tm_file} dbxelf.h elfos.h newlib-stdint.h" tm_file="${tm_file} dbxelf.h elfos.h newlib-stdint.h"
@@ -93,7 +93,7 @@ index 8c56fca..aecb1da 100644
;; ;;
+x86_64-*-astral*) +x86_64-*-astral*)
+ extra_parts="$extra_parts crti.o crtbegin.o crtend.o crtn.o crtbeginS.o crtendS.o crtprec32.o crtprec64.o crtprec80.o crtfastmath.o" + extra_parts="$extra_parts crti.o crtbegin.o crtend.o crtn.o crtbeginS.o crtendS.o crtprec32.o crtprec64.o crtprec80.o crtfastmath.o"
+ tmake_file="$tmake_file gnu-user.h t-crtstuff-pic t-libgcc-pic i386/t-crtpc t-crtfm i386/t-crtstuff t-dfprules" + tmake_file="$tmake_file t-crtstuff-pic t-libgcc-pic i386/t-crtpc t-crtfm i386/t-crtstuff t-dfprules"
+ ;; + ;;
i[34567]86-*-linux*) i[34567]86-*-linux*)
extra_parts="$extra_parts crtprec32.o crtprec64.o crtprec80.o crtfastmath.o" extra_parts="$extra_parts crtprec32.o crtprec64.o crtprec80.o crtfastmath.o"
patches/mlibc/jinx-working-patch.patch
+54 -108
View File
@@ -1,104 +1,39 @@
diff --git mlibc-clean/abis/linux/in.h mlibc-workdir/abis/linux/in.h diff --git mlibc-clean/abis/linux/fcntl.h mlibc-workdir/abis/linux/fcntl.h
index 87bc25f..d7370d0 100644 index b2215a2..fb152a7 100644
--- mlibc-clean/abis/linux/in.h --- mlibc-clean/abis/linux/fcntl.h
+++ mlibc-workdir/abis/linux/in.h +++ mlibc-workdir/abis/linux/fcntl.h
@@ -109,6 +109,9 @@ struct group_source_req { @@ -88,6 +88,14 @@
#define IPPORT_RESERVED 1024 #if __MLIBC_LINUX_OPTION
+#define IP_MULTICAST_TTL 33 +#define DN_ACCESS 1
+#define IPV6_MULTICAST_HOPS 18 +#define DN_MODIFY 2
+#define DN_CREATE 4
+#define DN_DELETE 8
+#define DN_RENAME 16
+#define DN_ATTRIB 32
+#define DN_MULTISHOT 0x80000000
+ +
#define IPPROTO_IP 0 #define AT_STATX_SYNC_AS_STAT 0x0000
#define IPPROTO_HOPOPTS 0 #define AT_STATX_FORCE_SYNC 0x2000
#define IPPROTO_ICMP 1 #define AT_STATX_DONT_SYNC 0x4000
diff --git mlibc-clean/meson.build mlibc-workdir/meson.build diff --git mlibc-clean/meson.build mlibc-workdir/meson.build
index 39796b5..7d671fc 100644 index 37f8200..af2ea0b 100644
--- mlibc-clean/meson.build --- mlibc-clean/meson.build
+++ mlibc-workdir/meson.build +++ mlibc-workdir/meson.build
@@ -268,6 +268,7 @@ elif host_machine.system() == 'astral' @@ -264,6 +264,7 @@ elif host_machine.system() == 'astral'
libc_include_dirs += include_directories('sysdeps/astral/include') libc_include_dirs += include_directories('sysdeps/astral/include')
internal_conf.set10('MLIBC_MAP_DSO_SEGMENTS', true) internal_conf.set10('MLIBC_MAP_DSO_SEGMENTS', true)
internal_conf.set10('MLIBC_MAP_FILE_WINDOWS', true) internal_conf.set10('MLIBC_MAP_FILE_WINDOWS', true)
+ internal_conf.set10('MLIBC_MMAP_ALLOCATE_DSO', true) + internal_conf.set10('MLIBC_MMAP_ALLOCATE_DSO', true)
subdir('sysdeps/astral') subdir('sysdeps/astral')
else elif host_machine.system() == 'menix'
error('No sysdeps defined for OS: ' + host_machine.system()) rtld_include_dirs += include_directories('sysdeps/menix/include')
diff --git mlibc-clean/options/ansi/generic/environment.cpp mlibc-workdir/options/ansi/generic/environment.cpp
index 5625592..36b42ee 100644
--- mlibc-clean/options/ansi/generic/environment.cpp
+++ mlibc-workdir/options/ansi/generic/environment.cpp
@@ -111,8 +111,10 @@ namespace mlibc {
int putenv(char *string) {
frg::string_view view{string};
size_t s = view.find_first('=');
- if(s == size_t(-1))
- __ensure(!"Environment strings need to contain an equals sign");
+ if(s == size_t(-1)) {
+ unsetenv(string);
+ return 0;
+ }
update_vector();
assign_variable(view.sub_string(0, s), string, true);
diff --git mlibc-clean/options/ansi/generic/string.cpp mlibc-workdir/options/ansi/generic/string.cpp
index 8defd0e..d6cb65b 100644
--- mlibc-clean/options/ansi/generic/string.cpp
+++ mlibc-workdir/options/ansi/generic/string.cpp
@@ -406,7 +406,6 @@ char *strerror(int e) {
case ENOPROTOOPT: s = "Protocol not available (ENOPROTOOPT)"; break;
case ENOTEMPTY: s = "Directory not empty (ENOTEMPTY)"; break;
case ENOTRECOVERABLE: s = "Sate not recoverable (ENOTRECOVERABLE)"; break;
- case ENOTSUP: s = "Operation not supported (ENOTSUP)"; break;
case ENOTTY: s = "Inappropriate ioctl for device (ENOTTY)"; break;
case EOVERFLOW: s = "Value too large for defined datatype (EOVERFLOW)"; break;
#if EOPNOTSUPP != ENOTSUP
diff --git mlibc-clean/options/crypt/generic/crypt.cpp mlibc-workdir/options/crypt/generic/crypt.cpp
index 65e0d23..95b060c 100644
--- mlibc-clean/options/crypt/generic/crypt.cpp
+++ mlibc-workdir/options/crypt/generic/crypt.cpp
@@ -1,7 +1,8 @@
#include <crypt.h>
#include <bits/ensure.h>
+#include <string.h>
-char *crypt(const char *, const char *) {
+char *crypt(const char *passwd, const char *) {
__ensure(!"Not implemented");
__builtin_unreachable();
}
diff --git mlibc-clean/options/glibc/generic/execinfo.cpp mlibc-workdir/options/glibc/generic/execinfo.cpp
index 3474615..e034881 100644
--- mlibc-clean/options/glibc/generic/execinfo.cpp
+++ mlibc-workdir/options/glibc/generic/execinfo.cpp
@@ -1,9 +1,10 @@
#include <execinfo.h>
#include <bits/ensure.h>
+#include <mlibc/debug.hpp>
int backtrace(void **, int) {
- __ensure(!"Not implemented");
- __builtin_unreachable();
+ mlibc::infoLogger() << "libc: backtrace() is not implemented!\n" << frg::endlog;
+ return 0;
}
char **backtrace_symbols(void *const *, int) {
diff --git mlibc-clean/options/posix/generic/dlfcn.cpp mlibc-workdir/options/posix/generic/dlfcn.cpp
index fc34a3b..b1a95a9 100644
--- mlibc-clean/options/posix/generic/dlfcn.cpp
+++ mlibc-workdir/options/posix/generic/dlfcn.cpp
@@ -1,4 +1,4 @@
-
+#define _GNU_SOURCE
#include <bits/ensure.h>
#include <dlfcn.h>
diff --git mlibc-clean/options/posix/generic/unistd.cpp mlibc-workdir/options/posix/generic/unistd.cpp diff --git mlibc-clean/options/posix/generic/unistd.cpp mlibc-workdir/options/posix/generic/unistd.cpp
index 444ad22..44205bd 100644 index 9652a17..c38ab8c 100644
--- mlibc-clean/options/posix/generic/unistd.cpp --- mlibc-clean/options/posix/generic/unistd.cpp
+++ mlibc-workdir/options/posix/generic/unistd.cpp +++ mlibc-workdir/options/posix/generic/unistd.cpp
@@ -483,9 +483,16 @@ int lockf(int fd, int op, off_t size) { @@ -571,9 +571,16 @@ int lockf(int fd, int op, off_t size) {
return -1; return -1;
} }
@@ -119,31 +54,22 @@ index 444ad22..44205bd 100644
long pathconf(const char *, int name) { long pathconf(const char *, int name) {
diff --git mlibc-clean/options/posix/include/mlibc/posix-sysdeps.hpp mlibc-workdir/options/posix/include/mlibc/posix-sysdeps.hpp diff --git mlibc-clean/options/posix/include/mlibc/posix-sysdeps.hpp mlibc-workdir/options/posix/include/mlibc/posix-sysdeps.hpp
index a224474..21a1046 100644 index 9387f76..0f2852b 100644
--- mlibc-clean/options/posix/include/mlibc/posix-sysdeps.hpp --- mlibc-clean/options/posix/include/mlibc/posix-sysdeps.hpp
+++ mlibc-workdir/options/posix/include/mlibc/posix-sysdeps.hpp +++ mlibc-workdir/options/posix/include/mlibc/posix-sysdeps.hpp
@@ -236,6 +236,8 @@ int sys_vm_unmap(void *pointer, size_t size); @@ -253,6 +253,8 @@ int sys_vm_unmap(void *pointer, size_t size);
[[gnu::weak]] int sys_waitid(idtype_t idtype, id_t id, siginfo_t *info, int options); [[gnu::weak]] int sys_inet_configured(bool *ipv4, bool *ipv6);
+[[gnu::weak]] int sys_nice(int nice, int *ret); +[[gnu::weak]] int sys_nice(int nice, int *ret);
+ +
} //namespace mlibc } //namespace mlibc
#endif // MLIBC_POSIX_SYSDEPS #endif // MLIBC_POSIX_SYSDEPS
diff --git mlibc-clean/options/rtld/generic/main.cpp mlibc-workdir/options/rtld/generic/main.cpp diff --git mlibc-clean/sysdeps/astral/crt-x86_64/crt0.S mlibc-workdir/sysdeps/astral/crt-x86_64/crt1.S
index 9219ef0..1ff679c 100644 similarity index 100%
--- mlibc-clean/options/rtld/generic/main.cpp rename from mlibc-clean/sysdeps/astral/crt-x86_64/crt0.S
+++ mlibc-workdir/options/rtld/generic/main.cpp rename to mlibc-workdir/sysdeps/astral/crt-x86_64/crt1.S
@@ -17,6 +17,8 @@
#include "elf.hpp"
#include "linker.hpp"
+#define _GNU_SOURCE
+
#if __MLIBC_POSIX_OPTION
#include <dlfcn.h>
#endif
diff --git mlibc-clean/sysdeps/astral/generic/astral.cpp mlibc-workdir/sysdeps/astral/generic/astral.cpp diff --git mlibc-clean/sysdeps/astral/generic/astral.cpp mlibc-workdir/sysdeps/astral/generic/astral.cpp
index d5ba7b2..a86353f 100644 index d5ba7b2..a86353f 100644
--- mlibc-clean/sysdeps/astral/generic/astral.cpp --- mlibc-clean/sysdeps/astral/generic/astral.cpp
@@ -158,7 +84,7 @@ index d5ba7b2..a86353f 100644
long error = syscall(SYSCALL_ARCHCTL, &ret, func, (uint64_t)arg); long error = syscall(SYSCALL_ARCHCTL, &ret, func, (uint64_t)arg);
if(error) if(error)
diff --git mlibc-clean/sysdeps/astral/generic/generic.cpp mlibc-workdir/sysdeps/astral/generic/generic.cpp diff --git mlibc-clean/sysdeps/astral/generic/generic.cpp mlibc-workdir/sysdeps/astral/generic/generic.cpp
index 2a504ab..6a7c882 100644 index bb85dba..a541845 100644
--- mlibc-clean/sysdeps/astral/generic/generic.cpp --- mlibc-clean/sysdeps/astral/generic/generic.cpp
+++ mlibc-workdir/sysdeps/astral/generic/generic.cpp +++ mlibc-workdir/sysdeps/astral/generic/generic.cpp
@@ -31,6 +31,12 @@ namespace mlibc { @@ -31,6 +31,12 @@ namespace mlibc {
@@ -213,7 +139,7 @@ index 2a504ab..6a7c882 100644
#ifndef MLIBC_BUILDING_RTLD #ifndef MLIBC_BUILDING_RTLD
typedef struct { typedef struct {
@@ -487,6 +516,12 @@ namespace mlibc { @@ -376,6 +405,12 @@ namespace mlibc {
return ret; return ret;
} }
@@ -226,7 +152,7 @@ index 2a504ab..6a7c882 100644
#ifndef MLIBC_BUILDING_RTLD #ifndef MLIBC_BUILDING_RTLD
[[noreturn]] void sys_thread_exit() { [[noreturn]] void sys_thread_exit() {
@@ -882,7 +917,7 @@ namespace mlibc { @@ -771,7 +806,7 @@ namespace mlibc {
int sys_tcb_set(void *pointer) { int sys_tcb_set(void *pointer) {
long r; long r;
@@ -266,10 +192,10 @@ index 5f42d62..09a5d5f 100644
#ifndef __MLIBC_ABI_ONLY #ifndef __MLIBC_ABI_ONLY
diff --git mlibc-clean/sysdeps/astral/meson.build mlibc-workdir/sysdeps/astral/meson.build diff --git mlibc-clean/sysdeps/astral/meson.build mlibc-workdir/sysdeps/astral/meson.build
index a5ede46..e198d2e 100644 index 0990599..9467cdb 100644
--- mlibc-clean/sysdeps/astral/meson.build --- mlibc-clean/sysdeps/astral/meson.build
+++ mlibc-workdir/sysdeps/astral/meson.build +++ mlibc-workdir/sysdeps/astral/meson.build
@@ -63,6 +63,12 @@ if not no_headers @@ -76,14 +76,29 @@ if not no_headers
subdir: 'abi-bits', subdir: 'abi-bits',
follow_symlinks: true, follow_symlinks: true,
) )
@@ -282,3 +208,23 @@ index a5ede46..e198d2e 100644
endif endif
if not headers_only if not headers_only
- crt = custom_target('crt0',
+ custom_target('crt1',
build_by_default: true,
command: c_compiler.cmd_array() + ['-c', '-o', '@OUTPUT@', '@INPUT@'],
- input: 'crt-x86_64/crt0.S',
- output: 'crt0.o',
+ input: 'crt-x86_64/crt1.S',
+ output: 'crt1.o',
+ install: true,
+ install_dir: get_option('libdir')
+ )
+
+ custom_target('Scrt1',
+ build_by_default: true,
+ command: c_compiler.cmd_array() + ['-c', '-o', '@OUTPUT@', '@INPUT@'],
+ input: 'crt-x86_64/crt1.S',
+ output: 'Scrt1.o',
install: true,
install_dir: get_option('libdir')
)
recipes/mlibc
+1 -1
View File
@@ -7,7 +7,7 @@ imagedeps="meson ninja-build git build-essential binutils"
deps="mlibc-headers" deps="mlibc-headers"
configure() { configure() {
meson --cross-file ${base_dir}/util/crossfile -Dmlibc_no_headers=true --prefix=${prefix} ${source_dir} -Dlinux_kernel_headers=${sysroot_dir}/${prefix}/include -Ddisable_crypt_option=true -Ddisable_iconv_option=true -Ddisable_intl_option=true meson --cross-file ${base_dir}/util/crossfile -Dno_headers=true --prefix=${prefix} ${source_dir} -Dlinux_kernel_headers=${sysroot_dir}/${prefix}/include -Dposix_option=enabled -Dlinux_option=enabled -Dglibc_option=enabled -Dbsd_option=enabled
} }
build() { build() {
recipes/mlibc-headers
+1 -1
View File
@@ -5,7 +5,7 @@ imagedeps="ninja-build meson build-essential rsync"
builddeps="linux-headers" builddeps="linux-headers"
configure() { configure() {
meson setup --cross-file "${base_dir}/util/crossfile" --prefix="${prefix}" -Dheaders_only=true "${source_dir}" -Ddisable_crypt_option=true -Ddisable_iconv_option=true -Ddisable_intl_option=true meson setup --cross-file "${base_dir}/util/crossfile" --prefix="${prefix}" -Dheaders_only=true "${source_dir}" -Dposix_option=enabled -Dlinux_option=enabled -Dglibc_option=enabled -Dbsd_option=enabled
} }
build() { build() {
recipes/wine
+1
View File
@@ -12,6 +12,7 @@ configure() {
--disable-tests \ --disable-tests \
--enable-win64 \ --enable-win64 \
--disable-win16 \ --disable-win16 \
--without-inotify \
--without-alsa \ --without-alsa \
--without-capi \ --without-capi \
--without-cups \ --without-cups \
source-recipes/mlibc
+2 -2
View File
@@ -1,8 +1,8 @@
name=mlibc name=mlibc
version=a89e933faf08fb4392afc9f7170cd23555af77e4 version=1699b22cb6aa23863f6a62e0388b98416e73b6ae
source_method=tarball source_method=tarball
tarball_url="https://github.com/managarm/mlibc/archive/${version}.tar.gz" tarball_url="https://github.com/managarm/mlibc/archive/${version}.tar.gz"
tarball_sha512="df6fccb461ca84f4628568f0555e3f09f3234ea39766df3c09f39e0e9f3277356473d3cd9d67f09e9aacc69e607f3e0db63331321bb83a375e20ab3b37c61451" tarball_sha512="08d42d0ea78511f995b83e1ddcdc0f1602be7d092d80eba1779416ebefe9acb1ad0ce536b4fb30bda32acb2bb9cda3ece01e449053ec2cb1916b4c2aed7524f6"
prepare() { prepare() {
true true