Upgrade to musl 1.1.24 in CI #1588
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,24 @@ | ||
| FROM ubuntu:19.04 | ||
|
|
||
| RUN apt-get update && apt-get install -y --no-install-recommends \ | ||
| gcc libc6-dev qemu-user ca-certificates qemu-system-mipsel curl \ | ||
| xz-utils patch | ||
|
|
||
| RUN mkdir /toolchain | ||
|
|
||
| # Linux kernel version: 4.14.151 | ||
| # See build_dir/target-mipsel_mips32_musl/linux-brcm47xx_generic/linux-4.14.151 | ||
| # Musl version: 1.1.24 | ||
| # See staging_dir/toolchain-mipsel_mips32_gcc-7.4.0_musl/info.mk | ||
| RUN curl --retry 5 -L https://downloads.openwrt.org/releases/19.07.0-rc1/targets/brcm47xx/generic/openwrt-sdk-19.07.0-rc1-brcm47xx-generic_gcc-7.4.0_musl.Linux-x86_64.tar.xz | \ | ||
| tar xJf - -C /toolchain --strip-components=1 | ||
|
|
||
| # See https://lkml.org/lkml/2014/3/14/269 | ||
| COPY sysinfo_guard.patch /toolchain | ||
| RUN patch /toolchain/staging_dir/toolchain-mipsel_mips32_gcc-7.4.0_musl/include/linux/kernel.h </toolchain/sysinfo_guard.patch | ||
|
|
||
| ENV PATH=$PATH:/rust/bin:/toolchain/staging_dir/toolchain-mipsel_mips32_gcc-7.4.0_musl/bin \ | ||
| STAGING_DIR=/toolchain/staging_dir \ | ||
| CC_mipsel_unknown_linux_musl=mipsel-openwrt-linux-musl-gcc \ | ||
| CARGO_TARGET_MIPSEL_UNKNOWN_LINUX_MUSL_LINKER=mipsel-openwrt-linux-musl-gcc \ | ||
| CARGO_TARGET_MIPSEL_UNKNOWN_LINUX_MUSL_RUNNER="qemu-mipsel -L /toolchain/staging_dir/toolchain-mipsel_mips32_gcc-7.4.0_musl" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| @@ -2,7 +2,9 @@ | ||
| #ifndef _LINUX_KERNEL_H | ||
| #define _LINUX_KERNEL_H | ||
|
|
||
| +#ifdef __GLIBC__ | ||
| #include <linux/sysinfo.h> | ||
| +#endif | ||
|
|
||
| /* | ||
| * 'kernel.h' contains some often-used function prototypes etc |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2061,14 +2061,14 @@ fn test_linux(target: &str) { | |
| let i686 = target.contains("i686"); | ||
| let mips = target.contains("mips"); | ||
| let mips32 = mips && !target.contains("64"); | ||
| let mips64 = mips && target.contains("64"); | ||
| let ppc64 = target.contains("powerpc64"); | ||
| let s390x = target.contains("s390x"); | ||
| let sparc64 = target.contains("sparc64"); | ||
| let x32 = target.contains("x32"); | ||
| let x86_32 = target.contains("i686"); | ||
| let x86_64 = target.contains("x86_64"); | ||
| let aarch64_musl = target.contains("aarch64") && musl; | ||
|
|
||
| let mut cfg = ctest_cfg(); | ||
| cfg.define("_GNU_SOURCE", None); | ||
|
|
@@ -2132,8 +2132,7 @@ fn test_linux(target: &str) { | |
| "sys/prctl.h", | ||
| "sys/ptrace.h", | ||
| "sys/quota.h", | ||
| "sys/random.h", | ||
| "sys/reboot.h", | ||
| "sys/resource.h", | ||
| "sys/sem.h", | ||
|
|
@@ -2187,8 +2186,7 @@ fn test_linux(target: &str) { | |
| "linux/fs.h", | ||
| "linux/futex.h", | ||
| "linux/genetlink.h", | ||
| "linux/if.h", | ||
| "linux/if_addr.h", | ||
| "linux/if_alg.h", | ||
| "linux/if_ether.h", | ||
|
|
@@ -2303,9 +2301,6 @@ fn test_linux(target: &str) { | |
| // structs. | ||
| "termios2" => true, | ||
|
|
||
| // FIXME: remove once Ubuntu 20.04 LTS is released, somewhere in 2020. | ||
| // ucontext_t added a new field as of glibc 2.28; our struct definition is | ||
| // conservative and omits the field, but that means the size doesn't match for newer | ||
|
|
@@ -2349,7 +2344,7 @@ fn test_linux(target: &str) { | |
| // Require Linux kernel 5.1: | ||
| "F_SEAL_FUTURE_WRITE" => true, | ||
|
|
||
| // The musl version 1.1.24 used in CI does not | ||
| // contain these glibc constants yet: | ||
| | "RLIMIT_RTTIME" // should be in `resource.h` | ||
| | "TCP_COOKIE_TRANSACTIONS" // should be in the `netinet/tcp.h` header | ||
|
|
@@ -2371,10 +2366,6 @@ fn test_linux(target: &str) { | |
| // - these constants are used by the glibc implementation. | ||
| n if musl && n.contains("__SIZEOF_PTHREAD") => true, | ||
|
|
||
| _ => false, | ||
| } | ||
| }); | ||
|
|
@@ -2458,7 +2449,17 @@ fn test_linux(target: &str) { | |
| field == "_pad2" || | ||
| field == "ssi_syscall" || | ||
| field == "ssi_call_addr" || | ||
| field == "ssi_arch")) || | ||
| // FIXME: After musl 1.1.24, it have only one field `sched_priority`, | ||
| // while other fields become reserved. | ||
| (struct_ == "sched_param" && [ | ||
| "sched_ss_low_priority", | ||
| "sched_ss_repl_period", | ||
| "sched_ss_init_budget", | ||
| "sched_ss_max_repl", | ||
| ].contains(&field) && musl) || | ||
| // FIXME: After musl 1.1.24, the type becomes `int` instead of `unsigned short`. | ||
|
There was a problem hiding this comment. This means that musl 1.1 has ABI breaking changes with respect to musl 1.0.x ? There was a problem hiding this comment. @gnzlbg Oh, sorry. It may not be an ABI breaking change. The struct layout is kept and just some fields are renamed to reserved. There was a problem hiding this comment. Does that refer to the change in type of There was a problem hiding this comment. IIUC it was unsupported bminor/musl@827aa8f There was a problem hiding this comment. Relevant commit for this change bminor/musl@319b2d0 |
||
| (struct_ == "ipc_perm" && field == "__seq" && aarch64_musl) | ||
| }); | ||
|
|
||
| cfg.skip_roundtrip(move |s| match s { | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you elaborate here in a comment on what this means? Did the fields of this struct change? Some fields became "private" ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I placed the diff of musl in the initial comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, there are functions for mapping Rust field names to C field names in ctest, e.g., https://docs.rs/ctest/0.2.22/ctest/struct.TestGenerator.html#method.field_name . So maybe we can just translate the Rust names to the new __reservedX names for now ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@gnzlbg
This does not work for
struct { time_t __reserved1; long __reserved2; } __reserved2[2];.The anonymous struct does not match
struct timespec. Build logWe still need to skip these fields at least.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, you are right.