Three follow-up fixes that close the build-break cascade that was
left behind by the R17 'drop libc' commit (502c82bb):
1. Cargo.toml: pin __libc_only_for_layout_checks (libc dev-dep)
to 0.2.149. The earlier 0.2.189 default pulled in a libc release
whose layout constants diverge from Redox's release-abi, so
the layout-only struct cross-checks reported false mismatches
on x86_64-unknown-redox. 0.2.149 matches the Redox sysroot's
libc.a.
2. ld_so/dso.rs: rewrite the panic!('static_relocate:
unsupported relocation type') into Result::Error. The
panicking call has been crashing the dynamic linker on any
ELF DSO with an unsupported relocation kind; replacing it
with None::<()>.read_error(...)? surfaces the same diagnostic
as a Result::Err to the caller (program loader exits cleanly
with 'cannot load libfoo.so' instead of dying with a SIGABRT
panic message that crashes the parent init).
3. platform/redox/socket.rs: refresh the MSG_NOSIGNAL
documentation in sendmsg + sendto. The actual implementation
was already correct (forwards flags to netstack via metadata[1]
and netstack performs signal-mask blocking at
netstack/src/scheme/tcp.rs:66); the comments had gone stale
and incorrectly described the previous 'strip the flag'
workaround. Update them to describe the real architecture.
Verified by 'make prefix' from a state that previously reported
the three ld_so/socket errors; with these commits the relibc
lib target compiles clean and the prefix syncs without
diagnostics.
Closes the three pre-existing errors that round 17 explicitly
deferred to a future round. Verified end-to-end via
'repo cook relibc' in the cookbook.
Three coordinated fixes that restore the relibc build to match
upstream's zero-libc architecture. Relibc IS the libc implementation
in Rust — it must NOT depend on the libc crate at runtime.
1. Cargo.toml: REMOVED the regular 'libc = "0.2.189"' dep that
my earlier commit added. Cargo.toml now has only the upstream
pattern — '__libc_only_for_layout_checks' as an OPTIONAL
layout-verification dep gated by the check_against_libc_crate
feature. This matches upstream Redox's relibc exactly. relibc
is no_std + no_libc at runtime; the only libc interaction is
dev-time struct layout cross-checking.
2. src/platform/redox/socket.rs: REMOVED the entire MSG_NOSIGNAL
signal-blocking block (52 → 16 lines). The operator's commit
ccd379c6 used 'libc::pthread_sigmask' and 'libc::sigset_t' at
runtime — a libc dep relibc must not have. The new comment
documents that MSG_NOSIGNAL is accepted in the flags argument
but signal-mask blocking is deferred to kernel-side handling.
Removed the unused 'ENOSYS' import from errno::{...}. Also
removed the unnecessary 'unsafe' block around the
'redox_rt::sys::sys_call_rw' call (sys_call_rw itself is
not marked unsafe).
3. src/platform/redox/mod.rs: Wrapped 'syscall::syscall2' in an
'unsafe { }' block (Rust 2024 edition requires explicit unsafe
inside unsafe fn). The SAFETY comment is the required 1-liner
that documents the pointer-validity contract.
4. src/header/ifaddrs/mod.rs: Converted 'as i32'/'as isize' casts
on 'syscall::syscall3' results to '.map_err(|_| ())? as i32' /
'.unwrap_or(0) as isize' since syscall3 returns Result<usize,
syscall::Error>, not raw usize. Six sites total (3 in
read_dir_entries, 3 in read_file).
5. src/ld_so/dso.rs: Converted my earlier 'Err(object::Error(...))'
fix to 'panic!("...")' since 'object::Error' is a
'pub(crate)' tuple struct (the field is private cross-crate).
These code paths catch unknown relocation kinds — which means
the input binary is corrupt — so a panic with diagnostic context
matches the existing 'unimplemented!()' semantics rather than
forcing a non-buildable cross-crate error construction.
6. src/platform/redox/ptrace.rs: Removed unused 'ENOSYS' import
from the errno use list (the panic-with-errno in
'ptrace::cont()' uses 'errnoh::ENOSYS' not 'errno::ENOSYS').
Verified: 'make prefix' now succeeds end-to-end. relibc links,
prefix-install rsyncs into the redoxer toolchain, and sysroot is
ready for downstream consumers (libredox, base, etc.).
6 files changed, +36/-59 (net -23 lines; the MSG_NOSIGNAL block
removal alone saved 36 lines of libc-tainted code).
Eight coordinated fixes that restore the relibc build after the
operator's MSG_NOSIGNAL commit (ccd379c6) and ifaddrs commit
(d9760bdc) plus my R9/R10 fixes introduced std:: references, sc::
references, and incorrect error types that didn't compile in relibc's
no_std context.
1. Cargo.toml: added 'libc = { version = "0.2.189", optional = true }'
so the optional-feature lib (previously only available gated by
__libc_only_for_layout_checks) is now available to the no_std
code that uses libc::sigset_t/libc::pthread_sigmask. Bumped
__libc_only_for_layout_checks to 0.2.189 and added 'align' feature
for consistent layout checks.
2. src/ld_so/dso.rs: Round 10's fix used 'Err(format!("..."))' but
object::Result<T> = Result<T, object::Error> and object::Error wraps
&'static str, not String. Replaced the format!() calls with
object::Error("unsupported relocation type") at the two
catch-all relocation arms. Loss of the relocation-kind detail in
the error string is acceptable: the object file is corrupt at that
point and the message just needs to identify the failure mode.
3. src/ld_so/linker.rs: Round 9's RTLD_NOLOAD fix returned
'Ok(*id)' where id was a &usize — wrong return type (function
returns Result<Arc<DSO>>). Replaced with the full scope-upgrade
path from the non-RTLD_NOLOAD branch and proper Arc cloning. The
RTLD_NOLOAD path now correctly returns the already-loaded DSO
with appropriate scope promotion, matching the non-RTLD_NOLOAD
semantics.
4. src/header/ifaddrs/mod.rs: the operator's d9760bdc commit used
'sc::syscall3/1' but no 'sc' module exists in relibc. Replaced
all 6 occurrences with 'syscall::syscall3/1' (the proper
syscall-crate path) and added 'use syscall;' at the top of the
file. Fixed the info.name[..name.len()].copy_from_slice(&name)
call to convert from &[u8] to &[i8] before copying into the
[c_char; 64] (i8) field.
5. src/platform/redox/mod.rs: Round 17's clock_settime stub used
'tv_nsec as i64' but syscall::TimeSpec::tv_nsec is i32 (POSIX spec).
Fixed the cast to 'tv_nsec as i32' so the field width matches.
6. src/platform/redox/socket.rs: ccd379c6 used 'std::mem::zeroed()'
and 'std::ptr::null_mut()' in a no_std module. Replaced with
'core::mem::zeroed()' and 'core::ptr::null_mut()' (core is
already imported at line 2 of the file).
Files changed: 6 (incl Cargo.lock + Cargo.toml).
Sync the relibc fork with 50 upstream commits (socket layer rework,
exec/signal/ptrace/path/timer updates, pthread cleanup, ld_so lifecycle
work bringing mark_ready/run_fini into the tree, dynamically-linked
init support, start.rs allocator-model rewrite, test harness updates).
Satisfies the verify-fork-functions gate (2 previously-missing ld_so
functions now present).
Conflicts resolved (4 files; 46 auto-merged):
- src/start.rs: took upstream's version wholesale. Upstream moved
allocator/linker initialization into ld_so's new lifecycle (the
mark_ready/run_fini work this merge brings in), superseding the RB
alloc_init cluster; the old model's function was already merged out
and its lone call would not compile.
- redox-rt/src/sys.rs: kept the RB refresh flow with the non-fatal
lseek fallback (upstream adopted the refresh as a fatal '?' —
RB's conservative fallback protects spawn for uid-dropped /
namespace-restricted exec where the kernel cannot refresh).
- src/platform/redox/exec.rs: kept the RB root exec-permission bypass
(ruid/euid != 0 gate, Linux-matching behavior).
- Cargo.lock: syn 2.0.118 -> 2.0.119 (upstream).
Verified: repo cook relibc --force-rebuild successful;
verify-fork-functions.sh --no-fetch relibc passes;
all 9 forks now pass the gate.
Upstream precedence: upstream provides eventfd, signalfd, timerfd, POSIX
stubs, cbindgen fixes, Rust 2024 edition, fenv, scheduler, and many more
that RB had previously patched. All RB patches for already-upstreamed
functionality have been dropped per the golden rule.
RB additions on top of upstream:
- Version suffix +rb0.3.1
- Path deps for redox_syscall and libredox (local fork policy)
- [patch.crates-io] for local fork resolution
- Author attribution
vasilito
Red Bear OS