Separate L4Re from Linux code, add aarch64 and enable tests #4479
Conversation
rustbot
added
ctest
|
Some changes occurred in the Android module cc @maurer |
farao
force-pushed
the
revert
branch
11 times, most recently
from
92284e5 to
40a082a
Compare
|
Hi @tgross35, this is the refactoring of the recent L4Re PR: #4383 (which is kept around just in case). I think the failure of the freebsd nightly checks is not my fault. The rest succeeds now. I did most of what you requested in your comment on the old PR, I just kept the linux/mod.rs file around since there is a massive part of code that is linux-only and is not supported by L4Re and it did not seem to make sense to put it all in shared.rs. Also, I put some more code that's shared from the sub modules (emscripten, android, linux, l4re) up in linux_like/mod.rs. In theory, I think there's potential to do that with more code, that's just the one that I would have put in shared.rs but realized that it could go into linux_like/mod.rs instead. |
The L4Re code was previously attached to the Linux code which was not correct in many ways. This commit separates the L4Re code and enables the libc-tests and includes the fixes for the failing tests. Aarch64 is added as a second supported architecture (more to come).
There was a problem hiding this comment.
I assume this isn't directly related to l4re, mind splitting it to a separate commit? (same PR is fine of course)
| @@ -3990,6 +4007,10 @@ fn test_linux(target: &str) { | |||
| }); | |||
|
|
|||
| cfg.skip_struct(move |ty| { | |||
| if ty.starts_with("l4_") { | |||
There was a problem hiding this comment.
Are these anonymous on l4re?
| @@ -4169,6 +4190,12 @@ fn test_linux(target: &str) { | |||
| }); | |||
|
|
|||
| cfg.skip_const(move |name| { | |||
| // L4Re requires a min stack size of 64k; that isn't defined in uClibc, but | |||
| // somewhere in the core libraries. uClibc wants 16k, but that's not enough. | |||
| if name == "PTHREAD_STACK_MIN" { | |||
There was a problem hiding this comment.
This should be l4re && ... right?
| @@ -3716,11 +3728,12 @@ fn test_linux(target: &str) { | |||
| "libgen.h", | |||
| "limits.h", | |||
| "link.h", | |||
| "linux/sysctl.h", | |||
| [uclibc]: "linux/if_ether.h", | |||
| [linux]: "linux/sysctl.h", | |||
There was a problem hiding this comment.
I think it is probably safer to flip the logic here. That is, rather than [linux], make these [!l4re] so any other OS that happens to reuse some of this function gets the same defaults.
| @@ -4920,7 +4949,9 @@ fn test_linux(target: &str) { | |||
|
|
|||
| cfg.generate(src_hotfix_dir().join("lib.rs"), "main.rs"); | |||
|
|
|||
| test_linux_like_apis(target); | |||
| if linux { | |||
| (*(self as *const siginfo_t as *const siginfo_sigfault)).si_addr | ||
| } | ||
|
|
||
| pub unsafe fn si_value(&self) -> crate::sigval { | ||
| #[repr(C)] | ||
| struct siginfo_si_value { | ||
| _si_signo: c_int, | ||
| _si_errno: c_int, | ||
| _si_code: c_int, | ||
| _si_timerid: c_int, | ||
| _si_overrun: c_int, | ||
| si_value: crate::sigval, | ||
| } | ||
| (*(self as *const siginfo_t as *const siginfo_si_value)).si_value |
There was a problem hiding this comment.
I know this is preexisting, but mind updating to the slightly safer newer casting APIs? So ptr::from_ref(self).cast::<siginfo_sigfault>()
| // FIXME(1.0): this is actually a union | ||
| pub struct sem_t { |
There was a problem hiding this comment.
ulibc was broken before this right? If so, might as well make it correct here.
| @@ -0,0 +1,2127 @@ | |||
| //! Shared definitions between Linux and L4Re | |||
|
|
|||
| // TODO: check if there is more overlap with emscripten and android | |||
There was a problem hiding this comment.
FIXME(linux) if this comment is meant to be left in the codebase
The L4Re code was previously attached to the Linux code which was not correct in many ways. This commit separates the L4Re code and enables the libc-tests and includes the fixes for the failing tests. Aarch64 is added as a second supported architecture (more to come).
Sources
L4Re-adapted version of uclibc: https://github.com/kernkonzept/l4re-core/tree/master/uclibc/lib.
Checklist
libc-test/semverhave been updated*LASTor*MAXareincluded (see #3131)
cd libc-test && cargo test --target mytarget);especially relevant for platforms that may not be checked in CI